From 407db68f297e9b1810bb963638603cbf966a14c7 Mon Sep 17 00:00:00 2001 From: Joe Wesch Date: Fri, 13 Sep 2024 19:57:32 -0500 Subject: [PATCH 1/8] Fixes converting list items to ID --- plugins/module_utils/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/module_utils/utils.py b/plugins/module_utils/utils.py index 20c9e1df..08b9191b 100644 --- a/plugins/module_utils/utils.py +++ b/plugins/module_utils/utils.py @@ -886,7 +886,7 @@ def _find_ids(self, data, user_query_params): else: # Reminder: this get checks the QUERY_TYPES constant above, if the item is not in the list # of approved query types, then it defaults to a q search - temp_dict = {QUERY_TYPES.get(k, "q"): search} + temp_dict = {QUERY_TYPES.get(k, "q"): list_item} query_id = self._nb_endpoint_get(nb_endpoint, temp_dict, k) if query_id: From 5d3a582157310c87295ea18fb5d3705912ae2bad Mon Sep 17 00:00:00 2001 From: Joe Wesch Date: Fri, 13 Sep 2024 20:41:31 -0500 Subject: [PATCH 2/8] Adds regression test --- tests/integration/nautobot-populate.py | 6 +++++- .../targets/regression-latest/tasks/main.yml | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/tests/integration/nautobot-populate.py b/tests/integration/nautobot-populate.py index 11f27626..51efed61 100755 --- a/tests/integration/nautobot-populate.py +++ b/tests/integration/nautobot-populate.py @@ -86,7 +86,11 @@ def make_nautobot_calls(endpoint, payload): created_admin_users = make_nautobot_calls(nb.users.users, admin_users) # Create Admin User Groups -admin_groups = [{"name": "A Test Admin User Group"}] +admin_groups = [ + {"name": "A Test Admin User Group"}, + {"name": "A Test Admin User Group 2"}, + {"name": "A Test Admin User Group 3"}, +] created_admin_groups = make_nautobot_calls(nb.users.groups, admin_groups) # Create TENANT GROUPS diff --git a/tests/integration/targets/regression-latest/tasks/main.yml b/tests/integration/targets/regression-latest/tasks/main.yml index 8c203594..217cd2a5 100644 --- a/tests/integration/targets/regression-latest/tasks/main.yml +++ b/tests/integration/targets/regression-latest/tasks/main.yml @@ -239,4 +239,19 @@ - name: Assert that api_version fails assert: that: - - '"Invalid version" in test_invalid_api_version["msg"]' \ No newline at end of file + - '"Invalid version" in test_invalid_api_version["msg"]' + + - name: Verify that we can convert a list of strings to ID (Issue 421) + networktocode.nautobot.admin_permission: + url: "{{ nautobot_url }}" + token: "{{ nautobot_token }}" + name: "Regression Permission Test One" + groups: + - "A Test Admin User Group" + - "A Test Admin User Group 2" + - "A Test Admin User Group 3" + actions: + - view + enabled: true + object_types: + - "dcim.device" From 05a333c4b54585efdb6ded509b045ea9dccb3075 Mon Sep 17 00:00:00 2001 From: Joe Wesch Date: Sat, 14 Sep 2024 16:53:51 -0500 Subject: [PATCH 3/8] Release v5.3.1 --- CHANGELOG.rst | 7 +++++++ changelogs/changelog.yaml | 4 ++++ docs/plugins/admin_group_module.rst | 2 +- docs/plugins/admin_permission_module.rst | 2 +- docs/plugins/admin_user_module.rst | 2 +- docs/plugins/cable_module.rst | 2 +- docs/plugins/circuit_module.rst | 2 +- docs/plugins/circuit_termination_module.rst | 2 +- docs/plugins/circuit_type_module.rst | 2 +- docs/plugins/cluster_group_module.rst | 2 +- docs/plugins/cluster_module.rst | 2 +- docs/plugins/cluster_type_module.rst | 2 +- docs/plugins/console_port_module.rst | 2 +- docs/plugins/console_port_template_module.rst | 2 +- docs/plugins/console_server_port_module.rst | 2 +- docs/plugins/console_server_port_template_module.rst | 2 +- docs/plugins/contact_module.rst | 2 +- docs/plugins/controller_module.rst | 2 +- docs/plugins/custom_field_choice_module.rst | 2 +- docs/plugins/custom_field_module.rst | 2 +- docs/plugins/device_bay_module.rst | 2 +- docs/plugins/device_bay_template_module.rst | 2 +- docs/plugins/device_interface_module.rst | 2 +- docs/plugins/device_interface_template_module.rst | 2 +- docs/plugins/device_module.rst | 2 +- docs/plugins/device_redundancy_group_module.rst | 2 +- docs/plugins/device_type_module.rst | 2 +- docs/plugins/front_port_module.rst | 2 +- docs/plugins/front_port_template_module.rst | 2 +- docs/plugins/gql_inventory_inventory.rst | 2 +- docs/plugins/index.rst | 2 +- docs/plugins/inventory_inventory.rst | 2 +- docs/plugins/inventory_item_module.rst | 2 +- docs/plugins/ip_address_module.rst | 2 +- docs/plugins/ip_address_to_interface_module.rst | 2 +- docs/plugins/location_module.rst | 2 +- docs/plugins/location_type_module.rst | 2 +- docs/plugins/lookup_graphql_lookup.rst | 2 +- docs/plugins/lookup_lookup.rst | 2 +- docs/plugins/manufacturer_module.rst | 2 +- docs/plugins/namespace_module.rst | 2 +- docs/plugins/nautobot_server_module.rst | 2 +- docs/plugins/platform_module.rst | 2 +- docs/plugins/plugin_module.rst | 2 +- docs/plugins/power_feed_module.rst | 2 +- docs/plugins/power_outlet_module.rst | 2 +- docs/plugins/power_outlet_template_module.rst | 2 +- docs/plugins/power_panel_module.rst | 2 +- docs/plugins/power_port_module.rst | 2 +- docs/plugins/power_port_template_module.rst | 2 +- docs/plugins/prefix_module.rst | 2 +- docs/plugins/provider_module.rst | 2 +- docs/plugins/query_graphql_module.rst | 2 +- docs/plugins/rack_group_module.rst | 2 +- docs/plugins/rack_module.rst | 2 +- docs/plugins/rear_port_module.rst | 2 +- docs/plugins/rear_port_template_module.rst | 2 +- docs/plugins/relationship_association_module.rst | 2 +- docs/plugins/rir_module.rst | 2 +- docs/plugins/role_module.rst | 2 +- docs/plugins/route_target_module.rst | 2 +- docs/plugins/service_module.rst | 2 +- docs/plugins/status_module.rst | 2 +- docs/plugins/tag_module.rst | 2 +- docs/plugins/team_module.rst | 2 +- docs/plugins/tenant_group_module.rst | 2 +- docs/plugins/tenant_module.rst | 2 +- docs/plugins/virtual_chassis_module.rst | 2 +- docs/plugins/virtual_machine_module.rst | 2 +- docs/plugins/vlan_group_module.rst | 2 +- docs/plugins/vlan_location_module.rst | 2 +- docs/plugins/vlan_module.rst | 2 +- docs/plugins/vm_interface_module.rst | 2 +- docs/plugins/vrf_module.rst | 2 +- galaxy.yml | 2 +- pyproject.toml | 2 +- 76 files changed, 85 insertions(+), 74 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index aa04e11c..bdd8992c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,13 @@ networktocode.nautobot Release Notes .. contents:: Topics +v5.3.1 +====== + +Minor Changes +------------- +- (#422) Fixed `admin_permission` module to properly convert list of groups to UUIDs + v5.3.0 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 3ba8efa9..7896c5d9 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -477,3 +477,7 @@ releases: - (#352) Added IPv6 support as the default IP version for `gql_inventory` plugin - (#415) Added `role` option to `vm_interface` module - (#416) Fixed `location_type` idempotency for `location` module + 5.3.1: + changes: + minor_changes: + - (#422) Fixed `admin_permission` module to properly convert list of groups to UUIDs diff --git a/docs/plugins/admin_group_module.rst b/docs/plugins/admin_group_module.rst index 99c5ab24..78fb46dc 100644 --- a/docs/plugins/admin_group_module.rst +++ b/docs/plugins/admin_group_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.admin_group module -- Create, update or delete admin grou .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/admin_permission_module.rst b/docs/plugins/admin_permission_module.rst index e39cc775..cf142b52 100644 --- a/docs/plugins/admin_permission_module.rst +++ b/docs/plugins/admin_permission_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.admin_permission module -- Create, update or delete objec .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/admin_user_module.rst b/docs/plugins/admin_user_module.rst index b6267935..4943c730 100644 --- a/docs/plugins/admin_user_module.rst +++ b/docs/plugins/admin_user_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.admin_user module -- Create, update or delete users withi .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/cable_module.rst b/docs/plugins/cable_module.rst index 07871e00..aedfc9fe 100755 --- a/docs/plugins/cable_module.rst +++ b/docs/plugins/cable_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.cable module -- Create, update or delete cables within Na .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/circuit_module.rst b/docs/plugins/circuit_module.rst index 0863e6a0..ee3958fe 100755 --- a/docs/plugins/circuit_module.rst +++ b/docs/plugins/circuit_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.circuit module -- Create, update or delete circuits withi .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/circuit_termination_module.rst b/docs/plugins/circuit_termination_module.rst index da278e60..dab22a41 100755 --- a/docs/plugins/circuit_termination_module.rst +++ b/docs/plugins/circuit_termination_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.circuit_termination module -- Create, update or delete ci .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/circuit_type_module.rst b/docs/plugins/circuit_type_module.rst index c495f218..9cab50fd 100755 --- a/docs/plugins/circuit_type_module.rst +++ b/docs/plugins/circuit_type_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.circuit_type module -- Create, update or delete circuit t .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/cluster_group_module.rst b/docs/plugins/cluster_group_module.rst index 3aec8ca8..cd1aa248 100755 --- a/docs/plugins/cluster_group_module.rst +++ b/docs/plugins/cluster_group_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.cluster_group module -- Create, update or delete cluster .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/cluster_module.rst b/docs/plugins/cluster_module.rst index 3a9b95b9..a8347810 100755 --- a/docs/plugins/cluster_module.rst +++ b/docs/plugins/cluster_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.cluster module -- Create, update or delete clusters withi .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/cluster_type_module.rst b/docs/plugins/cluster_type_module.rst index abbe3fc8..a01328cc 100755 --- a/docs/plugins/cluster_type_module.rst +++ b/docs/plugins/cluster_type_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.cluster_type module -- Create, update or delete cluster t .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/console_port_module.rst b/docs/plugins/console_port_module.rst index 7b59529b..2d4ae7f2 100755 --- a/docs/plugins/console_port_module.rst +++ b/docs/plugins/console_port_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.console_port module -- Create, update or delete console p .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/console_port_template_module.rst b/docs/plugins/console_port_template_module.rst index fa0d21a6..0e54efae 100755 --- a/docs/plugins/console_port_template_module.rst +++ b/docs/plugins/console_port_template_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.console_port_template module -- Create, update or delete .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/console_server_port_module.rst b/docs/plugins/console_server_port_module.rst index 8ca11ff4..4b7e06a4 100755 --- a/docs/plugins/console_server_port_module.rst +++ b/docs/plugins/console_server_port_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.console_server_port module -- Create, update or delete co .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/console_server_port_template_module.rst b/docs/plugins/console_server_port_template_module.rst index 1ace5085..2ea851f6 100755 --- a/docs/plugins/console_server_port_template_module.rst +++ b/docs/plugins/console_server_port_template_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.console_server_port_template module -- Create, update or .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/contact_module.rst b/docs/plugins/contact_module.rst index eb317f32..06d9a830 100644 --- a/docs/plugins/contact_module.rst +++ b/docs/plugins/contact_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.contact module -- Creates or removes contacts from Nautob .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/controller_module.rst b/docs/plugins/controller_module.rst index 10041c8e..85af13f3 100644 --- a/docs/plugins/controller_module.rst +++ b/docs/plugins/controller_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.controller module -- Create, update or delete controllers .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/custom_field_choice_module.rst b/docs/plugins/custom_field_choice_module.rst index a5a1cf48..bb95d218 100755 --- a/docs/plugins/custom_field_choice_module.rst +++ b/docs/plugins/custom_field_choice_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.custom_field_choice module -- Creates or removes custom f .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/custom_field_module.rst b/docs/plugins/custom_field_module.rst index 5cb85422..32caa51f 100755 --- a/docs/plugins/custom_field_module.rst +++ b/docs/plugins/custom_field_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.custom_field module -- Creates or removes custom fields f .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/device_bay_module.rst b/docs/plugins/device_bay_module.rst index a633b1e5..34a05bbe 100755 --- a/docs/plugins/device_bay_module.rst +++ b/docs/plugins/device_bay_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.device_bay module -- Create, update or delete device bays .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/device_bay_template_module.rst b/docs/plugins/device_bay_template_module.rst index ce908880..f2096938 100755 --- a/docs/plugins/device_bay_template_module.rst +++ b/docs/plugins/device_bay_template_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.device_bay_template module -- Create, update or delete de .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/device_interface_module.rst b/docs/plugins/device_interface_module.rst index 201625bb..4383541f 100755 --- a/docs/plugins/device_interface_module.rst +++ b/docs/plugins/device_interface_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.device_interface module -- Creates or removes interfaces .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/device_interface_template_module.rst b/docs/plugins/device_interface_template_module.rst index fdd6da43..19e790cf 100755 --- a/docs/plugins/device_interface_template_module.rst +++ b/docs/plugins/device_interface_template_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.device_interface_template module -- Creates or removes in .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/device_module.rst b/docs/plugins/device_module.rst index 02bd3750..d2a5db4c 100755 --- a/docs/plugins/device_module.rst +++ b/docs/plugins/device_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.device module -- Create, update or delete devices within .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/device_redundancy_group_module.rst b/docs/plugins/device_redundancy_group_module.rst index 73b3b7e4..2248c64f 100755 --- a/docs/plugins/device_redundancy_group_module.rst +++ b/docs/plugins/device_redundancy_group_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.device_redundancy_group module -- Creates or removes devi .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/device_type_module.rst b/docs/plugins/device_type_module.rst index 207a566f..5f9dd865 100755 --- a/docs/plugins/device_type_module.rst +++ b/docs/plugins/device_type_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.device_type module -- Create, update or delete device typ .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/front_port_module.rst b/docs/plugins/front_port_module.rst index 162aa65e..e438a2f5 100755 --- a/docs/plugins/front_port_module.rst +++ b/docs/plugins/front_port_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.front_port module -- Create, update or delete front ports .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/front_port_template_module.rst b/docs/plugins/front_port_template_module.rst index 5294216e..c75b16b2 100755 --- a/docs/plugins/front_port_template_module.rst +++ b/docs/plugins/front_port_template_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.front_port_template module -- Create, update or delete fr .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/gql_inventory_inventory.rst b/docs/plugins/gql_inventory_inventory.rst index 88301a05..0ae1cc97 100755 --- a/docs/plugins/gql_inventory_inventory.rst +++ b/docs/plugins/gql_inventory_inventory.rst @@ -22,7 +22,7 @@ networktocode.nautobot.gql_inventory inventory -- Nautobot inventory source usin .. Collection note .. note:: - This inventory plugin is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This inventory plugin is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/index.rst b/docs/plugins/index.rst index 4ede6f9f..8e3fe2cc 100755 --- a/docs/plugins/index.rst +++ b/docs/plugins/index.rst @@ -7,7 +7,7 @@ Networktocode.Nautobot ====================== -Collection version 5.3.0 +Collection version 5.3.1 .. contents:: :local: diff --git a/docs/plugins/inventory_inventory.rst b/docs/plugins/inventory_inventory.rst index fdc47d1c..fb5115f5 100755 --- a/docs/plugins/inventory_inventory.rst +++ b/docs/plugins/inventory_inventory.rst @@ -22,7 +22,7 @@ networktocode.nautobot.inventory inventory -- Nautobot inventory source .. Collection note .. note:: - This inventory plugin is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This inventory plugin is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/inventory_item_module.rst b/docs/plugins/inventory_item_module.rst index 9d80ea16..d34b189a 100755 --- a/docs/plugins/inventory_item_module.rst +++ b/docs/plugins/inventory_item_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.inventory_item module -- Creates or removes inventory ite .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/ip_address_module.rst b/docs/plugins/ip_address_module.rst index 7bf1d1d8..21208e5d 100755 --- a/docs/plugins/ip_address_module.rst +++ b/docs/plugins/ip_address_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.ip_address module -- Creates or removes IP addresses from .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/ip_address_to_interface_module.rst b/docs/plugins/ip_address_to_interface_module.rst index 33ac3134..0a417f1e 100755 --- a/docs/plugins/ip_address_to_interface_module.rst +++ b/docs/plugins/ip_address_to_interface_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.ip_address_to_interface module -- Creates or removes IP a .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/location_module.rst b/docs/plugins/location_module.rst index d6a43165..0a7b2a52 100755 --- a/docs/plugins/location_module.rst +++ b/docs/plugins/location_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.location module -- Creates or removes locations from Naut .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/location_type_module.rst b/docs/plugins/location_type_module.rst index c387860e..2c85c658 100755 --- a/docs/plugins/location_type_module.rst +++ b/docs/plugins/location_type_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.location_type module -- Creates or removes location types .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/lookup_graphql_lookup.rst b/docs/plugins/lookup_graphql_lookup.rst index ff6a1917..98881758 100755 --- a/docs/plugins/lookup_graphql_lookup.rst +++ b/docs/plugins/lookup_graphql_lookup.rst @@ -22,7 +22,7 @@ networktocode.nautobot.lookup_graphql lookup -- Queries and returns elements fro .. Collection note .. note:: - This lookup plugin is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This lookup plugin is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/lookup_lookup.rst b/docs/plugins/lookup_lookup.rst index e534f8a8..f75ec034 100755 --- a/docs/plugins/lookup_lookup.rst +++ b/docs/plugins/lookup_lookup.rst @@ -22,7 +22,7 @@ networktocode.nautobot.lookup lookup -- Queries and returns elements from Nautob .. Collection note .. note:: - This lookup plugin is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This lookup plugin is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/manufacturer_module.rst b/docs/plugins/manufacturer_module.rst index fc1aa59a..1edf56c7 100755 --- a/docs/plugins/manufacturer_module.rst +++ b/docs/plugins/manufacturer_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.manufacturer module -- Create or delete manufacturers wit .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/namespace_module.rst b/docs/plugins/namespace_module.rst index fed3facb..44e79c1c 100755 --- a/docs/plugins/namespace_module.rst +++ b/docs/plugins/namespace_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.namespace module -- Creates or removes namespaces from Na .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/nautobot_server_module.rst b/docs/plugins/nautobot_server_module.rst index 25b63f73..c954cad6 100755 --- a/docs/plugins/nautobot_server_module.rst +++ b/docs/plugins/nautobot_server_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.nautobot_server module -- Manages Nautobot Server applica .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/platform_module.rst b/docs/plugins/platform_module.rst index bb15c0dd..3acee265 100755 --- a/docs/plugins/platform_module.rst +++ b/docs/plugins/platform_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.platform module -- Create or delete platforms within Naut .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/plugin_module.rst b/docs/plugins/plugin_module.rst index 1fe49bf9..0a0b5aac 100755 --- a/docs/plugins/plugin_module.rst +++ b/docs/plugins/plugin_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.plugin module -- CRUD operation on plugin objects .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/power_feed_module.rst b/docs/plugins/power_feed_module.rst index 617d12c3..0f397b8e 100755 --- a/docs/plugins/power_feed_module.rst +++ b/docs/plugins/power_feed_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.power_feed module -- Create, update or delete power feeds .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/power_outlet_module.rst b/docs/plugins/power_outlet_module.rst index 36d24a74..62aae165 100755 --- a/docs/plugins/power_outlet_module.rst +++ b/docs/plugins/power_outlet_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.power_outlet module -- Create, update or delete power out .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/power_outlet_template_module.rst b/docs/plugins/power_outlet_template_module.rst index cac8f02a..de9db14f 100755 --- a/docs/plugins/power_outlet_template_module.rst +++ b/docs/plugins/power_outlet_template_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.power_outlet_template module -- Create, update or delete .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/power_panel_module.rst b/docs/plugins/power_panel_module.rst index c20cc168..030e1d9a 100755 --- a/docs/plugins/power_panel_module.rst +++ b/docs/plugins/power_panel_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.power_panel module -- Create, update or delete power pane .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/power_port_module.rst b/docs/plugins/power_port_module.rst index d2632cbe..a998d361 100755 --- a/docs/plugins/power_port_module.rst +++ b/docs/plugins/power_port_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.power_port module -- Create, update or delete power ports .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/power_port_template_module.rst b/docs/plugins/power_port_template_module.rst index d2a98ca9..70079546 100755 --- a/docs/plugins/power_port_template_module.rst +++ b/docs/plugins/power_port_template_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.power_port_template module -- Create, update or delete po .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/prefix_module.rst b/docs/plugins/prefix_module.rst index 791f56e0..cd88cfb1 100755 --- a/docs/plugins/prefix_module.rst +++ b/docs/plugins/prefix_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.prefix module -- Creates or removes prefixes from Nautobo .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/provider_module.rst b/docs/plugins/provider_module.rst index a163758e..c0c6b4af 100755 --- a/docs/plugins/provider_module.rst +++ b/docs/plugins/provider_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.provider module -- Create, update or delete providers wit .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/query_graphql_module.rst b/docs/plugins/query_graphql_module.rst index 6ac80667..2f61cca5 100755 --- a/docs/plugins/query_graphql_module.rst +++ b/docs/plugins/query_graphql_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.query_graphql module -- Queries and returns elements from .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/rack_group_module.rst b/docs/plugins/rack_group_module.rst index ecb32a9d..68b94236 100755 --- a/docs/plugins/rack_group_module.rst +++ b/docs/plugins/rack_group_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.rack_group module -- Create, update or delete racks group .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/rack_module.rst b/docs/plugins/rack_module.rst index 604af990..489b798c 100755 --- a/docs/plugins/rack_module.rst +++ b/docs/plugins/rack_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.rack module -- Create, update or delete racks within Naut .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/rear_port_module.rst b/docs/plugins/rear_port_module.rst index 73063ff9..49df98c1 100755 --- a/docs/plugins/rear_port_module.rst +++ b/docs/plugins/rear_port_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.rear_port module -- Create, update or delete rear ports w .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/rear_port_template_module.rst b/docs/plugins/rear_port_template_module.rst index 4b7bd1c9..8cb30f9b 100755 --- a/docs/plugins/rear_port_template_module.rst +++ b/docs/plugins/rear_port_template_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.rear_port_template module -- Create, update or delete rea .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/relationship_association_module.rst b/docs/plugins/relationship_association_module.rst index d360e4af..f948f8d1 100755 --- a/docs/plugins/relationship_association_module.rst +++ b/docs/plugins/relationship_association_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.relationship_association module -- Creates or removes a r .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/rir_module.rst b/docs/plugins/rir_module.rst index 746d14bf..70003637 100755 --- a/docs/plugins/rir_module.rst +++ b/docs/plugins/rir_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.rir module -- Create, update or delete RIRs within Nautob .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/role_module.rst b/docs/plugins/role_module.rst index 24079cd3..6cc8a39b 100755 --- a/docs/plugins/role_module.rst +++ b/docs/plugins/role_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.role module -- Create, update or delete roles within Naut .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/route_target_module.rst b/docs/plugins/route_target_module.rst index 0993aa28..fd2f24fc 100755 --- a/docs/plugins/route_target_module.rst +++ b/docs/plugins/route_target_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.route_target module -- Creates or removes route targets f .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/service_module.rst b/docs/plugins/service_module.rst index 55f69df6..f9ecfb21 100755 --- a/docs/plugins/service_module.rst +++ b/docs/plugins/service_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.service module -- Creates or removes service from Nautobo .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/status_module.rst b/docs/plugins/status_module.rst index b20525bd..331a9b18 100755 --- a/docs/plugins/status_module.rst +++ b/docs/plugins/status_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.status module -- Creates or removes status from Nautobot .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/tag_module.rst b/docs/plugins/tag_module.rst index 11cd21ca..61ecf9fe 100755 --- a/docs/plugins/tag_module.rst +++ b/docs/plugins/tag_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.tag module -- Creates or removes tags from Nautobot .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/team_module.rst b/docs/plugins/team_module.rst index f29b55af..cdfaeaf1 100644 --- a/docs/plugins/team_module.rst +++ b/docs/plugins/team_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.team module -- Creates or removes teams from Nautobot .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/tenant_group_module.rst b/docs/plugins/tenant_group_module.rst index 6672c7bc..bd0af92e 100755 --- a/docs/plugins/tenant_group_module.rst +++ b/docs/plugins/tenant_group_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.tenant_group module -- Creates or removes tenant groups f .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/tenant_module.rst b/docs/plugins/tenant_module.rst index 01c257c9..54225c63 100755 --- a/docs/plugins/tenant_module.rst +++ b/docs/plugins/tenant_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.tenant module -- Creates or removes tenants from Nautobot .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/virtual_chassis_module.rst b/docs/plugins/virtual_chassis_module.rst index 77f7dc65..8780e611 100755 --- a/docs/plugins/virtual_chassis_module.rst +++ b/docs/plugins/virtual_chassis_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.virtual_chassis module -- Create, update or delete virtua .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/virtual_machine_module.rst b/docs/plugins/virtual_machine_module.rst index 6361e33e..155b1fa2 100755 --- a/docs/plugins/virtual_machine_module.rst +++ b/docs/plugins/virtual_machine_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.virtual_machine module -- Create, update or delete virtua .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/vlan_group_module.rst b/docs/plugins/vlan_group_module.rst index 43fc2d3d..00b04725 100755 --- a/docs/plugins/vlan_group_module.rst +++ b/docs/plugins/vlan_group_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.vlan_group module -- Create, update or delete vlans group .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/vlan_location_module.rst b/docs/plugins/vlan_location_module.rst index 58174fe9..c4e2ce57 100644 --- a/docs/plugins/vlan_location_module.rst +++ b/docs/plugins/vlan_location_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.vlan_location module -- Create, update or delete Location .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/vlan_module.rst b/docs/plugins/vlan_module.rst index b439b35a..ef9393e6 100755 --- a/docs/plugins/vlan_module.rst +++ b/docs/plugins/vlan_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.vlan module -- Create, update or delete vlans within Naut .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/vm_interface_module.rst b/docs/plugins/vm_interface_module.rst index 99af782f..1fccfdb9 100755 --- a/docs/plugins/vm_interface_module.rst +++ b/docs/plugins/vm_interface_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.vm_interface module -- Creates or removes interfaces from .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/docs/plugins/vrf_module.rst b/docs/plugins/vrf_module.rst index 35efb244..40aaffee 100755 --- a/docs/plugins/vrf_module.rst +++ b/docs/plugins/vrf_module.rst @@ -22,7 +22,7 @@ networktocode.nautobot.vrf module -- Create, update or delete vrfs within Nautob .. Collection note .. note:: - This module is part of the `networktocode.nautobot collection `_ (version 5.3.0). + This module is part of the `networktocode.nautobot collection `_ (version 5.3.1). It is not included in ``ansible-core``. To check whether it is installed, run :code:`ansible-galaxy collection list`. diff --git a/galaxy.yml b/galaxy.yml index 74603730..f770c2ae 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -9,7 +9,7 @@ namespace: networktocode name: nautobot # The version of the collection. Must be compatible with semantic versioning -version: 5.3.0 +version: 5.3.1 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/pyproject.toml b/pyproject.toml index c2a9f936..6d0d4158 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nautobot_ansible_modules" -version = "5.3.0" +version = "5.3.1" description = "Ansible collection to interact with Nautobot's API" authors = ["Network to Code "] license = "Apache 2.0" From a6d11e0bb041217a950cd5d58cebd1faeb8bebd8 Mon Sep 17 00:00:00 2001 From: Przemek Rogala Date: Wed, 18 Sep 2024 15:20:16 +0100 Subject: [PATCH 4/8] Ensure default_ip_version is set. Fix add_ip_address logic. --- plugins/inventory/gql_inventory.py | 10 +++++++--- tests/unit/inventory/test_graphql.py | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/plugins/inventory/gql_inventory.py b/plugins/inventory/gql_inventory.py index 5f96ca50..3f912dc3 100644 --- a/plugins/inventory/gql_inventory.py +++ b/plugins/inventory/gql_inventory.py @@ -249,6 +249,7 @@ "role": "name", "location": "id", } +DEFAULT_IP_VERSION_CHOICES = ["IPv4", "ipv4", "IPv6", "ipv6"] class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable): @@ -278,15 +279,15 @@ def add_ip_address(self, device, default_ip_version="ipv4"): # Check to see what the primary IP host addition is, first case is IPv4, which is the default order_of_preference = ["primary_ip4"] - # if default_ip_version is IPv4, prepend, else add to the end + # if default_ip_version is IPv6, prepend, else add to the end if default_ip_version.lower() == "ipv6": order_of_preference.insert(0, "primary_ip6") else: order_of_preference.append("primary_ip6") - # Check of the address types in the order preference and if it find the first one, add that primary IP to the host + # Check of the address types in the order of preference and if it finds the first one, add that primary IP to the host for address_type in order_of_preference: - if address_type in device and device[address_type].get("host"): + if address_type in device and device[address_type] and device[address_type].get("host"): self.add_variable(device["name"], device[address_type]["host"], "ansible_host") return @@ -457,6 +458,9 @@ def parse(self, inventory, loader, path, cache=True): if token: self.headers.update({"Authorization": "Token %s" % token}) + self.default_ip_version = self.get_option("default_ip_version") + if self.default_ip_version not in DEFAULT_IP_VERSION_CHOICES: + raise AnsibleError(f"Invalid choice for default_ip_version: {self.default_ip_version}") self.gql_query = self.get_option("query") self.group_by = self.get_option("group_by") self.follow_redirects = self.get_option("follow_redirects") diff --git a/tests/unit/inventory/test_graphql.py b/tests/unit/inventory/test_graphql.py index b73c6952..ee2f0599 100644 --- a/tests/unit/inventory/test_graphql.py +++ b/tests/unit/inventory/test_graphql.py @@ -172,6 +172,26 @@ def test_add_ip_address_no_ipv6(inventory_fixture, device_data): assert mydevice_host.vars.get("ansible_host") == "10.10.10.10" +def test_add_ip_address_ipv4_none(inventory_fixture, device_data): + """Regression bug test for issue #426.""" + # Set the primary_ip4 to None + device_data["primary_ip4"] = None + try: + inventory_fixture.add_ip_address(device_data, default_ip_version="ipv4") + except AttributeError: + pytest.fail("Hit regression bug, see issue #426.") + + +def test_add_ip_address_ipv6_none(inventory_fixture, device_data): + """Regression bug test for issue #426.""" + # Set the primary_ip6 to None + device_data["primary_ip6"] = None + try: + inventory_fixture.add_ip_address(device_data, default_ip_version="ipv6") + except AttributeError: + pytest.fail("Hit regression bug, see issue #426.") + + def test_ansible_platform(inventory_fixture, device_data): inventory_fixture.group_by = ["location"] inventory_fixture.create_groups(device_data) From aac0cfd628eb9d44aa181819bc0a7537996ffe9f Mon Sep 17 00:00:00 2001 From: Przemek Rogala Date: Wed, 18 Sep 2024 15:24:28 +0100 Subject: [PATCH 5/8] Add changelog. --- CHANGELOG.rst | 1 + changelogs/changelog.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bdd8992c..02b20052 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,7 @@ v5.3.1 Minor Changes ------------- - (#422) Fixed `admin_permission` module to properly convert list of groups to UUIDs +- (#426) Fixed setting of `default_ip_version` option. Fixed logic in `add_ip_address` that sets Ansible `host` values v5.3.0 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 7896c5d9..166232a6 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -481,3 +481,4 @@ releases: changes: minor_changes: - (#422) Fixed `admin_permission` module to properly convert list of groups to UUIDs + - (#426) Fixed setting of `default_ip_version` option. Fixed logic in `add_ip_address` that sets Ansible `host` values From deab6b5f60610a2affc4e8af8899244512166c3a Mon Sep 17 00:00:00 2001 From: Przemek Rogala Date: Wed, 18 Sep 2024 15:27:59 +0100 Subject: [PATCH 6/8] Update PR number. --- CHANGELOG.rst | 2 +- changelogs/changelog.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 02b20052..220716d2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,7 +11,7 @@ v5.3.1 Minor Changes ------------- - (#422) Fixed `admin_permission` module to properly convert list of groups to UUIDs -- (#426) Fixed setting of `default_ip_version` option. Fixed logic in `add_ip_address` that sets Ansible `host` values +- (#427) Fixed setting of `default_ip_version` option. Fixed logic in `add_ip_address` that sets Ansible `host` values v5.3.0 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 166232a6..ec27a261 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -481,4 +481,4 @@ releases: changes: minor_changes: - (#422) Fixed `admin_permission` module to properly convert list of groups to UUIDs - - (#426) Fixed setting of `default_ip_version` option. Fixed logic in `add_ip_address` that sets Ansible `host` values + - (#427) Fixed setting of `default_ip_version` option. Fixed logic in `add_ip_address` that sets Ansible `host` values From 424bad44f3d9978c2cd78d74ce389b8b5d214280 Mon Sep 17 00:00:00 2001 From: Joe Wesch Date: Wed, 18 Sep 2024 10:51:57 -0500 Subject: [PATCH 7/8] Fixes inventory 2.3 tests --- tests/integration/targets/inventory/files/test_2.3-3.json | 8 ++++---- .../inventory/files/test_2.3-3_options_flatten.json | 8 ++++---- .../targets/inventory/files/test_2.3-3_plurals.json | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/integration/targets/inventory/files/test_2.3-3.json b/tests/integration/targets/inventory/files/test_2.3-3.json index 54b2c251..1e5169c9 100644 --- a/tests/integration/targets/inventory/files/test_2.3-3.json +++ b/tests/integration/targets/inventory/files/test_2.3-3.json @@ -117,7 +117,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -274,7 +274,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -742,7 +742,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -903,7 +903,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "2001::/64", + "display": "2001::/64: Global", "ip_version": 6, "namespace": { "custom_fields": {}, diff --git a/tests/integration/targets/inventory/files/test_2.3-3_options_flatten.json b/tests/integration/targets/inventory/files/test_2.3-3_options_flatten.json index dea1fb69..2a04a654 100644 --- a/tests/integration/targets/inventory/files/test_2.3-3_options_flatten.json +++ b/tests/integration/targets/inventory/files/test_2.3-3_options_flatten.json @@ -113,7 +113,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -270,7 +270,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -728,7 +728,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -889,7 +889,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "2001::/64", + "display": "2001::/64: Global", "ip_version": 6, "namespace": { "custom_fields": {}, diff --git a/tests/integration/targets/inventory/files/test_2.3-3_plurals.json b/tests/integration/targets/inventory/files/test_2.3-3_plurals.json index c5482aef..82d98aa9 100644 --- a/tests/integration/targets/inventory/files/test_2.3-3_plurals.json +++ b/tests/integration/targets/inventory/files/test_2.3-3_plurals.json @@ -137,7 +137,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -294,7 +294,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -791,7 +791,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -952,7 +952,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "2001::/64", + "display": "2001::/64: Global", "ip_version": 6, "namespace": { "custom_fields": {}, From 28948b0e8ed39e43bf4ab167fb7404f04ba4cb3e Mon Sep 17 00:00:00 2001 From: Joe Wesch Date: Wed, 18 Sep 2024 10:51:57 -0500 Subject: [PATCH 8/8] Fixes inventory 2.3 tests --- tests/integration/targets/inventory/files/test_2.3-3.json | 8 ++++---- .../inventory/files/test_2.3-3_options_flatten.json | 8 ++++---- .../targets/inventory/files/test_2.3-3_plurals.json | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/integration/targets/inventory/files/test_2.3-3.json b/tests/integration/targets/inventory/files/test_2.3-3.json index 54b2c251..1e5169c9 100644 --- a/tests/integration/targets/inventory/files/test_2.3-3.json +++ b/tests/integration/targets/inventory/files/test_2.3-3.json @@ -117,7 +117,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -274,7 +274,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -742,7 +742,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -903,7 +903,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "2001::/64", + "display": "2001::/64: Global", "ip_version": 6, "namespace": { "custom_fields": {}, diff --git a/tests/integration/targets/inventory/files/test_2.3-3_options_flatten.json b/tests/integration/targets/inventory/files/test_2.3-3_options_flatten.json index dea1fb69..2a04a654 100644 --- a/tests/integration/targets/inventory/files/test_2.3-3_options_flatten.json +++ b/tests/integration/targets/inventory/files/test_2.3-3_options_flatten.json @@ -113,7 +113,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -270,7 +270,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -728,7 +728,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -889,7 +889,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "2001::/64", + "display": "2001::/64: Global", "ip_version": 6, "namespace": { "custom_fields": {}, diff --git a/tests/integration/targets/inventory/files/test_2.3-3_plurals.json b/tests/integration/targets/inventory/files/test_2.3-3_plurals.json index c5482aef..82d98aa9 100644 --- a/tests/integration/targets/inventory/files/test_2.3-3_plurals.json +++ b/tests/integration/targets/inventory/files/test_2.3-3_plurals.json @@ -137,7 +137,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -294,7 +294,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -791,7 +791,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "172.16.0.0/12", + "display": "172.16.0.0/12: Global", "ip_version": 4, "namespace": { "custom_fields": {}, @@ -952,7 +952,7 @@ "custom_fields": {}, "date_allocated": null, "description": "", - "display": "2001::/64", + "display": "2001::/64: Global", "ip_version": 6, "namespace": { "custom_fields": {},