multiple fixes for push/rollback demo (#538)

* fix validation * fix url allow/block type fields * Temporary solution to keyerror * bump dev version --------- Co-authored-by: Jakub Krajewski <[email protected]>
CiscoDevNet · Mar 27, 2024 · 83f1b5a · 83f1b5a
1 parent 357ee63
commit 83f1b5a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/catalystwan/api/configuration_groups/parcel.py b/catalystwan/api/configuration_groups/parcel.py
@@ -116,7 +116,7 @@ class Default(ParcelAttribute, Generic[T]):
     option_type: OptionType = Field(
         default=OptionType.DEFAULT, serialization_alias="optionType", validation_alias="optionType"
     )
-    value: Any
+    value: Optional[Any] = None
 
 
 def as_global(value: Any, generic_alias: Any = None):

diff --git a/catalystwan/models/configuration/config_migration.py b/catalystwan/models/configuration/config_migration.py
@@ -1,9 +1,9 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
-from typing import List, Set, Tuple, Union
+from typing import Any, Dict, List, Set, Tuple, Union
 from uuid import UUID
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, model_validator
 from typing_extensions import Annotated
 
 from catalystwan.api.template_api import FeatureTemplateInformation
@@ -110,6 +110,14 @@ class UX2Config(BaseModel):
         default=[], serialization_alias="profileParcels", validation_alias="profileParcels"
     )
 
+    @model_validator(mode="before")
+    @classmethod
+    def insert_parcel_type_from_headers(cls, values: Dict[str, Any]):
+        profile_parcels = values.get("profileParcels", [])
+        for profile_parcel in profile_parcels:
+            profile_parcel["parcel"]["type_"] = profile_parcel["header"]["type"]
+        return values
+
 
 class UX2ConfigRollback(BaseModel):
     config_group_ids: List[UUID] = Field(

diff --git a/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/url.py b/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/url.py
@@ -14,7 +14,7 @@ class BaseURLListEntry(BaseModel):
 
 class URLParcel(_ParcelBase):
     type_: Literal["security-urllist"] = Field(default="security-urllist", exclude=True)
-    parcel_type: Literal["urlallowed", "urlblocked"]
+    type: Literal["urlallowed", "urlblocked"]
     entries: List[BaseURLListEntry] = Field(default=[], validation_alias=AliasPath("data", "entries"))
 
     def add_url(self, pattern: str):
@@ -23,13 +23,9 @@ def add_url(self, pattern: str):
 
 class URLAllowParcel(URLParcel):
     type_: Literal["security-urllist"] = Field(default="security-urllist", exclude=True)
-    parcel_type: Literal["urlallowed"] = Field(
-        default="urlallowed", validation_alias="type", serialization_alias="type"
-    )
+    type: Literal["urlallowed"] = "urlallowed"
 
 
 class URLBlockParcel(URLParcel):
     type_: Literal["security-urllist"] = Field(default="security-urllist", exclude=True)
-    parcel_type: Literal["urlblocked"] = Field(
-        default="urlblocked", validation_alias="type", serialization_alias="type"
-    )
+    type: Literal["urlblocked"] = "urlblocked"
diff --git a/catalystwan/utils/config_migration/creators/strategy/parcels.py b/catalystwan/utils/config_migration/creators/strategy/parcels.py
@@ -33,5 +33,7 @@ class SimpleParcelPusher(ParcelPusher):
     def push(self, profile_uuid: UUID, parcel_uuids: List[UUID], mapping: Dict[UUID, TransformedParcel]):
         # Parcels don't have references to other parcels, so we can create them directly
         for parcel_uuid in parcel_uuids:
-            transformed_parcel = mapping[parcel_uuid]
+            transformed_parcel = mapping.get(parcel_uuid)
+            if transformed_parcel is None:
+                continue
             self.api.create_parcel(profile_uuid, transformed_parcel.parcel)  # type: ignore
diff --git a/catalystwan/workflows/config_migration.py b/catalystwan/workflows/config_migration.py
@@ -34,8 +34,8 @@
     "cisco_system",
     "system-vsmart",
     "system-vedge",
-    "cisco_bfd",
-    "bfd-vedge",
+    # "cisco_bfd",
+    # "bfd-vedge",
     "cedge_global",
     "cisco_logging",
     "logging",
@@ -64,8 +64,8 @@
     "cisco_system",
     "system-vsmart",
     "system-vedge",
-    "cisco_bfd",
-    "bfd-vedge",
+    # "cisco_bfd",
+    # "bfd-vedge",
     "cedge_global",
     "cisco_logging",
     "logging",
@@ -74,8 +74,8 @@
     "omp-vsmart",
     "cisco_ntp",
     "ntp",
-    "bgp",
-    "cisco_bgp",
+    # "bgp",
+    # "cisco_bgp",
     "cisco_snmp",
 ]
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "catalystwan"
-version = "0.31.2dev0"
+version = "0.31.2dev1"
 description = "Cisco Catalyst WAN SDK for Python"
 authors = ["kagorski <[email protected]>"]
 readme = "README.md"