Skip to content

Add NetBox 3.7 to CI #1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 13, 2024
Merged

Add NetBox 3.7 to CI #1151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d32620
Add 3.7 to CI
rodvand Jan 1, 2024
e61463f
Adjust tests
rodvand Jan 1, 2024
c1081f7
Adjust test
rodvand Jan 1, 2024
d835c62
Adjust tests
rodvand Jan 1, 2024
e1971ed
Remove L2VPN from tests
rodvand Jan 6, 2024
eb80085
Add in other versions. Remove 3.4 from testing.
rodvand Jan 6, 2024
c481d08
Linting
rodvand Jan 6, 2024
4414d7e
Merge branch 'netbox-community:devel' into ci_37
rodvand Jan 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ jobs:
fail-fast: false
matrix:
include:
- VERSION: "v3.4"
NETBOX_DOCKER_VERSION: 2.5.3
- VERSION: "v3.5"
NETBOX_DOCKER_VERSION: 2.6.1
- VERSION: "v3.6"
NETBOX_DOCKER_VERSION: 2.7.0
- VERSION: "v3.7"
NETBOX_DOCKER_VERSION: 2.7.0
# If we want to integration test wiht all supported Python:
#python-version: ["3.9", "3.10", "3.11"]

Expand Down
0 ...gration/targets/inventory-v3.4/.gitignore → ...gration/targets/inventory-v3.7/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...ntegration/targets/inventory-v3.4/aliases → ...ntegration/targets/inventory-v3.7/aliases
View file
Open in desktop
File renamed without changes.
0 .../inventory-v3.4/compare_inventory_json.py → .../inventory-v3.7/compare_inventory_json.py
View file
Open in desktop
File renamed without changes.
66 changes: 33 additions & 33 deletions ....4/files/test-inventory-bearer-token.json → ....7/files/test-inventory-bearer-token.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"_meta": {
"hostvars": {
"R1-Device": {
"asset_tag": "345678901",
"config_context": {},
"custom_fields": {},
"device_type": "cisco-test",
Expand All @@ -13,16 +14,15 @@
"rack_role": "test-rack-role",
"regions": [],
"role": "core-switch",
"serial": "",
"services": [],
"site": "test-site2",
"site_groups": [],
"status": {
"label": "Active",
"value": "active"
},
"tags": [],
"serial": "",
"asset_tag": "345678901"
"tags": []
},
"Test Nexus One": {
"ansible_host": "172.16.180.12",
Expand Down Expand Up @@ -260,6 +260,7 @@
"parent-region"
],
"role": "core-switch",
"serial": "",
"services": [
{
"comments": "",
Expand Down Expand Up @@ -291,8 +292,7 @@
"label": "Active",
"value": "active"
},
"tags": [],
"serial": ""
"tags": []
},
"Test VM With Spaces": {
"cluster": "Test Cluster 2",
Expand Down Expand Up @@ -405,17 +405,18 @@
"parent-region"
],
"role": "core-switch",
"serial": "FAB12345678",
"services": [],
"site": "test-site",
"site_groups": [],
"status": {
"label": "Active",
"value": "active"
},
"tags": [],
"serial": "FAB12345678"
"tags": []
},
"test100": {
"asset_tag": "123456789",
"config_context": {
"ntp_servers": [
"pool.ntp.org"
Expand Down Expand Up @@ -657,6 +658,7 @@
"parent-region"
],
"role": "core-switch",
"serial": "FAB01234567",
"services": [
{
"comments": "",
Expand Down Expand Up @@ -724,9 +726,7 @@
"label": "Active",
"value": "active"
},
"tags": [],
"serial": "FAB01234567",
"asset_tag": "123456789"
"tags": []
},
"test100-vm": {
"cluster": "Test Cluster",
Expand Down Expand Up @@ -1099,28 +1099,28 @@
},
"all": {
"children": [
"cluster_Test_Cluster",
"cluster_Test_Cluster_2",
"cluster_group_test_cluster_group",
"cluster_type_test_cluster_type",
"device_type_cisco_test",
"device_type_nexus_parent",
"is_virtual",
"manufacturer_cisco",
"rack_Test_Rack",
"rack_Test_Rack_Site_2",
"rack_role_test_rack_role",
"ungrouped",
"site_test_site2",
"region_other_region",
"region_parent_region",
"role_core_switch",
"service_http",
"service_ssh",
"service_telnet",
"site_group_other_site_group",
"site_group_parent_site_group",
"site_test_site2",
"rack_Test_Rack_Site_2",
"rack_role_test_rack_role",
"role_core_switch",
"device_type_cisco_test",
"manufacturer_cisco",
"status_active",
"ungrouped"
"device_type_nexus_parent",
"service_telnet",
"rack_Test_Rack",
"service_ssh",
"service_http",
"cluster_Test_Cluster_2",
"cluster_type_test_cluster_type",
"is_virtual",
"cluster_Test_Cluster",
"cluster_group_test_cluster_group"
]
},
"cluster_Test_Cluster": {
Expand Down Expand Up @@ -1237,8 +1237,8 @@
},
"service_ssh": {
"hosts": [
"Test VM With Spaces",
"test100"
"test100",
"Test VM With Spaces"
]
},
"service_telnet": {
Expand All @@ -1252,14 +1252,14 @@
]
},
"site_test_site": {
"children": [
"location_parent_rack_group"
],
"hosts": [
"test100-vm",
"test101-vm",
"test102-vm",
"test103-vm"
],
"children": [
"location_parent_rack_group"
]
},
"site_test_site2": {
Expand All @@ -1271,9 +1271,9 @@
"hosts": [
"R1-Device",
"Test Nexus One",
"Test VM With Spaces",
"TestDeviceR1",
"test100",
"Test VM With Spaces",
"test100-vm",
"test101-vm",
"test102-vm",
Expand Down
0 ...3.4/files/test-inventory-bearer-token.yml → ...3.7/files/test-inventory-bearer-token.yml
View file
Open in desktop
File renamed without changes.
64 changes: 32 additions & 32 deletions ...4/files/test-inventory-jinja2-filter.json → ...7/files/test-inventory-jinja2-filter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@
"parent-region"
],
"role": "core-switch",
"serial": "",
"services": [
{
"comments": "",
Expand Down Expand Up @@ -268,8 +269,7 @@
"label": "Active",
"value": "active"
},
"tags": [],
"serial": ""
"tags": []
},
"TestDeviceR1": {
"config_context": {},
Expand All @@ -288,17 +288,18 @@
"parent-region"
],
"role": "core-switch",
"serial": "FAB12345678",
"services": [],
"site": "test-site",
"site_groups": [],
"status": {
"label": "Active",
"value": "active"
},
"tags": [],
"serial": "FAB12345678"
"tags": []
},
"test100": {
"asset_tag": "123456789",
"config_context": {
"ntp_servers": [
"pool.ntp.org"
Expand Down Expand Up @@ -540,6 +541,7 @@
"parent-region"
],
"role": "core-switch",
"serial": "FAB01234567",
"services": [
{
"comments": "",
Expand Down Expand Up @@ -607,9 +609,7 @@
"label": "Active",
"value": "active"
},
"tags": [],
"serial": "FAB01234567",
"asset_tag": "123456789"
"tags": []
},
"test100-vm": {
"cluster": "Test Cluster",
Expand Down Expand Up @@ -965,25 +965,25 @@
},
"all": {
"children": [
"cluster_Test_Cluster",
"cluster_group_test_cluster_group",
"cluster_type_test_cluster_type",
"device_type_cisco_test",
"device_type_nexus_parent",
"is_virtual",
"manufacturer_cisco",
"rack_Test_Rack",
"ungrouped",
"site_test_site2",
"region_other_region",
"region_parent_region",
"role_core_switch",
"service_http",
"service_ssh",
"service_telnet",
"site_group_other_site_group",
"site_group_parent_site_group",
"site_test_site2",
"role_core_switch",
"device_type_nexus_parent",
"manufacturer_cisco",
"service_telnet",
"status_active",
"ungrouped"
"rack_Test_Rack",
"device_type_cisco_test",
"service_ssh",
"service_http",
"cluster_Test_Cluster",
"cluster_group_test_cluster_group",
"cluster_type_test_cluster_type",
"is_virtual"
]
},
"cluster_Test_Cluster": {
Expand All @@ -1010,14 +1010,6 @@
"test103-vm"
]
},
"is_virtual": {
"hosts": [
"test100-vm",
"test101-vm",
"test102-vm",
"test103-vm"
]
},
"device_type_cisco_test": {
"hosts": [
"TestDeviceR1",
Expand All @@ -1029,6 +1021,14 @@
"Test Nexus One"
]
},
"is_virtual": {
"hosts": [
"test100-vm",
"test101-vm",
"test102-vm",
"test103-vm"
]
},
"location_parent_rack_group": {
"children": [
"location_test_rack_group"
Expand Down Expand Up @@ -1091,14 +1091,14 @@
]
},
"site_test_site": {
"children": [
"location_parent_rack_group"
],
"hosts": [
"test100-vm",
"test101-vm",
"test102-vm",
"test103-vm"
],
"children": [
"location_parent_rack_group"
]
},
"status_active": {
Expand Down
0 ....4/files/test-inventory-jinja2-filter.yml → ....7/files/test-inventory-jinja2-filter.yml
View file
Open in desktop
File renamed without changes.
Loading