Skip to content

Commit 9940849

Browse files
BugFix: Allow name updates to manufacturers (#76)
1 parent 1980f50 commit 9940849

File tree

2 files changed

+31
-14
lines changed

2 files changed

+31
-14
lines changed

plugins/module_utils/netbox_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
"ip_address": set(["address", "vrf"]),
304304
"ip_addresses": set(["address", "vrf", "device"]),
305305
"lag": set(["name"]),
306-
"manufacturer": set(["name", "slug"]),
306+
"manufacturer": set(["slug"]),
307307
"nat_inside": set(["vrf", "address"]),
308308
"parent_region": set(["slug"]),
309309
"platform": set(["slug"]),

tests/integration/integration-tests.yml

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1648,38 +1648,55 @@
16481648
- test_two['manufacturer']['slug'] == "test-manufacturer-two"
16491649
- test_two['msg'] == "manufacturer Test Manufacturer Two already exists"
16501650

1651-
- name: "MANUFACTURER 3: ASSERT - Delete"
1651+
- name: "MANUFACTURER 3: Update"
16521652
netbox_manufacturer:
16531653
netbox_url: http://localhost:32768
16541654
netbox_token: 0123456789abcdef0123456789abcdef01234567
16551655
data:
1656-
name: Test Manufacturer Two
1657-
state: absent
1656+
name: test manufacturer two
1657+
state: present
16581658
register: test_three
16591659

1660+
- name: "MANUFACTURER 3: ASSERT - Update"
1661+
assert:
1662+
that:
1663+
- test_three['changed']
1664+
- test_three['manufacturer']['name'] == "test manufacturer two"
1665+
- test_three['manufacturer']['slug'] == "test-manufacturer-two"
1666+
- test_three['msg'] == "manufacturer test manufacturer two updated"
1667+
1668+
- name: "MANUFACTURER 4: ASSERT - Delete"
1669+
netbox_manufacturer:
1670+
netbox_url: http://localhost:32768
1671+
netbox_token: 0123456789abcdef0123456789abcdef01234567
1672+
data:
1673+
name: test manufacturer two
1674+
state: absent
1675+
register: test_four
1676+
16601677
- name: "MANUFACTURER 3: ASSERT - Delete"
16611678
assert:
16621679
that:
1663-
- test_three is changed
1664-
- test_three['diff']['before']['state'] == "present"
1665-
- test_three['diff']['after']['state'] == "absent"
1666-
- test_three['msg'] == "manufacturer Test Manufacturer Two deleted"
1680+
- test_four is changed
1681+
- test_four['diff']['before']['state'] == "present"
1682+
- test_four['diff']['after']['state'] == "absent"
1683+
- test_four['msg'] == "manufacturer test manufacturer two deleted"
16671684

1668-
- name: "MANUFACTURER 4: ASSERT - Delete non existing"
1685+
- name: "MANUFACTURER 5: ASSERT - Delete non existing"
16691686
netbox_manufacturer:
16701687
netbox_url: http://localhost:32768
16711688
netbox_token: 0123456789abcdef0123456789abcdef01234567
16721689
data:
16731690
name: Test Manufacturer Two
16741691
state: absent
1675-
register: test_four
1692+
register: test_five
16761693

1677-
- name: "MANUFACTURER 4: ASSERT - Delete non existing"
1694+
- name: "MANUFACTURER 5: ASSERT - Delete non existing"
16781695
assert:
16791696
that:
1680-
- not test_four['changed']
1681-
- test_four['manufacturer'] == None
1682-
- test_four['msg'] == "manufacturer Test Manufacturer Two already absent"
1697+
- not test_five['changed']
1698+
- test_five['manufacturer'] == None
1699+
- test_five['msg'] == "manufacturer Test Manufacturer Two already absent"
16831700

16841701
##
16851702
##

0 commit comments

Comments
 (0)