Skip to content

Commit de289d7

Browse files
BugFix: Convert keys in build_query_params (#86)
1 parent ee9c1b8 commit de289d7

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

plugins/module_utils/netbox_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@
324324
"tenant_group": set(["name"]),
325325
"untagged_vlan": set(["name", "site", "vlan_group", "tenant"]),
326326
"virtual_machine": set(["name", "cluster"]),
327-
"vlan": set(["name", "site", "tenant"]),
327+
"vlan": set(["name", "site", "tenant", "vlan_group"]),
328328
"vlan_group": set(["slug", "site"]),
329329
"vrf": set(["name", "tenant"]),
330330
}
@@ -340,7 +340,6 @@
340340
"site",
341341
"tenant",
342342
"type",
343-
"vlan_group",
344343
"virtual_machine",
345344
]
346345
)
@@ -578,6 +577,7 @@ def _build_query_params(self, parent, module_data, child=None):
578577
else:
579578
query_dict.update({"device": module_data["device"]})
580579

580+
query_dict = self._convert_identical_keys(query_dict)
581581
return query_dict
582582

583583
def _change_choices_id(self, endpoint, data):

tests/unit/module_utils/test_netbox_base_class.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
# Copyright: (c) 2019, Mikhail Yohman (@FragmentedPacket) <mikhail.yohman@gmail.com>
44
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
55

6-
# import unittest
7-
# from units.compat import unittest
8-
# from units.compat.mock import patch, MagicMock, Mock
9-
106
import pytest
117
from unittest.mock import patch, MagicMock, Mock
128
from ansible.module_utils.basic import AnsibleModule
@@ -803,7 +799,12 @@ def test_build_query_params_no_child(
803799
"tenant": "Test Tenant",
804800
"vlan_group": "Test VLAN group",
805801
},
806-
{"name": "Test VLAN", "site_id": 1, "tenant_id": 1},
802+
{
803+
"name": "Test VLAN",
804+
"site_id": 1,
805+
"tenant_id": 1,
806+
"group": "Test VLAN group",
807+
},
807808
),
808809
(
809810
"vlan_group",

0 commit comments

Comments
 (0)