Skip to content

Commit fb93584

Browse files
authored
Fixes #748: Ensure rack uniqueness (#751)
* Add location as standard query parameter in netbox_rack * Adjust test to handle location as well * More test adjustments. Add location to rack from the start
1 parent 12ba0e8 commit fb93584

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

plugins/module_utils/netbox_utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@
429429
"primary_ip6": set(["address", "vrf"]),
430430
"provider": set(["slug"]),
431431
"provider_network": set(["name"]),
432-
"rack": set(["name", "site"]),
432+
"rack": set(["name", "site", "location"]),
433433
"rack_group": set(["slug"]),
434434
"rack_role": set(["slug"]),
435435
"region": set(["slug"]),
@@ -467,6 +467,7 @@
467467
"device",
468468
"group",
469469
"interface",
470+
"location",
470471
"rir",
471472
"vrf",
472473
"site",

tests/integration/targets/v2.11/tasks/netbox_rack.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
data:
1212
name: "Test rack one"
1313
site: "Test Site"
14+
location: "Test Rack Group"
1415
register: test_one
1516

1617
- name: "1 - ASSERT"
@@ -65,6 +66,7 @@
6566
data:
6667
name: Test rack one
6768
site: Test Site
69+
location: "Test Rack Group"
6870
state: present
6971
register: test_four
7072

@@ -109,7 +111,6 @@
109111
- test_five['diff']['after']['asset_tag'] == "1234"
110112
- test_five['diff']['after']['comments'] == "Just testing rack module"
111113
- test_five['diff']['after']['facility_id'] == "EQUI10291"
112-
- test_five['diff']['after']['location'] == 1
113114
- test_five['diff']['after']['outer_depth'] == 24
114115
- test_five['diff']['after']['outer_unit'] == "in"
115116
- test_five['diff']['after']['outer_width'] == 32

tests/integration/targets/v3.0/tasks/netbox_rack.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
data:
1212
name: "Test rack one"
1313
site: "Test Site"
14+
location: "Test Rack Group"
1415
register: test_one
1516

1617
- name: "1 - ASSERT"
@@ -65,6 +66,7 @@
6566
data:
6667
name: Test rack one
6768
site: Test Site
69+
location: "Test Rack Group"
6870
state: present
6971
register: test_four
7072

@@ -109,7 +111,6 @@
109111
- test_five['diff']['after']['asset_tag'] == "1234"
110112
- test_five['diff']['after']['comments'] == "Just testing rack module"
111113
- test_five['diff']['after']['facility_id'] == "EQUI10291"
112-
- test_five['diff']['after']['location'] == 1
113114
- test_five['diff']['after']['outer_depth'] == 24
114115
- test_five['diff']['after']['outer_unit'] == "in"
115116
- test_five['diff']['after']['outer_width'] == 32

tests/integration/targets/v3.1/tasks/netbox_rack.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
data:
1212
name: "Test rack one"
1313
site: "Test Site"
14+
location: "Test Rack Group"
1415
register: test_one
1516

1617
- name: "1 - ASSERT"
@@ -65,6 +66,7 @@
6566
data:
6667
name: Test rack one
6768
site: Test Site
69+
location: "Test Rack Group"
6870
state: present
6971
register: test_four
7072

@@ -109,7 +111,6 @@
109111
- test_five['diff']['after']['asset_tag'] == "1234"
110112
- test_five['diff']['after']['comments'] == "Just testing rack module"
111113
- test_five['diff']['after']['facility_id'] == "EQUI10291"
112-
- test_five['diff']['after']['location'] == 1
113114
- test_five['diff']['after']['outer_depth'] == 24
114115
- test_five['diff']['after']['outer_unit'] == "in"
115116
- test_five['diff']['after']['outer_width'] == 32

0 commit comments

Comments
 (0)