Merge pull request #167 from nautobot/develop

v1.6.1 Release
nautobot · Oct 13, 2023 · 635a590 · 635a590
2 parents 850a1f0 + 664ae19
commit 635a590
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 185 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -116,7 +116,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10"]
         nautobot-version: ["1.4.2", "latest"]
     runs-on: "ubuntu-20.04"
     env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.6.1 - 2023-09-14
+
+### Fixed
+
+- #164 - Update fix for Device Tag retrieval.
+
 ## v1.6.0 - 2023-04-26
 
 ### Added

diff --git a/development/docker-compose.base.yml b/development/docker-compose.base.yml
@@ -23,8 +23,7 @@ services:
     depends_on:
       - "postgres"
       - "redis"
-    <<: *nautobot-build
-    <<: *nautobot-base
+    <<: [*nautobot-build, *nautobot-base]
   worker:
     entrypoint: "nautobot-server rqworker"
     depends_on:

diff --git a/nautobot_ssot_aristacv/tests/test_utils_cloudvision.py b/nautobot_ssot_aristacv/tests/test_utils_cloudvision.py
@@ -123,7 +123,7 @@ def test_get_device_tags(self):
         mock_tag.value.device_id.value = "JPE12345678"
 
         tag_stub = MagicMock()
-        tag_stub.TagAssignmentConfigServiceStub.return_value.GetAll.return_value = [mock_tag]
+        tag_stub.TagAssignmentServiceStub.return_value.GetAll.return_value = [mock_tag]
 
         with patch("nautobot_ssot_aristacv.utils.cloudvision.tag_services", tag_stub):
             results = cloudvision.get_device_tags(client=self.client, device_id="JPE12345678")

diff --git a/nautobot_ssot_aristacv/utils/cloudvision.py b/nautobot_ssot_aristacv/utils/cloudvision.py
@@ -308,12 +308,14 @@ def get_tags_by_type(client, creator_type: int = tag_models.CREATOR_TYPE_USER):
 
 def get_device_tags(client, device_id: str):
     """Get tags for specific device."""
-    tag_stub = tag_services.TagAssignmentConfigServiceStub(client)
+    tag_stub = tag_services.TagAssignmentServiceStub(client)
     req = tag_services.TagAssignmentConfigStreamRequest(
         partial_eq_filter=[
             tag_models.TagAssignmentConfig(
                 key=tag_models.TagAssignmentKey(
                     device_id=StringValue(value=device_id),
+                    element_type=tag_models.ELEMENT_TYPE_DEVICE,
+                    workspace_id=StringValue(value=""),
                 )
             )
         ]