catalystwan 0.31.0.dev2__tar.gz → 0.31.0.dev3__tar.gz

{catalystwan-0.31.0.dev2 → catalystwan-0.31.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: catalystwan
-Version: 0.31.0.dev2
+Version: 0.31.0.dev3
 Summary: Cisco Catalyst WAN SDK for Python
 Home-page: https://github.com/CiscoDevNet/catalystwan
 Author: kagorski
@@ -17,11 +17,12 @@ Requires-Dist: ciscoconfparse (==1.9.41)
 Requires-Dist: clint (>=0.5.1,<0.6.0)
 Requires-Dist: flake8-quotes (>=3.3.1,<4.0.0)
 Requires-Dist: packaging (>=23.0,<24.0)
-Requires-Dist: pydantic (==2.5)
+Requires-Dist: pydantic (>=2.5,<3.0)
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
 Requires-Dist: requests (>=2.27.1,<3.0.0)
 Requires-Dist: requests-toolbelt (>=1.0.0,<2.0.0)
 Requires-Dist: tenacity (>=8.1.0,<9.0.0)
+Requires-Dist: typing-extensions (>=4.6.1,<5.0.0)
 Project-URL: Repository, https://github.com/CiscoDevNet/catalystwan
 Description-Content-Type: text/markdown
 

{catalystwan-0.31.0.dev2 → catalystwan-0.31.0.dev3}/catalystwan/api/partition_manager_api.py

@@ -5,12 +5,12 @@ from typing import TYPE_CHECKING, List, Optional, cast
 
 from catalystwan.api.task_status_api import Task
 from catalystwan.api.versions_utils import DeviceVersions, RepositoryAPI
-from catalystwan.dataclasses import Device
 from catalystwan.endpoints.configuration_device_actions import (
     PartitionActionPayload,
     RemovePartitionActionPayload,
     RemovePartitionDevice,
 )
+from catalystwan.endpoints.configuration_device_inventory import DeviceDetailsResponse
 from catalystwan.exceptions import EmptyVersionPayloadError
 from catalystwan.typed_list import DataSequence
 from catalystwan.utils.upgrades_helper import get_install_specification, validate_personality_homogeneity
@@ -48,7 +48,9 @@ class PartitionManagerAPI:
         self.repository = RepositoryAPI(self.session)
         self.device_version = DeviceVersions(self.session)
 
-    def set_default_partition(self, devices: DataSequence[Device], partition: Optional[str] = None) -> Task:
+    def set_default_partition(
+        self, devices: DataSequence[DeviceDetailsResponse], partition: Optional[str] = None
+    ) -> Task:
         """
         Set default software versions for devices
 
@@ -82,7 +84,7 @@ class PartitionManagerAPI:
         return Task(self.session, partition_action.id)
 
     def remove_partition(
-        self, devices: DataSequence[Device], partition: Optional[str] = None, force: bool = False
+        self, devices: DataSequence[DeviceDetailsResponse], partition: Optional[str] = None, force: bool = False
     ) -> Task:
         """
         Remove chosen software version from device

{catalystwan-0.31.0.dev2 → catalystwan-0.31.0.dev3}/catalystwan/api/software_action_api.py

@@ -5,14 +5,15 @@ from typing import TYPE_CHECKING, List, Optional, cast
 
 from catalystwan.api.task_status_api import Task
 from catalystwan.api.versions_utils import DeviceVersions, RepositoryAPI
-from catalystwan.dataclasses import Device
 from catalystwan.endpoints.configuration_device_actions import (
     InstallActionPayload,
+    InstallData,
     InstallDevice,
     InstallInput,
     PartitionActionPayload,
 )
-from catalystwan.exceptions import EmptyVersionPayloadError, VersionDeclarationError  # type: ignore
+from catalystwan.endpoints.configuration_device_inventory import DeviceDetailsResponse
+from catalystwan.exceptions import EmptyVersionPayloadError, ImageNotInRepositoryError  # type: ignore
 from catalystwan.typed_list import DataSequence
 from catalystwan.utils.personality import Personality
 from catalystwan.utils.upgrades_helper import get_install_specification, validate_personality_homogeneity
@@ -35,13 +36,12 @@ class SoftwareActionAPI:
     session = create_manager_session(...)
 
     # Prepare devices list
-    devices = session.api.devices.get()
-    vsmarts = devices.filter(personality=Personality.VSMART)
+    controllers = session.endpoints.configuration_device_inventory.get_device_details('controllers')
+    vsmarts = controllers.filter(personality=Personality.VSMART)
     software_image = "viptela-20.7.2-x86_64.tar.gz"
 
     # Upgrade
-    upgrade_id = SoftwareActionAPI(session).install(devices = vmanages,
-    software_image=software_image)
+    upgrade_id = SoftwareActionAPI(session).install(devices = vsmarts, software_image=software_image)
 
     # Check upgrade status
     TaskAPI(session, software_action_id).wait_for_completed()
@@ -54,20 +54,23 @@ class SoftwareActionAPI:
 
     def activate(
         self,
-        devices: DataSequence[Device],
+        devices: DataSequence[DeviceDetailsResponse],
         version_to_activate: Optional[str] = "",
         image: Optional[str] = "",
     ) -> Task:
         """
-        Set chosen version as current version
+        Set chosen version as current version. Requires that selected devices have already version_to_activate
+        or image present in their available files.
 
         Args:
-            devices (List[Device]): For those devices software will be activated
+            devices (List[DeviceDetailsResponse]): For those devices software will be activated
             version_to_activate (Optional[str]): version to be set as current version
-            image (Optional[str]): path to software image or its name from available files
+            image (Optional[str]): software image name in available files
 
-            Notice: Have to pass one of those arguments (version_to_activate,
-            image)
+            Notice: Have to pass one of those arguments (version_to_activate, image)
+
+        Raises:
+            EmptyVersionPayloadError: If selected version_to_activate or image not detected in available files
 
         Returns:
             str: Activate software action id
@@ -78,7 +81,7 @@ class SoftwareActionAPI:
         elif version_to_activate and not image:
             version = cast(str, version_to_activate)
         else:
-            raise VersionDeclarationError("You can not provide software_image and image version at the same time!")
+            raise ValueError("You can not provide software_image and image version at the same time!")
 
         payload_devices = self.device_versions.get_device_available(version, devices)
         for device in payload_devices:
@@ -98,55 +101,111 @@ class SoftwareActionAPI:
 
     def install(
         self,
-        devices: DataSequence[Device],
+        devices: DataSequence[DeviceDetailsResponse],
         reboot: bool = False,
         sync: bool = True,
-        image: str = "",
-        image_version: str = "",
+        v_edge_vpn: int = 0,
+        v_smart_vpn: int = 0,
+        image: Optional[str] = None,
+        image_version: Optional[str] = None,
         downgrade_check: bool = True,
+        remote_server_name: Optional[str] = None,
+        remote_image_filename: Optional[str] = None,
     ) -> Task:
         """
         Method to install new software
 
         Args:
-            devices (List[Device]): For those devices software will be activated
-            reboot (bool): reboot device after action end
+            devices (List[DeviceDetailsResponse]): For those devices software will be activated
+            reboot (bool, optional): reboot device after action end
             sync (bool, optional): Synchronize settings. Defaults to True.
+            v_edge_vpn (int, optional): vEdge VPN
+            v_smart_vpn (int, optional): vSmart VPN
             image (str): path to software image or its name from available files
             image_version (str): version of software image
-            downgrade_check (bool): perform a downgrade check when applicable
+            downgrade_check (bool, optional): perform a downgrade check when applicable
+            remote_server_name (str): name of configured Remote Server
+            remote_image_filename (str): filename to choose from selected Remote Server
 
-            Notice: Have to pass one of those arguments (image_version,
-            image)
+            Notice: Have to pass one of those:
+                - image_version
+                - image
+                - remote_server_name and remote_image_filename
 
         Raises:
-            ValueError: Raise error if downgrade in certain cases
+            ValueError: Raise error if downgrade in certain cases or wrong arguments combination provided
+            ImageNotInRepositoryError: If selected image, image_version or remote_image_filename not found
 
         Returns:
             Task: Task object representing started install process
         """
         validate_personality_homogeneity(devices)
-        if image and not image_version:
+
+        if (
+            sum(
+                [
+                    image is not None,
+                    image_version is not None,
+                    all([remote_server_name is not None, remote_image_filename is not None]),
+                ]
+            )
+            != 1
+        ):
+            raise ValueError(
+                "Please provide one option to detect software to install."
+                "Pick either 'image', 'image_version', or both 'remote_server_name' and 'remote_image_filename'."
+            )
+
+        # FIXME downgrade_check will be supported when software images from Remote Server will have versions fields
+        if remote_server_name and remote_image_filename and downgrade_check:
+            raise ValueError("Downgrade check is not supported for install action for images from Remote Server.")
+
+        version, remote_image_details = None, None
+        if image:
             version = cast(str, self.repository.get_image_version(image))
-        elif image_version and not image:
+        if image_version:
             version = cast(str, image_version)
-        else:
-            raise VersionDeclarationError("You can not provide image and image version at the same time")
+        if remote_server_name and remote_image_filename:
+            remote_image_details = self.repository.get_remote_image(remote_image_filename, remote_server_name)
 
-        install_specification = get_install_specification(devices.first())
+        if not any([version, remote_image_details]):
+            raise ImageNotInRepositoryError(
+                "Based on provided arguments, software version to install on device(s) cannot be detected."
+            )
+
+        install_specification = get_install_specification(devices.first(), remote=bool(remote_image_details))
         install_devices = [
             InstallDevice(**device.model_dump(by_alias=True))
             for device in self.device_versions.get_device_list(devices)
         ]
-        input = InstallInput(
-            v_edge_vpn=0,
-            v_smart_vpn=0,
-            family=install_specification.family.value,
-            version=version,
-            version_type=install_specification.version_type.value,
-            reboot=reboot,
-            sync=sync,
-        )
+
+        if version:
+            input = InstallInput(
+                v_edge_vpn=v_edge_vpn,
+                v_smart_vpn=v_smart_vpn,
+                family=install_specification.family.value,
+                version=version,
+                version_type=install_specification.version_type.value,
+                reboot=reboot,
+                sync=sync,
+            )
+        else:
+            input = InstallInput(
+                v_edge_vpn=v_edge_vpn,
+                v_smart_vpn=v_smart_vpn,
+                data=[
+                    InstallData(
+                        family=install_specification.family.value,
+                        version=remote_image_details.version_id,  # type: ignore
+                        remote_server_id=remote_image_details.remote_server_id,  # type: ignore
+                        version_id=remote_image_details.version_id,  # type: ignore
+                    )
+                ],
+                version_type=install_specification.version_type.value,
+                reboot=reboot,
+                sync=sync,
+            )
+
         device_type = install_specification.device_type.value
         install_payload = InstallActionPayload(
             action="install", input=input, devices=install_devices, device_type=device_type
@@ -154,7 +213,9 @@ class SoftwareActionAPI:
 
         if downgrade_check and devices.first().personality in (Personality.VMANAGE, Personality.EDGE):
             self._downgrade_check(
-                install_payload.devices, install_payload.input.version, install_specification.family.value
+                install_payload.devices,
+                install_payload.input.version,  # type: ignore
+                install_specification.family.value,  # type: ignore
             )
 
         install_action = self.session.endpoints.configuration_device_actions.process_install_operation(
@@ -170,10 +231,10 @@ class SoftwareActionAPI:
 
         Args:
             version_to_upgrade (str): version to upgrade
-            devices_category (DeviceCategory): devices category
+            payload_devices List[InstallDevice]: list of Devices to check downgrade possibility
 
-        Returns:
-            List[str]: list of devices with no permission to downgrade
+        Raises:
+            ValueError: If for any of the devices upgrade action is denied
         """
         incorrect_devices = []
         devices_versions_repo = self.repository.get_devices_versions_repository()

{catalystwan-0.31.0.dev2 → catalystwan-0.31.0.dev3}/catalystwan/api/template_api.py

@@ -382,7 +382,9 @@ class TemplatesAPI:
         if self.is_created_by_generator(template):
             debug = False
             schema = self.get_feature_template_schema(template, debug)
-            payload = self.generate_feature_template_payload(template, schema, debug).model_dump(by_alias=True)
+            payload = self.generate_feature_template_payload(template, schema, debug).model_dump(
+                by_alias=True, mode="json"
+            )
         else:
             payload = json.loads(template.generate_payload(self.session))
 
@@ -541,7 +543,7 @@ class TemplatesAPI:
         payload = self.generate_feature_template_payload(template, schema, debug)
 
         endpoint = "/dataservice/template/feature"
-        response = self.session.post(endpoint, json=payload.model_dump(by_alias=True, exclude_none=True))
+        response = self.session.post(endpoint, json=payload.model_dump(by_alias=True, exclude_none=True, mode="json"))
 
         return response.json()["templateId"]
 
@@ -557,9 +559,9 @@ class TemplatesAPI:
         )  # type: ignore
 
         fr_template_fields = [FeatureTemplateField(**field) for field in schema["fields"]]  # TODO
-
+        json_dumped_template = template.model_dump(mode="json")
         # "name"
-        for i, field in enumerate(fr_template_fields):
+        for field in fr_template_fields:
             value = None
             priority_order = None
             # TODO How to discover Device specific variable
@@ -575,16 +577,19 @@ class TemplatesAPI:
                     ):
                         priority_order = get_extra_field(field_value, "priority_order")  # type: ignore
                         value = getattr(template, field_name)
+                        json_dumped_value = json_dumped_template.get(field_name)
                         break
                 if value is None:
                     continue
 
-            # print(field.payload_scheme(value))
-            payload.definition = merge(payload.definition, field.payload_scheme(value, priority_order=priority_order))
+            payload.definition = merge(
+                payload.definition,
+                field.payload_scheme(value, json_dumped_value=json_dumped_value, priority_order=priority_order),
+            )
 
         if debug:
             with open(f"payload_{template.type}.json", "w") as f:
-                f.write(json.dumps(payload.model_dump(by_alias=True), indent=4))
+                f.write(json.dumps(payload.model_dump(by_alias=True, mode="json"), indent=4))
 
         return payload
 

catalystwan-0.31.0.dev3/catalystwan/api/templates/bool_str.py

@@ -0,0 +1,4 @@
+from pydantic import PlainSerializer
+from typing_extensions import Annotated
+
+BoolStr = Annotated[bool, PlainSerializer(lambda x: str(x).lower(), return_type=str, when_used="json-unless-none")]

{catalystwan-0.31.0.dev2 → catalystwan-0.31.0.dev3}/catalystwan/api/templates/feature_template.py

@@ -29,7 +29,7 @@ class FeatureTemplate(BaseModel, ABC):
             undefined=DebugUndefined,
         )
         template = env.get_template(self.payload_path.name)
-        output = template.render(self.model_dump())
+        output = template.render(self.model_dump(mode="json"))
 
         ast = env.parse(output)
         if meta.find_undeclared_variables(ast):

{catalystwan-0.31.0.dev2 → catalystwan-0.31.0.dev3}/catalystwan/api/templates/feature_template_field.py

@@ -89,7 +89,7 @@ class FeatureTemplateField(BaseModel):
 
     # value must be JSON serializable, return JSON serializable dict
     def payload_scheme(
-        self, value: Any = None, help=None, current_path=None, priority_order=None, vip_type=None
+        self, value: Any = None, json_dumped_value: Any = None, priority_order=None, vip_type=None
     ) -> dict:
         output: dict = {}
         rel_output: dict = {}
@@ -119,10 +119,9 @@ class FeatureTemplateField(BaseModel):
                 if self.children:
                     children_output = []
                     for obj in value:  # obj is User, atomic value. Loop every child
+                        obj_json_dump = obj.model_dump(mode="json")
                         child_payload: dict = {}
                         for child in self.children:  # Child in schema
-                            if current_path is None:
-                                current_path = []
                             obj: FeatureTemplate  # type: ignore
                             model_tuple = next(
                                 filter(
@@ -137,14 +136,14 @@ class FeatureTemplateField(BaseModel):
                             )
                             model_field = model_tuple[1]
                             obj_value = getattr(obj, model_tuple[0])
+                            obj_json_value = obj_json_dump.get(model_tuple[0])
                             po = get_extra_field(model_field, "priority_order")
                             vip_type = get_extra_field(model_field, "vip_type")
                             merge(
                                 child_payload,
                                 child.payload_scheme(
                                     obj_value,
-                                    help=output,
-                                    current_path=self.dataPath + [self.key],
+                                    json_dumped_value=obj_json_value,
                                     priority_order=po,
                                     vip_type=vip_type,
                                 ),
@@ -154,7 +153,7 @@ class FeatureTemplateField(BaseModel):
                         children_output.append(child_payload)
                     output["vipValue"] = children_output
                 else:
-                    output["vipValue"] = value
+                    output["vipValue"] = json_dumped_value
             else:
                 if value is None:
                     return {}

{catalystwan-0.31.0.dev2 → catalystwan-0.31.0.dev3}/catalystwan/api/templates/models/cisco_bfd_model.py

@@ -2,10 +2,10 @@ from enum import Enum
 from pathlib import Path
 from typing import ClassVar, List, Optional
 
-from pydantic import ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field
 
+from catalystwan.api.templates.bool_str import BoolStr
 from catalystwan.api.templates.feature_template import FeatureTemplate
-from catalystwan.utils.pydantic_validators import ConvertBoolToStringModel
 
 DEFAULT_BFD_COLOR_MULTIPLIER = 7
 DEFAULT_BFD_DSCP = 48
@@ -39,18 +39,18 @@ class ColorType(str, Enum):
     PRIVATE6 = "private6"
 
 
-class Color(ConvertBoolToStringModel):
+class Color(BaseModel):
     color: ColorType
     hello_interval: Optional[int] = Field(
         DEFAULT_BFD_HELLO_INTERVAL, json_schema_extra={"vmanage_key": "hello-interval"}
     )
     multiplier: Optional[int] = DEFAULT_BFD_COLOR_MULTIPLIER
-    pmtu_discovery: Optional[bool] = Field(True, json_schema_extra={"vmanage_key": "pmtu-discovery"})
+    pmtu_discovery: Optional[BoolStr] = Field(default=True, json_schema_extra={"vmanage_key": "pmtu-discovery"})
     dscp: Optional[int] = DEFAULT_BFD_DSCP
     model_config = ConfigDict(populate_by_name=True)
 
 
-class CiscoBFDModel(FeatureTemplate, ConvertBoolToStringModel):
+class CiscoBFDModel(FeatureTemplate):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     multiplier: Optional[int] = Field(DEFAULT_BFD_MULTIPLIER, json_schema_extra={"data_path": ["app-route"]})

{catalystwan-0.31.0.dev2 → catalystwan-0.31.0.dev3}/catalystwan/api/templates/models/cisco_bgp_model.py

@@ -2,8 +2,9 @@ from enum import Enum
 from pathlib import Path
 from typing import ClassVar, List, Optional
 
-from pydantic import BaseModel, ConfigDict, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field
 
+from catalystwan.api.templates.bool_str import BoolStr
 from catalystwan.api.templates.feature_template import FeatureTemplate
 
 
@@ -42,16 +43,10 @@ class AddressFamilyType(str, Enum):
 
 class AggregateAddress(BaseModel):
     prefix: str
-    as_set: Optional[bool] = Field(default=None, json_schema_extra={"vmanage_key": "as-set"})
-    summary_only: Optional[bool] = Field(default=None, json_schema_extra={"vmanage_key": "summary-only"})
+    as_set: Optional[BoolStr] = Field(default=None, json_schema_extra={"vmanage_key": "as-set"})
+    summary_only: Optional[BoolStr] = Field(default=None, json_schema_extra={"vmanage_key": "summary-only"})
     model_config = ConfigDict(populate_by_name=True)
 
-    @field_validator("as_set", "summary_only")
-    @classmethod
-    def cast_to_str(cls, value):
-        if value is not None:
-            return str(value).lower()
-
 
 class Ipv6AggregateAddress(BaseModel):
     prefix: str
@@ -95,20 +90,14 @@ class AddressFamily(BaseModel):
     network: Optional[List[Network]] = None
     ipv6_network: Optional[List[Ipv6Network]] = Field(default=None, json_schema_extra={"vmanage_key": "ipv6-network"})
     paths: Optional[int] = Field(default=None, json_schema_extra={"data_path": ["maximum-paths"]})
-    originate: Optional[bool] = Field(default=None, json_schema_extra={"data_path": ["default-information"]})
+    originate: Optional[BoolStr] = Field(default=None, json_schema_extra={"data_path": ["default-information"]})
     policy_name: Optional[str] = Field(
         default=None, json_schema_extra={"data_path": ["table-map"], "vmanage_key": "name"}
     )
-    filter: Optional[bool] = Field(default=None, json_schema_extra={"data_path": ["table-map"]})
+    filter: Optional[BoolStr] = Field(default=None, json_schema_extra={"data_path": ["table-map"]})
     redistribute: Optional[List[Redistribute]] = None
     model_config = ConfigDict(populate_by_name=True)
 
-    @field_validator("originate", "filter")
-    @classmethod
-    def cast_to_str(cls, value):
-        if value is not None:
-            return str(value).lower()
-
 
 class NeighborFamilyType(str, Enum):
     IPV4_UNICAST = "ipv4-unicast"
@@ -144,21 +133,23 @@ class NeighborAddressFamily(BaseModel):
 class Neighbor(BaseModel):
     address: str
     description: Optional[str] = None
-    shutdown: Optional[bool] = None
+    shutdown: Optional[BoolStr] = None
     remote_as: int = Field(json_schema_extra={"vmanage_key": "remote-as"})
     keepalive: Optional[int] = Field(default=None, json_schema_extra={"data_path": ["timers"]})
     holdtime: Optional[int] = Field(default=None, json_schema_extra={"data_path": ["timers"]})
     if_name: Optional[str] = Field(
         default=None, json_schema_extra={"data_path": ["update-source"], "vmanage_key": "if-name"}
     )
-    next_hop_self: Optional[bool] = Field(default=None, json_schema_extra={"vmanage_key": "next-hop-self"})
-    send_community: Optional[bool] = Field(default=None, json_schema_extra={"vmanage_key": "send-community"})
-    send_ext_community: Optional[bool] = Field(default=None, json_schema_extra={"vmanage_key": "send-ext-community"})
+    next_hop_self: Optional[BoolStr] = Field(default=None, json_schema_extra={"vmanage_key": "next-hop-self"})
+    send_community: Optional[BoolStr] = Field(default=None, json_schema_extra={"vmanage_key": "send-community"})
+    send_ext_community: Optional[BoolStr] = Field(default=None, json_schema_extra={"vmanage_key": "send-ext-community"})
     ebgp_multihop: Optional[int] = Field(default=None, json_schema_extra={"vmanage_key": "ebgp-multihop"})
     password: Optional[str] = None
-    send_label: Optional[bool] = Field(default=None, json_schema_extra={"vmanage_key": "send-label"})
-    send_label_explicit: Optional[bool] = Field(default=None, json_schema_extra={"vmanage_key": "send-label-explicit"})
-    as_override: Optional[bool] = Field(default=None, json_schema_extra={"vmanage_key": "as-override"})
+    send_label: Optional[BoolStr] = Field(default=None, json_schema_extra={"vmanage_key": "send-label"})
+    send_label_explicit: Optional[BoolStr] = Field(
+        default=None, json_schema_extra={"vmanage_key": "send-label-explicit"}
+    )
+    as_override: Optional[BoolStr] = Field(default=None, json_schema_extra={"vmanage_key": "as-override"})
     as_number: Optional[int] = Field(
         default=None, json_schema_extra={"data_path": ["allowas-in"], "vmanage_key": "as-number"}
     )
@@ -167,20 +158,6 @@ class Neighbor(BaseModel):
     )
     model_config = ConfigDict(populate_by_name=True)
 
-    @field_validator(
-        "shutdown",
-        "next_hop_self",
-        "send_community",
-        "send_ext_community",
-        "send_label",
-        "send_label_explicit",
-        "as_override",
-    )
-    @classmethod
-    def cast_to_str(cls, value):
-        if value is not None:
-            return str(value).lower()
-
 
 class IPv6NeighborFamilyType(str, Enum):
     IPV6_UNICAST = "ipv6-unicast"
@@ -203,21 +180,23 @@ class IPv6NeighborAddressFamily(BaseModel):
 class Ipv6Neighbor(BaseModel):
     address: str
     description: Optional[str] = None
-    shutdown: Optional[bool] = None
+    shutdown: Optional[BoolStr] = None
     remote_as: int = Field(default=None, json_schema_extra={"vmanage_key": "remote-as"})
     keepalive: Optional[int] = Field(default=None, json_schema_extra={"data_path": ["timers"]})
     holdtime: Optional[int] = Field(default=None, json_schema_extra={"data_path": ["timers"]})
     if_name: Optional[str] = Field(
         default=None, json_schema_extra={"data_path": ["update-source"], "vmanage_key": "if-name"}
     )
-    next_hop_self: Optional[bool] = Field(False, json_schema_extra={"vmanage_key": "next-hop-self"})
-    send_community: Optional[bool] = Field(True, json_schema_extra={"vmanage_key": "send-community"})
-    send_ext_community: Optional[bool] = Field(True, json_schema_extra={"vmanage_key": "send-ext-community"})
+    next_hop_self: Optional[BoolStr] = Field(default=False, json_schema_extra={"vmanage_key": "next-hop-self"})
+    send_community: Optional[BoolStr] = Field(default=True, json_schema_extra={"vmanage_key": "send-community"})
+    send_ext_community: Optional[BoolStr] = Field(default=True, json_schema_extra={"vmanage_key": "send-ext-community"})
     ebgp_multihop: Optional[int] = Field(1, json_schema_extra={"vmanage_key": "ebgp-multihop"})
     password: Optional[str] = None
-    send_label: Optional[bool] = Field(False, json_schema_extra={"vmanage_key": "send-label"})
-    send_label_explicit: Optional[bool] = Field(False, json_schema_extra={"vmanage_key": "send-label-explicit"})
-    as_override: Optional[bool] = Field(False, json_schema_extra={"vmanage_key": "as-override"})
+    send_label: Optional[BoolStr] = Field(default=False, json_schema_extra={"vmanage_key": "send-label"})
+    send_label_explicit: Optional[BoolStr] = Field(
+        default=False, json_schema_extra={"vmanage_key": "send-label-explicit"}
+    )
+    as_override: Optional[BoolStr] = Field(default=False, json_schema_extra={"vmanage_key": "as-override"})
     as_number: Optional[int] = Field(
         default=None, json_schema_extra={"data_path": ["allowas-in"], "vmanage_key": "as-number"}
     )
@@ -226,26 +205,12 @@ class Ipv6Neighbor(BaseModel):
     )
     model_config = ConfigDict(populate_by_name=True)
 
-    @field_validator(
-        "shutdown",
-        "next_hop_self",
-        "send_community",
-        "send_ext_community",
-        "send_label",
-        "send_label_explicit",
-        "as_override",
-    )
-    @classmethod
-    def cast_to_str(cls, value):
-        if value is not None:
-            return str(value).lower()
-
 
 class CiscoBGPModel(FeatureTemplate):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
     as_num: Optional[str] = Field(default=None, json_schema_extra={"data_path": ["bgp"], "vmanage_key": "as-num"})
-    shutdown: Optional[bool] = Field(default=None, json_schema_extra={"data_path": ["bgp"]})
+    shutdown: Optional[BoolStr] = Field(default=None, json_schema_extra={"data_path": ["bgp"]})
     router_id: Optional[str] = Field(default=None, json_schema_extra={"data_path": ["bgp"], "vmanage_key": "router-id"})
     propagate_aspath: Optional[bool] = Field(
         default=None, json_schema_extra={"data_path": ["bgp"], "vmanage_key": "propagate-aspath"}
@@ -270,14 +235,14 @@ class CiscoBGPModel(FeatureTemplate):
     always_compare: Optional[bool] = Field(
         default=None, json_schema_extra={"data_path": ["bgp", "best-path", "med"], "vmanage_key": "always-compare"}
     )
-    deterministic: Optional[bool] = Field(default=None, json_schema_extra={"data_path": ["bgp", "best-path", "med"]})
-    missing_as_worst: Optional[bool] = Field(
+    deterministic: Optional[BoolStr] = Field(default=None, json_schema_extra={"data_path": ["bgp", "best-path", "med"]})
+    missing_as_worst: Optional[BoolStr] = Field(
         default=None, json_schema_extra={"data_path": ["bgp", "best-path", "med"], "vmanage_key": "missing-as-worst"}
     )
-    compare_router_id: Optional[bool] = Field(
+    compare_router_id: Optional[BoolStr] = Field(
         default=None, json_schema_extra={"data_path": ["bgp", "best-path"], "vmanage_key": "compare-router-id"}
     )
-    multipath_relax: Optional[bool] = Field(
+    multipath_relax: Optional[BoolStr] = Field(
         default=None, json_schema_extra={"data_path": ["bgp", "best-path", "as-path"], "vmanage_key": "multipath-relax"}
     )
     address_family: Optional[List[AddressFamily]] = Field(
@@ -290,9 +255,3 @@ class CiscoBGPModel(FeatureTemplate):
 
     payload_path: ClassVar[Path] = Path(__file__).parent / "DEPRECATED"
     type: ClassVar[str] = "cisco_bgp"
-
-    @field_validator("shutdown", "deterministic", "missing_as_worst", "compare_router_id", "multipath_relax")
-    @classmethod
-    def cast_to_str(cls, value):
-        if value is not None:
-            return str(value).lower()