From 360d1e6c97bed4cb83cf608585fc31da20179c32 Mon Sep 17 00:00:00 2001 From: connect Date: Wed, 14 May 2025 12:47:46 +0200 Subject: [PATCH 1/4] Support of object types for netbox_tag module --- plugins/modules/netbox_tag.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/modules/netbox_tag.py b/plugins/modules/netbox_tag.py index d429e16a9..116a20d51 100644 --- a/plugins/modules/netbox_tag.py +++ b/plugins/modules/netbox_tag.py @@ -50,6 +50,12 @@ - Tag description required: false type: str + object_types: + description: + - Objects types using the tag + required: false + type: list + elements: raw required: true """ @@ -119,6 +125,7 @@ def main(): color=dict(required=False, type="str"), description=dict(required=False, type="str"), slug=dict(required=False, type="str"), + object_types=dict(required=False, type="list", elements="raw"), ), ), ) From fcba02ae1521dbcb906d3709ea813201964f5c45 Mon Sep 17 00:00:00 2001 From: connect Date: Wed, 14 May 2025 13:11:49 +0200 Subject: [PATCH 2/4] Tests updates --- plugins/modules/netbox_tag.py | 10 ++++++++++ tests/integration/targets/v4.2/tasks/netbox_tag.yml | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/plugins/modules/netbox_tag.py b/plugins/modules/netbox_tag.py index 116a20d51..428d73f0a 100644 --- a/plugins/modules/netbox_tag.py +++ b/plugins/modules/netbox_tag.py @@ -86,6 +86,16 @@ loop: - mgmt - tun + + - name: Restrict object types + netbox.netbox.netbox_tag: + netbox_url: http://netbox.local + netbox_token: thisIsMyToken + data: + name: "MyTag" + object_types: + - dcim.prefix + """ RETURN = r""" diff --git a/tests/integration/targets/v4.2/tasks/netbox_tag.yml b/tests/integration/targets/v4.2/tasks/netbox_tag.yml index f3fcbac39..d93d80f1a 100644 --- a/tests/integration/targets/v4.2/tasks/netbox_tag.yml +++ b/tests/integration/targets/v4.2/tasks/netbox_tag.yml @@ -12,6 +12,8 @@ name: Test Tag 1 description: Tag 1 test color: "0000ff" + object_types: + - ipem.prefix state: present register: test_one @@ -25,6 +27,7 @@ - test_one['tags']['description'] == "Tag 1 test" - test_one['tags']['name'] == "Test Tag 1" - test_one['tags']['slug'] == "test-tag-1" + - test_one['tags']['object_types'][0] = "ipam.prefix" - test_one['msg'] == "tags Test Tag 1 created" - name: "TAG 2: Create duplicate" @@ -53,6 +56,8 @@ name: Test Tag 1 description: Tag 1 update test color: "00ff00" + object_types: + - ipam.asn state: present register: test_three @@ -65,6 +70,7 @@ - test_three['tags']['name'] == "Test Tag 1" - test_three['tags']['description'] == "Tag 1 update test" - test_three['tags']['color'] == "00ff00" + -test_three['tags']['object_types'][0] == "ipam.asn" - test_three['msg'] == "tags Test Tag 1 updated" - name: "TAG 4: ASSERT - Delete" From 6997296315472fe4ca5aee5a57766c7be35d6ed9 Mon Sep 17 00:00:00 2001 From: connect Date: Mon, 19 May 2025 15:36:18 +0200 Subject: [PATCH 3/4] removed extra spaces --- plugins/modules/netbox_tag.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/modules/netbox_tag.py b/plugins/modules/netbox_tag.py index 428d73f0a..3994151b1 100644 --- a/plugins/modules/netbox_tag.py +++ b/plugins/modules/netbox_tag.py @@ -95,7 +95,6 @@ name: "MyTag" object_types: - dcim.prefix - """ RETURN = r""" From 279fb1f24c07d1b85f3cdc1073f9dd4cff9b3048 Mon Sep 17 00:00:00 2001 From: connect Date: Mon, 19 May 2025 16:41:57 +0200 Subject: [PATCH 4/4] Changelog fragment --- changelogs/fragments/netbox_tag.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/netbox_tag.yml diff --git a/changelogs/fragments/netbox_tag.yml b/changelogs/fragments/netbox_tag.yml new file mode 100644 index 000000000..f54b55e94 --- /dev/null +++ b/changelogs/fragments/netbox_tag.yml @@ -0,0 +1,2 @@ +minor_changes: + - netbox_tag - Add support for object_types on tags