Merge branch 'main' into Release/0.33.4

cisco-open · Apr 22, 2024 · 20f4c59 · 20f4c59
2 parents 93b3c98 + f168269
commit 20f4c59
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/catalystwan/endpoints/configuration_device_actions.py b/catalystwan/endpoints/configuration_device_actions.py
@@ -27,7 +27,7 @@ class ActionId(BaseModel):
 
 
 class GroupId(BaseModel):
-    group_id: str = Field(default="all", serialization_alias="groupID", validation_alias="groupID")
+    group_id: str = Field(default="all", serialization_alias="groupId", validation_alias="groupId")
 
 
 class ZTPUpgradeSettings(BaseModel):

diff --git a/catalystwan/endpoints/configuration_device_inventory.py b/catalystwan/endpoints/configuration_device_inventory.py
@@ -2,7 +2,7 @@
 
 # mypy: disable-error-code="empty-body"
 from pathlib import Path
-from typing import List, Literal, Optional, Union
+from typing import Dict, List, Literal, Optional, Union
 from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field
@@ -126,7 +126,7 @@ class DeviceDetailsResponse(BaseModel):
         default=None, validation_alias="resourceGroup", serialization_alias="resourceGroup"
     )
     id: Optional[str] = None
-    tags: Optional[List[str]] = None
+    tags: Optional[Union[List[str], List[Dict]]] = None
     draft_mode: Optional[str] = Field(default=None, validation_alias="draftMode", serialization_alias="draftMode")
     solution: Optional[str] = None
     device_lock: Optional[str] = Field(default=None, validation_alias="device-lock", serialization_alias="device-lock")

diff --git a/catalystwan/endpoints/configuration_settings.py b/catalystwan/endpoints/configuration_settings.py
@@ -20,9 +20,9 @@
 class Organization(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     org: Optional[str] = Field(default=None)
-    domain_id: Optional[str] = Field(serialization_alias="domain-id", validation_alias="domain-id")
+    domain_id: Optional[str] = Field(default=None, serialization_alias="domain-id", validation_alias="domain-id")
     control_connection_up: Optional[bool] = Field(
-        serialization_alias="controlConnectionUp", validation_alias="controlConnectionUp"
+        default=None, serialization_alias="controlConnectionUp", validation_alias="controlConnectionUp"
     )