Skip to content

Commit 061905b

Browse files
rodvandrodvand
authored
Add NetBox 3.7 to CI (#1151)
* Add 3.7 to CI
1 parent ba28a13 commit 061905b

File tree

108 files changed

+594
-429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+594
-429
lines changed

‎.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ jobs:
7676
fail-fast: false
7777
matrix:
7878
include:
79-
- VERSION: "v3.4"
80-
NETBOX_DOCKER_VERSION: 2.5.3
8179
- VERSION: "v3.5"
8280
NETBOX_DOCKER_VERSION: 2.6.1
8381
- VERSION: "v3.6"
8482
NETBOX_DOCKER_VERSION: 2.7.0
83+
- VERSION: "v3.7"
84+
NETBOX_DOCKER_VERSION: 2.7.0
8585
# If we want to integration test wiht all supported Python:
8686
#python-version: ["3.9", "3.10", "3.11"]
8787

‎tests/integration/targets/inventory-v3.4/.gitignore renamed to ‎tests/integration/targets/inventory-v3.7/.gitignore

File renamed without changes.

‎tests/integration/targets/inventory-v3.4/aliases renamed to ‎tests/integration/targets/inventory-v3.7/aliases

File renamed without changes.

‎tests/integration/targets/inventory-v3.4/compare_inventory_json.py renamed to ‎tests/integration/targets/inventory-v3.7/compare_inventory_json.py

File renamed without changes.

‎tests/integration/targets/inventory-v3.4/files/test-inventory-bearer-token.json renamed to ‎tests/integration/targets/inventory-v3.7/files/test-inventory-bearer-token.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"_meta": {
33
"hostvars": {
44
"R1-Device": {
5+
"asset_tag": "345678901",
56
"config_context": {},
67
"custom_fields": {},
78
"device_type": "cisco-test",
@@ -13,16 +14,15 @@
1314
"rack_role": "test-rack-role",
1415
"regions": [],
1516
"role": "core-switch",
17+
"serial": "",
1618
"services": [],
1719
"site": "test-site2",
1820
"site_groups": [],
1921
"status": {
2022
"label": "Active",
2123
"value": "active"
2224
},
23-
"tags": [],
24-
"serial": "",
25-
"asset_tag": "345678901"
25+
"tags": []
2626
},
2727
"Test Nexus One": {
2828
"ansible_host": "172.16.180.12",
@@ -260,6 +260,7 @@
260260
"parent-region"
261261
],
262262
"role": "core-switch",
263+
"serial": "",
263264
"services": [
264265
{
265266
"comments": "",
@@ -291,8 +292,7 @@
291292
"label": "Active",
292293
"value": "active"
293294
},
294-
"tags": [],
295-
"serial": ""
295+
"tags": []
296296
},
297297
"Test VM With Spaces": {
298298
"cluster": "Test Cluster 2",
@@ -405,17 +405,18 @@
405405
"parent-region"
406406
],
407407
"role": "core-switch",
408+
"serial": "FAB12345678",
408409
"services": [],
409410
"site": "test-site",
410411
"site_groups": [],
411412
"status": {
412413
"label": "Active",
413414
"value": "active"
414415
},
415-
"tags": [],
416-
"serial": "FAB12345678"
416+
"tags": []
417417
},
418418
"test100": {
419+
"asset_tag": "123456789",
419420
"config_context": {
420421
"ntp_servers": [
421422
"pool.ntp.org"
@@ -657,6 +658,7 @@
657658
"parent-region"
658659
],
659660
"role": "core-switch",
661+
"serial": "FAB01234567",
660662
"services": [
661663
{
662664
"comments": "",
@@ -724,9 +726,7 @@
724726
"label": "Active",
725727
"value": "active"
726728
},
727-
"tags": [],
728-
"serial": "FAB01234567",
729-
"asset_tag": "123456789"
729+
"tags": []
730730
},
731731
"test100-vm": {
732732
"cluster": "Test Cluster",
@@ -1099,28 +1099,28 @@
10991099
},
11001100
"all": {
11011101
"children": [
1102-
"cluster_Test_Cluster",
1103-
"cluster_Test_Cluster_2",
1104-
"cluster_group_test_cluster_group",
1105-
"cluster_type_test_cluster_type",
1106-
"device_type_cisco_test",
1107-
"device_type_nexus_parent",
1108-
"is_virtual",
1109-
"manufacturer_cisco",
1110-
"rack_Test_Rack",
1111-
"rack_Test_Rack_Site_2",
1112-
"rack_role_test_rack_role",
1102+
"ungrouped",
1103+
"site_test_site2",
11131104
"region_other_region",
11141105
"region_parent_region",
1115-
"role_core_switch",
1116-
"service_http",
1117-
"service_ssh",
1118-
"service_telnet",
11191106
"site_group_other_site_group",
11201107
"site_group_parent_site_group",
1121-
"site_test_site2",
1108+
"rack_Test_Rack_Site_2",
1109+
"rack_role_test_rack_role",
1110+
"role_core_switch",
1111+
"device_type_cisco_test",
1112+
"manufacturer_cisco",
11221113
"status_active",
1123-
"ungrouped"
1114+
"device_type_nexus_parent",
1115+
"service_telnet",
1116+
"rack_Test_Rack",
1117+
"service_ssh",
1118+
"service_http",
1119+
"cluster_Test_Cluster_2",
1120+
"cluster_type_test_cluster_type",
1121+
"is_virtual",
1122+
"cluster_Test_Cluster",
1123+
"cluster_group_test_cluster_group"
11241124
]
11251125
},
11261126
"cluster_Test_Cluster": {
@@ -1237,8 +1237,8 @@
12371237
},
12381238
"service_ssh": {
12391239
"hosts": [
1240-
"Test VM With Spaces",
1241-
"test100"
1240+
"test100",
1241+
"Test VM With Spaces"
12421242
]
12431243
},
12441244
"service_telnet": {
@@ -1252,14 +1252,14 @@
12521252
]
12531253
},
12541254
"site_test_site": {
1255+
"children": [
1256+
"location_parent_rack_group"
1257+
],
12551258
"hosts": [
12561259
"test100-vm",
12571260
"test101-vm",
12581261
"test102-vm",
12591262
"test103-vm"
1260-
],
1261-
"children": [
1262-
"location_parent_rack_group"
12631263
]
12641264
},
12651265
"site_test_site2": {
@@ -1271,9 +1271,9 @@
12711271
"hosts": [
12721272
"R1-Device",
12731273
"Test Nexus One",
1274-
"Test VM With Spaces",
12751274
"TestDeviceR1",
12761275
"test100",
1276+
"Test VM With Spaces",
12771277
"test100-vm",
12781278
"test101-vm",
12791279
"test102-vm",

‎tests/integration/targets/inventory-v3.4/files/test-inventory-bearer-token.yml renamed to ‎tests/integration/targets/inventory-v3.7/files/test-inventory-bearer-token.yml

File renamed without changes.

‎tests/integration/targets/inventory-v3.4/files/test-inventory-jinja2-filter.json renamed to ‎tests/integration/targets/inventory-v3.7/files/test-inventory-jinja2-filter.json

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@
237237
"parent-region"
238238
],
239239
"role": "core-switch",
240+
"serial": "",
240241
"services": [
241242
{
242243
"comments": "",
@@ -268,8 +269,7 @@
268269
"label": "Active",
269270
"value": "active"
270271
},
271-
"tags": [],
272-
"serial": ""
272+
"tags": []
273273
},
274274
"TestDeviceR1": {
275275
"config_context": {},
@@ -288,17 +288,18 @@
288288
"parent-region"
289289
],
290290
"role": "core-switch",
291+
"serial": "FAB12345678",
291292
"services": [],
292293
"site": "test-site",
293294
"site_groups": [],
294295
"status": {
295296
"label": "Active",
296297
"value": "active"
297298
},
298-
"tags": [],
299-
"serial": "FAB12345678"
299+
"tags": []
300300
},
301301
"test100": {
302+
"asset_tag": "123456789",
302303
"config_context": {
303304
"ntp_servers": [
304305
"pool.ntp.org"
@@ -540,6 +541,7 @@
540541
"parent-region"
541542
],
542543
"role": "core-switch",
544+
"serial": "FAB01234567",
543545
"services": [
544546
{
545547
"comments": "",
@@ -607,9 +609,7 @@
607609
"label": "Active",
608610
"value": "active"
609611
},
610-
"tags": [],
611-
"serial": "FAB01234567",
612-
"asset_tag": "123456789"
612+
"tags": []
613613
},
614614
"test100-vm": {
615615
"cluster": "Test Cluster",
@@ -965,25 +965,25 @@
965965
},
966966
"all": {
967967
"children": [
968-
"cluster_Test_Cluster",
969-
"cluster_group_test_cluster_group",
970-
"cluster_type_test_cluster_type",
971-
"device_type_cisco_test",
972-
"device_type_nexus_parent",
973-
"is_virtual",
974-
"manufacturer_cisco",
975-
"rack_Test_Rack",
968+
"ungrouped",
969+
"site_test_site2",
976970
"region_other_region",
977971
"region_parent_region",
978-
"role_core_switch",
979-
"service_http",
980-
"service_ssh",
981-
"service_telnet",
982972
"site_group_other_site_group",
983973
"site_group_parent_site_group",
984-
"site_test_site2",
974+
"role_core_switch",
975+
"device_type_nexus_parent",
976+
"manufacturer_cisco",
977+
"service_telnet",
985978
"status_active",
986-
"ungrouped"
979+
"rack_Test_Rack",
980+
"device_type_cisco_test",
981+
"service_ssh",
982+
"service_http",
983+
"cluster_Test_Cluster",
984+
"cluster_group_test_cluster_group",
985+
"cluster_type_test_cluster_type",
986+
"is_virtual"
987987
]
988988
},
989989
"cluster_Test_Cluster": {
@@ -1010,14 +1010,6 @@
10101010
"test103-vm"
10111011
]
10121012
},
1013-
"is_virtual": {
1014-
"hosts": [
1015-
"test100-vm",
1016-
"test101-vm",
1017-
"test102-vm",
1018-
"test103-vm"
1019-
]
1020-
},
10211013
"device_type_cisco_test": {
10221014
"hosts": [
10231015
"TestDeviceR1",
@@ -1029,6 +1021,14 @@
10291021
"Test Nexus One"
10301022
]
10311023
},
1024+
"is_virtual": {
1025+
"hosts": [
1026+
"test100-vm",
1027+
"test101-vm",
1028+
"test102-vm",
1029+
"test103-vm"
1030+
]
1031+
},
10321032
"location_parent_rack_group": {
10331033
"children": [
10341034
"location_test_rack_group"
@@ -1091,14 +1091,14 @@
10911091
]
10921092
},
10931093
"site_test_site": {
1094+
"children": [
1095+
"location_parent_rack_group"
1096+
],
10941097
"hosts": [
10951098
"test100-vm",
10961099
"test101-vm",
10971100
"test102-vm",
10981101
"test103-vm"
1099-
],
1100-
"children": [
1101-
"location_parent_rack_group"
11021102
]
11031103
},
11041104
"status_active": {

‎tests/integration/targets/inventory-v3.4/files/test-inventory-jinja2-filter.yml renamed to ‎tests/integration/targets/inventory-v3.7/files/test-inventory-jinja2-filter.yml

File renamed without changes.

0 commit comments

Comments
 (0)