catalystwan 0.41.4.dev3__tar.gz → 0.41.5.dev1__tar.gz

{catalystwan-0.41.4.dev3 → catalystwan-0.41.5.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: catalystwan
-Version: 0.41.4.dev3
+Version: 0.41.5.dev1
 Summary: Cisco Catalyst WAN SDK for Python
 Author: sbasan
 Author-email: sbasan@cisco.com

{catalystwan-0.41.4.dev3 → catalystwan-0.41.5.dev1}/catalystwan/api/builders/feature_profiles/service.py

@@ -69,6 +69,7 @@ class ServiceFeatureProfileBuilder(TrackerMixin):
         self._interfaces_with_attached_dhcp_server: Dict[str, LanVpnDhcpServerParcel] = {}
         # Trackers
         self.init_tracker()
+        self._dhcp_server_uuids: Dict[str, UUID] = {}
 
     def add_profile_name_and_description(self, feature_profile: FeatureProfileCreationPayload) -> None:
         """
@@ -216,7 +217,7 @@ class ServiceFeatureProfileBuilder(TrackerMixin):
                         continue
 
                     if dhcp_server:
-                        dhcp_server_uuid = self._create_parcel(profile_uuid, dhcp_server)
+                        dhcp_server_uuid = self._get_or_create_dhcp_server_uuid(profile_uuid, dhcp_server)
                         if dhcp_server_uuid is not None:
                             with handle_association_request(self.build_report, sub_parcel):
                                 self._endpoints.associate_dhcp_server_with_vpn_interface(
@@ -246,3 +247,11 @@ class ServiceFeatureProfileBuilder(TrackerMixin):
     @handle_create_parcel
     def _create_parcel(self, profile_uuid: UUID, parcel: AnyServiceParcel, vpn_uuid: Optional[None] = None) -> UUID:
         return self._api.create_parcel(profile_uuid, parcel, vpn_uuid).id
+
+    def _get_or_create_dhcp_server_uuid(self, profile_uuid: UUID, dhcp_server: LanVpnDhcpServerParcel) -> UUID:
+        existing_uuid = self._dhcp_server_uuids.get(dhcp_server.parcel_name)
+        if existing_uuid:
+            return existing_uuid
+        dhcp_server_uuid = self._create_parcel(profile_uuid, dhcp_server)
+        self._dhcp_server_uuids[dhcp_server.parcel_name] = dhcp_server_uuid
+        return dhcp_server_uuid

catalystwan-0.41.5.dev1/catalystwan/api/templates/device_variable.py

@@ -0,0 +1,17 @@
+# Copyright 2023 Cisco Systems, Inc. and its affiliates
+
+from typing import Literal, Optional, Tuple
+
+from pydantic import BaseModel, PrivateAttr
+
+VariableObjectType = Literal["variable", "variableName"]
+
+
+class DeviceVariable(BaseModel):
+    name: str
+    _object_type: VariableObjectType = PrivateAttr(default="variableName")
+    _template_path: Optional[Tuple[str, ...]] = PrivateAttr(default=None)
+
+    def __eq__(self, other):
+        # do not compare private attributes for backward compatibility
+        return self.__dict__ == other.__dict__

{catalystwan-0.41.4.dev3 → catalystwan-0.41.5.dev1}/catalystwan/endpoints/configuration_device_inventory.py

@@ -13,11 +13,15 @@ from catalystwan.utils.personality import Personality
 
 
 class UnlockDeviceDetail(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+
     device_id: str = Field(validation_alias="deviceId", serialization_alias="deviceId")
     device_ip: str = Field(validation_alias="deviceIP", serialization_alias="deviceIP")
 
 
 class DeviceUnlockPayload(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+
     device_type: str = Field(validation_alias="deviceType", serialization_alias="deviceType")
     devices: List[UnlockDeviceDetail]
 
@@ -274,16 +278,13 @@ class UploadSerialFileResponse(BaseModel):
 class ConfigurationDeviceInventory(APIEndpoints):
     @versions(supported_versions=(">=20.9"), raises=False)
     @post("/system/device/{device_uuid}/unlock")
-    def unlock(self, device_uuid: UUID, payload: DeviceUnlockPayload) -> DeviceUnlockResponse:
-        ...
+    def unlock(self, device_uuid: UUID, payload: DeviceUnlockPayload) -> DeviceUnlockResponse: ...
 
     @post("/system/device")
-    def create_device(self, payload: DeviceCreationPayload) -> None:
-        ...
+    def create_device(self, payload: DeviceCreationPayload) -> None: ...
 
     @delete("/system/device/{uuid}")
-    def delete_device(self, uuid: UUID) -> DeviceDeletionResponse:
-        ...
+    def delete_device(self, uuid: UUID) -> DeviceDeletionResponse: ...
 
     # Covers:
     # url = "/dataservice/system/device/controllers"
@@ -291,19 +292,15 @@ class ConfigurationDeviceInventory(APIEndpoints):
     @get("/system/device/{device_category}", "data")
     def get_device_details(
         self, device_category: DeviceCategory, params: DeviceDetailsQueryParams = DeviceDetailsQueryParams()
-    ) -> DataSequence[DeviceDetailsResponse]:
-        ...
+    ) -> DataSequence[DeviceDetailsResponse]: ...
 
     @post("/system/device/smartaccount/sync")
-    def sync_devices_from_smart_account(self, payload: SmartAccountSyncParams) -> ProcessId:
-        ...
+    def sync_devices_from_smart_account(self, payload: SmartAccountSyncParams) -> ProcessId: ...
 
     @post("/system/device/fileupload")
-    def upload_wan_edge_list(self, payload: SerialFilePayload) -> UploadSerialFileResponse:
-        ...
+    def upload_wan_edge_list(self, payload: SerialFilePayload) -> UploadSerialFileResponse: ...
 
     @get("/system/device/bootstrap/device/{uuid}")
     def generate_bootstrap_configuration(
         self, uuid: UUID, params: GenerateBoostrapConfigurationQueryParams = GenerateBoostrapConfigurationQueryParams()
-    ) -> BoostrapConfiguration:
-        ...
+    ) -> BoostrapConfiguration: ...

{catalystwan-0.41.4.dev3 → catalystwan-0.41.5.dev1}/catalystwan/models/policy/localized.py

@@ -48,6 +48,11 @@ class LocalizedPolicySettings(BaseModel):
     implicit_acl_logging: Optional[bool] = Field(
         default=None, serialization_alias="implicitAclLogging", validation_alias="implicitAclLogging"
     )
+    data_policy_ignore_affinity_metric: Optional[bool] = Field(
+        default=None,
+        serialization_alias="dataPolicyIgnoreAffinityMetric",
+        validation_alias="dataPolicyIgnoreAffinityMetric",
+    )
     log_frequency: Optional[int] = Field(
         default=None, serialization_alias="logFrequency", validation_alias="logFrequency", ge=0, le=2147483647
     )

{catalystwan-0.41.4.dev3 → catalystwan-0.41.5.dev1}/catalystwan/utils/feature_template/find_template_values.py

@@ -56,6 +56,8 @@ def find_template_values(
             # {"dns-addr": DeviceVariable(name="vpn_dns_primary")}
             if var_name := template_definition.get("vipVariableName"):
                 new_value = DeviceVariable(name=var_name)
+                new_value._object_type = value
+                new_value._template_path = tuple(path)
                 current_nesting = get_nested_dict(templated_values, path[:-1])
                 current_nesting[field_key] = new_value
             return templated_values

{catalystwan-0.41.4.dev3 → catalystwan-0.41.5.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "catalystwan"
-version = "0.41.4dev3"
+version = "0.41.5dev1"
 description = "Cisco Catalyst WAN SDK for Python"
 authors = ["sbasan <sbasan@cisco.com>"]
 readme = "README.md"

catalystwan-0.41.4.dev3/catalystwan/api/templates/device_variable.py

@@ -1,7 +0,0 @@
-# Copyright 2023 Cisco Systems, Inc. and its affiliates
-
-from pydantic import BaseModel
-
-
-class DeviceVariable(BaseModel):
-    name: str