From bb52e8b9761c285713678851215a9a5097bee49d Mon Sep 17 00:00:00 2001 From: ahlee1 Date: Sat, 30 Sep 2023 20:23:51 -0400 Subject: [PATCH 01/10] component to inventory item --- plugins/module_utils/netbox_utils.py | 9 +++- plugins/modules/netbox_inventory_item.py | 56 +++++++++++++++++++++++- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/plugins/module_utils/netbox_utils.py b/plugins/module_utils/netbox_utils.py index 6a5484409..e40f82a17 100644 --- a/plugins/module_utils/netbox_utils.py +++ b/plugins/module_utils/netbox_utils.py @@ -204,6 +204,7 @@ "cluster_groups": "cluster_groups", "cluster_type": "cluster_types", "cluster_types": "cluster_types", + "component": "interfaces", "config_context": "config_contexts", "contact_groups": "contact_groups", "dcim.consoleport": "console_ports", @@ -386,6 +387,7 @@ "cluster": set(["name", "type"]), "cluster_group": set(["slug"]), "cluster_type": set(["slug"]), + "component": set(["name", "device"]), "config_context": set( [ "name", @@ -437,7 +439,7 @@ "interface_a": set(["name", "device"]), "interface_b": set(["name", "device"]), "interface_template": set(["name", "device_type"]), - "inventory_item": set(["name", "device"]), + "inventory_item": set(["name", "device", "component", "component_type"]), "inventory_item_role": set(["name"]), "ip_address": set(["address", "vrf", "device", "interface", "assigned_object"]), "ip_addresses": set(["address", "vrf", "device", "interface", "assigned_object"]), @@ -561,6 +563,7 @@ "circuit_type": "type", "cluster_type": "type", "cluster_group": "group", + "component": "component_id", "contact_group": "group", "device_role": "role", "fhrp_group": "group", @@ -831,7 +834,7 @@ def _convert_identical_keys(self, data): temp_dict[key] = data[key] elif key in CONVERT_KEYS: # This will keep the original key for keys in list, but also convert it. - if key in ("assigned_object", "scope"): + if key in ("assigned_object", "scope", "component"): temp_dict[key] = data[key] new_key = CONVERT_KEYS[key] temp_dict[new_key] = data[key] @@ -1134,6 +1137,8 @@ def _find_ids(self, data, user_query_params): endpoint = CONVERT_TO_ID[data.get("termination_b_type")] elif k == "assigned_object": endpoint = "interfaces" + elif k == "component": + endpoint = CONVERT_TO_ID[data.get("component_type")] elif k == "scope": # Determine endpoint name for scope ID resolution endpoint = SCOPE_TO_ENDPOINT[data["scope_type"]] diff --git a/plugins/modules/netbox_inventory_item.py b/plugins/modules/netbox_inventory_item.py index 348614f68..0a06e0d34 100644 --- a/plugins/modules/netbox_inventory_item.py +++ b/plugins/modules/netbox_inventory_item.py @@ -82,6 +82,35 @@ required: false default: false type: bool + component_type: + description: + - The type of the component. Required if component is defined. + choices: + - dcim.consoleport + - dcim.consoleserverport + - dcim.frontport + - dcim.interface + - dcim.poweroutlet + - dcim.powerport + - dcim.rearport + required: false + type: str + component: + description: + - The associated component + required: false + type: dict + suboptions: + name: + description: + - The name of the interface + type: str + required: False + device: + description: + - The device the interface is attached to. + type: str + required: False tags: description: - Any tags that the device may need to be associated with @@ -198,6 +227,27 @@ def main(): asset_tag=dict(required=False, type="str"), description=dict(required=False, type="str"), discovered=dict(required=False, type="bool", default=False), + component_type=dict( + required=False, + choices=[ + "dcim.consoleport", + "dcim.consoleserverport", + "dcim.frontport", + "dcim.interface", + "dcim.poweroutlet", + "dcim.powerport", + "dcim.rearport", + ], + type="str", + ), + component=dict( + required=False, + type="dict", + options=dict( + name=dict(required=False, type="str"), + device=dict(required=False, type="str"), + ), + ), tags=dict(required=False, type="list", elements="raw"), custom_fields=dict(required=False, type="dict"), inventory_item_role=dict(required=False, type="raw"), @@ -210,9 +260,13 @@ def main(): ("state", "present", ["device", "name"]), ("state", "absent", ["device", "name"]), ] + required_together = [("component_type", "component")] module = NetboxAnsibleModule( - argument_spec=argument_spec, supports_check_mode=True, required_if=required_if + argument_spec=argument_spec, + supports_check_mode=True, + required_if=required_if, + required_together=required_together ) netbox_inventory_item = NetboxDcimModule(module, NB_INVENTORY_ITEMS) From d31398827060213ece38b6da209359128ecbf358 Mon Sep 17 00:00:00 2001 From: ahlee1 Date: Sat, 30 Sep 2023 21:41:58 -0400 Subject: [PATCH 02/10] integration tests --- .../v3.3/tasks/netbox_inventory_item.yml | 45 +++++++++++++++++++ .../v3.4/tasks/netbox_inventory_item.yml | 45 +++++++++++++++++++ .../v3.5/tasks/netbox_inventory_item.yml | 45 +++++++++++++++++++ .../v3.6/tasks/netbox_inventory_item.yml | 45 +++++++++++++++++++ 4 files changed, 180 insertions(+) diff --git a/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml index 48f9a1ffb..ee661e374 100644 --- a/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml @@ -155,3 +155,48 @@ that: - test_six.failed - test_six.msg == "Could not resolve id of inventory_item_role: Foo" + +- name: "INVENTORY_ITEM 7: Create inventory item with component" + netbox.netbox.netbox_inventory_item: + netbox_url: http://localhost:32768 + netbox_token: 0123456789abcdef0123456789abcdef01234567 + data: + device: test100 + name: test_component + component_type: "dcim.interface" + component: + name: GigabitEthernet2 + device: "test100" + state: present + register: test_seven + +- name: "INVENTORY_ITEM 7: ASSERT - Inventory item creation with role" + ansible.builtin.assert: + that: + - test_seven is changed + - test_seven.diff.before.state == "absent" + - test_seven.diff.after.state == "present" + - test_seven.inventory_item.name == "test_component" + - test_seven.inventory_item.component_type == "dcim.interface" + - test_seven.inventory_item.component_id == 4 + - test_seven.inventory_item.device == 1 + - test_seven.msg == "inventory_item test_component created" + +- name: "INVENTORY_ITEM 8: Create inventory item with component_type" + netbox.netbox.netbox_inventory_item: + netbox_url: http://localhost:32768 + netbox_token: 0123456789abcdef0123456789abcdef01234567 + data: + device: test100 + name: test_component + component: + name: GigabitEthernet2 + device: "test100" + state: present + register: test_eight + +- name: "INVENTORY_ITEM 8: ASSERT - Inventory item creation with missing component_type" + ansible.builtin.assert: + that: + - test_eight.failed + - test_eight.msg == "parameters are required together: component_type, component" \ No newline at end of file diff --git a/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml index 48f9a1ffb..ee661e374 100644 --- a/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml @@ -155,3 +155,48 @@ that: - test_six.failed - test_six.msg == "Could not resolve id of inventory_item_role: Foo" + +- name: "INVENTORY_ITEM 7: Create inventory item with component" + netbox.netbox.netbox_inventory_item: + netbox_url: http://localhost:32768 + netbox_token: 0123456789abcdef0123456789abcdef01234567 + data: + device: test100 + name: test_component + component_type: "dcim.interface" + component: + name: GigabitEthernet2 + device: "test100" + state: present + register: test_seven + +- name: "INVENTORY_ITEM 7: ASSERT - Inventory item creation with role" + ansible.builtin.assert: + that: + - test_seven is changed + - test_seven.diff.before.state == "absent" + - test_seven.diff.after.state == "present" + - test_seven.inventory_item.name == "test_component" + - test_seven.inventory_item.component_type == "dcim.interface" + - test_seven.inventory_item.component_id == 4 + - test_seven.inventory_item.device == 1 + - test_seven.msg == "inventory_item test_component created" + +- name: "INVENTORY_ITEM 8: Create inventory item with component_type" + netbox.netbox.netbox_inventory_item: + netbox_url: http://localhost:32768 + netbox_token: 0123456789abcdef0123456789abcdef01234567 + data: + device: test100 + name: test_component + component: + name: GigabitEthernet2 + device: "test100" + state: present + register: test_eight + +- name: "INVENTORY_ITEM 8: ASSERT - Inventory item creation with missing component_type" + ansible.builtin.assert: + that: + - test_eight.failed + - test_eight.msg == "parameters are required together: component_type, component" \ No newline at end of file diff --git a/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml index 48f9a1ffb..ee661e374 100644 --- a/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml @@ -155,3 +155,48 @@ that: - test_six.failed - test_six.msg == "Could not resolve id of inventory_item_role: Foo" + +- name: "INVENTORY_ITEM 7: Create inventory item with component" + netbox.netbox.netbox_inventory_item: + netbox_url: http://localhost:32768 + netbox_token: 0123456789abcdef0123456789abcdef01234567 + data: + device: test100 + name: test_component + component_type: "dcim.interface" + component: + name: GigabitEthernet2 + device: "test100" + state: present + register: test_seven + +- name: "INVENTORY_ITEM 7: ASSERT - Inventory item creation with role" + ansible.builtin.assert: + that: + - test_seven is changed + - test_seven.diff.before.state == "absent" + - test_seven.diff.after.state == "present" + - test_seven.inventory_item.name == "test_component" + - test_seven.inventory_item.component_type == "dcim.interface" + - test_seven.inventory_item.component_id == 4 + - test_seven.inventory_item.device == 1 + - test_seven.msg == "inventory_item test_component created" + +- name: "INVENTORY_ITEM 8: Create inventory item with component_type" + netbox.netbox.netbox_inventory_item: + netbox_url: http://localhost:32768 + netbox_token: 0123456789abcdef0123456789abcdef01234567 + data: + device: test100 + name: test_component + component: + name: GigabitEthernet2 + device: "test100" + state: present + register: test_eight + +- name: "INVENTORY_ITEM 8: ASSERT - Inventory item creation with missing component_type" + ansible.builtin.assert: + that: + - test_eight.failed + - test_eight.msg == "parameters are required together: component_type, component" \ No newline at end of file diff --git a/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml index 48f9a1ffb..ee661e374 100644 --- a/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml @@ -155,3 +155,48 @@ that: - test_six.failed - test_six.msg == "Could not resolve id of inventory_item_role: Foo" + +- name: "INVENTORY_ITEM 7: Create inventory item with component" + netbox.netbox.netbox_inventory_item: + netbox_url: http://localhost:32768 + netbox_token: 0123456789abcdef0123456789abcdef01234567 + data: + device: test100 + name: test_component + component_type: "dcim.interface" + component: + name: GigabitEthernet2 + device: "test100" + state: present + register: test_seven + +- name: "INVENTORY_ITEM 7: ASSERT - Inventory item creation with role" + ansible.builtin.assert: + that: + - test_seven is changed + - test_seven.diff.before.state == "absent" + - test_seven.diff.after.state == "present" + - test_seven.inventory_item.name == "test_component" + - test_seven.inventory_item.component_type == "dcim.interface" + - test_seven.inventory_item.component_id == 4 + - test_seven.inventory_item.device == 1 + - test_seven.msg == "inventory_item test_component created" + +- name: "INVENTORY_ITEM 8: Create inventory item with component_type" + netbox.netbox.netbox_inventory_item: + netbox_url: http://localhost:32768 + netbox_token: 0123456789abcdef0123456789abcdef01234567 + data: + device: test100 + name: test_component + component: + name: GigabitEthernet2 + device: "test100" + state: present + register: test_eight + +- name: "INVENTORY_ITEM 8: ASSERT - Inventory item creation with missing component_type" + ansible.builtin.assert: + that: + - test_eight.failed + - test_eight.msg == "parameters are required together: component_type, component" \ No newline at end of file From b09bf01d71c33a802cc9a0cd4d32998ffe5fd2c9 Mon Sep 17 00:00:00 2001 From: ahlee1 Date: Sat, 30 Sep 2023 22:00:14 -0400 Subject: [PATCH 03/10] fix black linting --- plugins/modules/netbox_inventory_item.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/modules/netbox_inventory_item.py b/plugins/modules/netbox_inventory_item.py index 0a06e0d34..05e1e2ae2 100644 --- a/plugins/modules/netbox_inventory_item.py +++ b/plugins/modules/netbox_inventory_item.py @@ -263,10 +263,10 @@ def main(): required_together = [("component_type", "component")] module = NetboxAnsibleModule( - argument_spec=argument_spec, - supports_check_mode=True, + argument_spec=argument_spec, + supports_check_mode=True, required_if=required_if, - required_together=required_together + required_together=required_together, ) netbox_inventory_item = NetboxDcimModule(module, NB_INVENTORY_ITEMS) From 4a25e72faed2266f331b09473c2b29f82f803bd5 Mon Sep 17 00:00:00 2001 From: ahlee1 Date: Sat, 30 Sep 2023 22:02:57 -0400 Subject: [PATCH 04/10] fix yamllint --- tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml | 2 +- tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml | 2 +- tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml | 2 +- tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml index ee661e374..b18480c25 100644 --- a/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml @@ -199,4 +199,4 @@ ansible.builtin.assert: that: - test_eight.failed - - test_eight.msg == "parameters are required together: component_type, component" \ No newline at end of file + - test_eight.msg == "parameters are required together: component_type, component" diff --git a/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml index ee661e374..b18480c25 100644 --- a/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml @@ -199,4 +199,4 @@ ansible.builtin.assert: that: - test_eight.failed - - test_eight.msg == "parameters are required together: component_type, component" \ No newline at end of file + - test_eight.msg == "parameters are required together: component_type, component" diff --git a/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml index ee661e374..b18480c25 100644 --- a/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml @@ -199,4 +199,4 @@ ansible.builtin.assert: that: - test_eight.failed - - test_eight.msg == "parameters are required together: component_type, component" \ No newline at end of file + - test_eight.msg == "parameters are required together: component_type, component" diff --git a/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml index ee661e374..b18480c25 100644 --- a/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml @@ -199,4 +199,4 @@ ansible.builtin.assert: that: - test_eight.failed - - test_eight.msg == "parameters are required together: component_type, component" \ No newline at end of file + - test_eight.msg == "parameters are required together: component_type, component" From 4ffd0bafbf1b4c6f3f0f430659ec0859f5ac19df Mon Sep 17 00:00:00 2001 From: ahlee1 Date: Sat, 30 Sep 2023 22:21:02 -0400 Subject: [PATCH 05/10] fix tests --- tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml | 1 + tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml | 1 + tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml | 1 + tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml index b18480c25..7c863be10 100644 --- a/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml @@ -193,6 +193,7 @@ name: GigabitEthernet2 device: "test100" state: present + ignore_errors: true register: test_eight - name: "INVENTORY_ITEM 8: ASSERT - Inventory item creation with missing component_type" diff --git a/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml index b18480c25..7c863be10 100644 --- a/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml @@ -193,6 +193,7 @@ name: GigabitEthernet2 device: "test100" state: present + ignore_errors: true register: test_eight - name: "INVENTORY_ITEM 8: ASSERT - Inventory item creation with missing component_type" diff --git a/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml index b18480c25..7c863be10 100644 --- a/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml @@ -193,6 +193,7 @@ name: GigabitEthernet2 device: "test100" state: present + ignore_errors: true register: test_eight - name: "INVENTORY_ITEM 8: ASSERT - Inventory item creation with missing component_type" diff --git a/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml index b18480c25..7c863be10 100644 --- a/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml @@ -193,6 +193,7 @@ name: GigabitEthernet2 device: "test100" state: present + ignore_errors: true register: test_eight - name: "INVENTORY_ITEM 8: ASSERT - Inventory item creation with missing component_type" From 2c4265457ad36cf0c1de71359f51c751a69f7653 Mon Sep 17 00:00:00 2001 From: ahlee1 Date: Sat, 30 Sep 2023 22:37:44 -0400 Subject: [PATCH 06/10] add example --- plugins/modules/netbox_inventory_item.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/plugins/modules/netbox_inventory_item.py b/plugins/modules/netbox_inventory_item.py index 05e1e2ae2..396678454 100644 --- a/plugins/modules/netbox_inventory_item.py +++ b/plugins/modules/netbox_inventory_item.py @@ -174,6 +174,19 @@ device: test100 state: present + - name: Create inventory item with component + netbox.netbox.netbox_inventory_item: + netbox_url: http://netbox.local + netbox_token: thisIsMyToken + data: + name: "10G-SFP+" + device: test100 + component_type: "dcim.interface" + component: + name: GigabitEthernet2 + device: "test100" + state: present + - name: Delete inventory item within netbox netbox.netbox.netbox_inventory_item: netbox_url: http://netbox.local From 5540cad5fbaf2630187e537911acf67692cea196 Mon Sep 17 00:00:00 2001 From: ahlee1 Date: Sat, 30 Sep 2023 22:44:29 -0400 Subject: [PATCH 07/10] fix bad label --- plugins/modules/netbox_inventory_item.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/modules/netbox_inventory_item.py b/plugins/modules/netbox_inventory_item.py index 396678454..1c4908ae2 100644 --- a/plugins/modules/netbox_inventory_item.py +++ b/plugins/modules/netbox_inventory_item.py @@ -103,12 +103,12 @@ suboptions: name: description: - - The name of the interface + - The name of the component type: str required: False device: description: - - The device the interface is attached to. + - The device the component is attached to. type: str required: False tags: From 07b27f00ec553aa1410af1120e459999d4974c54 Mon Sep 17 00:00:00 2001 From: ahlee1 Date: Sun, 1 Oct 2023 21:28:31 -0400 Subject: [PATCH 08/10] fix comment --- .../targets/v3.3/tasks/netbox_inventory_item.yml | 4 ++-- .../targets/v3.4/tasks/netbox_inventory_item.yml | 6 +++--- .../targets/v3.5/tasks/netbox_inventory_item.yml | 4 ++-- .../targets/v3.6/tasks/netbox_inventory_item.yml | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml index 7c863be10..99c355623 100644 --- a/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml @@ -170,7 +170,7 @@ state: present register: test_seven -- name: "INVENTORY_ITEM 7: ASSERT - Inventory item creation with role" +- name: "INVENTORY_ITEM 7: ASSERT - Inventory item creation with component" ansible.builtin.assert: that: - test_seven is changed @@ -182,7 +182,7 @@ - test_seven.inventory_item.device == 1 - test_seven.msg == "inventory_item test_component created" -- name: "INVENTORY_ITEM 8: Create inventory item with component_type" +- name: "INVENTORY_ITEM 8: Create inventory item creation with missing component_type" netbox.netbox.netbox_inventory_item: netbox_url: http://localhost:32768 netbox_token: 0123456789abcdef0123456789abcdef01234567 diff --git a/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml index 7c863be10..b5d42db8e 100644 --- a/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml @@ -170,7 +170,7 @@ state: present register: test_seven -- name: "INVENTORY_ITEM 7: ASSERT - Inventory item creation with role" +- name: "INVENTORY_ITEM 7: ASSERT - Inventory item creation with component" ansible.builtin.assert: that: - test_seven is changed @@ -182,7 +182,7 @@ - test_seven.inventory_item.device == 1 - test_seven.msg == "inventory_item test_component created" -- name: "INVENTORY_ITEM 8: Create inventory item with component_type" +- name: "INVENTORY_ITEM 8: Create inventory item creation with missing component_type" netbox.netbox.netbox_inventory_item: netbox_url: http://localhost:32768 netbox_token: 0123456789abcdef0123456789abcdef01234567 @@ -200,4 +200,4 @@ ansible.builtin.assert: that: - test_eight.failed - - test_eight.msg == "parameters are required together: component_type, component" + - test_eight.msg == "parameters are required together: component_type, component" \ No newline at end of file diff --git a/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml index 7c863be10..99c355623 100644 --- a/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml @@ -170,7 +170,7 @@ state: present register: test_seven -- name: "INVENTORY_ITEM 7: ASSERT - Inventory item creation with role" +- name: "INVENTORY_ITEM 7: ASSERT - Inventory item creation with component" ansible.builtin.assert: that: - test_seven is changed @@ -182,7 +182,7 @@ - test_seven.inventory_item.device == 1 - test_seven.msg == "inventory_item test_component created" -- name: "INVENTORY_ITEM 8: Create inventory item with component_type" +- name: "INVENTORY_ITEM 8: Create inventory item creation with missing component_type" netbox.netbox.netbox_inventory_item: netbox_url: http://localhost:32768 netbox_token: 0123456789abcdef0123456789abcdef01234567 diff --git a/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml index 7c863be10..b5d42db8e 100644 --- a/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml @@ -170,7 +170,7 @@ state: present register: test_seven -- name: "INVENTORY_ITEM 7: ASSERT - Inventory item creation with role" +- name: "INVENTORY_ITEM 7: ASSERT - Inventory item creation with component" ansible.builtin.assert: that: - test_seven is changed @@ -182,7 +182,7 @@ - test_seven.inventory_item.device == 1 - test_seven.msg == "inventory_item test_component created" -- name: "INVENTORY_ITEM 8: Create inventory item with component_type" +- name: "INVENTORY_ITEM 8: Create inventory item creation with missing component_type" netbox.netbox.netbox_inventory_item: netbox_url: http://localhost:32768 netbox_token: 0123456789abcdef0123456789abcdef01234567 @@ -200,4 +200,4 @@ ansible.builtin.assert: that: - test_eight.failed - - test_eight.msg == "parameters are required together: component_type, component" + - test_eight.msg == "parameters are required together: component_type, component" \ No newline at end of file From fb51b24e19133d7eef391103ae7b24c1dbf22595 Mon Sep 17 00:00:00 2001 From: ahlee1 Date: Sun, 1 Oct 2023 21:30:05 -0400 Subject: [PATCH 09/10] fix yamllint --- tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml | 2 +- tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml index b5d42db8e..99c355623 100644 --- a/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml @@ -200,4 +200,4 @@ ansible.builtin.assert: that: - test_eight.failed - - test_eight.msg == "parameters are required together: component_type, component" \ No newline at end of file + - test_eight.msg == "parameters are required together: component_type, component" diff --git a/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml index b5d42db8e..99c355623 100644 --- a/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml @@ -200,4 +200,4 @@ ansible.builtin.assert: that: - test_eight.failed - - test_eight.msg == "parameters are required together: component_type, component" \ No newline at end of file + - test_eight.msg == "parameters are required together: component_type, component" From b4941c068c11b737f6fb29ea0e2f24f26e0c5b50 Mon Sep 17 00:00:00 2001 From: ahlee1 Date: Sun, 1 Oct 2023 21:35:47 -0400 Subject: [PATCH 10/10] more comment fixes --- tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml | 2 +- tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml | 2 +- tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml | 2 +- tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml index 99c355623..cc038ac94 100644 --- a/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.3/tasks/netbox_inventory_item.yml @@ -182,7 +182,7 @@ - test_seven.inventory_item.device == 1 - test_seven.msg == "inventory_item test_component created" -- name: "INVENTORY_ITEM 8: Create inventory item creation with missing component_type" +- name: "INVENTORY_ITEM 8: Create inventory item with missing component_type" netbox.netbox.netbox_inventory_item: netbox_url: http://localhost:32768 netbox_token: 0123456789abcdef0123456789abcdef01234567 diff --git a/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml index 99c355623..cc038ac94 100644 --- a/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.4/tasks/netbox_inventory_item.yml @@ -182,7 +182,7 @@ - test_seven.inventory_item.device == 1 - test_seven.msg == "inventory_item test_component created" -- name: "INVENTORY_ITEM 8: Create inventory item creation with missing component_type" +- name: "INVENTORY_ITEM 8: Create inventory item with missing component_type" netbox.netbox.netbox_inventory_item: netbox_url: http://localhost:32768 netbox_token: 0123456789abcdef0123456789abcdef01234567 diff --git a/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml index 99c355623..cc038ac94 100644 --- a/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.5/tasks/netbox_inventory_item.yml @@ -182,7 +182,7 @@ - test_seven.inventory_item.device == 1 - test_seven.msg == "inventory_item test_component created" -- name: "INVENTORY_ITEM 8: Create inventory item creation with missing component_type" +- name: "INVENTORY_ITEM 8: Create inventory item with missing component_type" netbox.netbox.netbox_inventory_item: netbox_url: http://localhost:32768 netbox_token: 0123456789abcdef0123456789abcdef01234567 diff --git a/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml b/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml index 99c355623..cc038ac94 100644 --- a/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml +++ b/tests/integration/targets/v3.6/tasks/netbox_inventory_item.yml @@ -182,7 +182,7 @@ - test_seven.inventory_item.device == 1 - test_seven.msg == "inventory_item test_component created" -- name: "INVENTORY_ITEM 8: Create inventory item creation with missing component_type" +- name: "INVENTORY_ITEM 8: Create inventory item with missing component_type" netbox.netbox.netbox_inventory_item: netbox_url: http://localhost:32768 netbox_token: 0123456789abcdef0123456789abcdef01234567