catalystwan 0.41.2.dev9__py3-none-any.whl → 0.41.3__py3-none-any.whl

catalystwan/tests/templates/schemas/cisco_system.json

@@ -1973,52 +1973,6 @@
             "dataPath": [],
             "objectType": "object"
         },
-        {
-            "key": "site-type",
-            "description": "Site Type",
-            "details": "Configure site type",
-            "optionType": [
-                "constant",
-                "ignore",
-                "variable"
-            ],
-            "defaultOption": "ignore",
-            "dataType": {
-                "type": "enum",
-                "values": [
-                    {
-                        "key": "type-1",
-                        "value": "type-1"
-                    },
-                    {
-                        "key": "type-2",
-                        "value": "type-2"
-                    },
-                    {
-                        "key": "type-3",
-                        "value": "type-3"
-                    },
-                    {
-                        "key": "cloud",
-                        "value": "cloud"
-                    },
-                    {
-                        "key": "branch",
-                        "value": "branch"
-                    },
-                    {
-                        "key": "br",
-                        "value": "br"
-                    },
-                    {
-                        "key": "spoke",
-                        "value": "spoke"
-                    }
-                ]
-            },
-            "dataPath": [],
-            "objectType": "list"
-        },
         {
             "key": "port-offset",
             "description": "Port Offset",
@@ -2840,78 +2794,6 @@
             ],
             "objectType": "list"
         },
-        {
-            "key": "preference-auto",
-            "description": "Affinity Group Preference Auto",
-            "details": "Enable affinity preference auto flag",
-            "optionType": [
-                "constant",
-                "variable",
-                "ignore"
-            ],
-            "defaultOption": "ignore",
-            "dataType": {
-                "type": "boolean",
-                "default": "false"
-            },
-            "dataPath": [
-                "affinity-group"
-            ],
-            "objectType": "object"
-        },
-        {
-            "key": "affinity-per-vrf",
-            "description": "Affinity Group Number for VRFs",
-            "details": "Set Affinity per VRF",
-            "optionType": [
-                "constant",
-                "ignore"
-            ],
-            "defaultOption": "ignore",
-            "primaryKeys": [
-                "affinity-group-number"
-            ],
-            "children": [
-                {
-                    "key": "affinity-group-number",
-                    "description": "Affinity Group Number",
-                    "details": "Router affinity group number",
-                    "optionType": [
-                        "constant",
-                        "ignore"
-                    ],
-                    "defaultOption": "ignore",
-                    "dataType": {
-                        "type": "number",
-                        "min": 1,
-                        "max": 63
-                    },
-                    "dataPath": [],
-                    "objectType": "object"
-                },
-                {
-                    "key": "vrf-range",
-                    "description": "VRFs",
-                    "details": "Range of VRFs",
-                    "optionType": [
-                        "constant",
-                        "ignore"
-                    ],
-                    "defaultOption": "ignore",
-                    "dataType": {
-                        "type": "string",
-                        "minLength": 1,
-                        "maxLength": 11
-                    },
-                    "dataPath": [],
-                    "objectType": "object"
-                }
-            ],
-            "dataPath": [
-                "affinity-group"
-            ],
-            "objectType": "tree"
-        },
         {
             "key": "transport-gateway",
             "description": "Transport Gateway",
@@ -2970,130 +2852,6 @@
             },
             "dataPath": [],
             "objectType": "object"
-        },
-        {
-            "key": "enable-management-region",
-            "description": "Management Region",
-            "details": "Enable Management Region",
-            "optionType": [
-                "constant",
-                "ignore",
-                "variable"
-            ],
-            "defaultOption": "ignore",
-            "dataType": {
-                "type": "boolean",
-                "default": "false"
-            },
-            "dataPath": [],
-            "objectType": "object"
-        },
-        {
-            "key": "vrf",
-            "description": "VRF Name",
-            "details": "VRF Name for Management Region",
-            "optionType": [
-                "constant",
-                "ignore"
-            ],
-            "defaultOption": "ignore",
-            "dataPath": [
-                "management-region"
-            ],
-            "objectType": "tree",
-            "maxElements": 1,
-            "primaryKeys": [
-                "vrf-id"
-            ],
-            "children": [
-                {
-                    "key": "vrf-id",
-                    "description": "VRF ID",
-                    "details": "VRF ID for management region",
-                    "optionType": [
-                        "constant",
-                        "variable"
-                    ],
-                    "defaultOption": "constant",
-                    "dataType": {
-                        "type": "number",
-                        "min": 0,
-                        "max": 65531
-                    },
-                    "dataPath": [],
-                    "objectType": "object"
-                },
-                {
-                    "key": "gateway-preference",
-                    "description": "List of affinity group preferences for VRF",
-                    "details": "List of affinity group preferences for VRF",
-                    "optionType": [
-                        "constant",
-                        "variable",
-                        "ignore"
-                    ],
-                    "defaultOption": "ignore",
-                    "dataType": {
-                        "type": "number",
-                        "min": 1,
-                        "max": 63
-                    },
-                    "dataPath": [],
-                    "objectType": "list"
-                }
-            ]
-        },
-        {
-            "key": "management-gateway",
-            "description": "Management Gateway",
-            "details": "Enable Management Gateway",
-            "optionType": [
-                "constant",
-                "ignore",
-                "variable"
-            ],
-            "defaultOption": "ignore",
-            "dataType": {
-                "type": "boolean",
-                "default": "false"
-            },
-            "dataPath": [],
-            "objectType": "object"
-        },
-        {
-            "key": "epfr",
-            "description": "Enhanced App-Aware Routing",
-            "details": "Enable SLA Dampening and Enhanced App-Aware Routing.",
-            "optionType": [
-                "constant",
-                "variable",
-                "ignore"
-            ],
-            "defaultOption": "ignore",
-            "dataType": {
-                "type": "enum",
-                "values": [
-                    {
-                        "key": "disabled",
-                        "value": "Disabled"
-                    },
-                    {
-                        "key": "aggressive",
-                        "value": "Aggressive"
-                    },
-                    {
-                        "key": "moderate",
-                        "value": "Moderate"
-                    },
-                    {
-                        "key": "conservative",
-                        "value": "Conservative"
-                    }
-                ],
-                "default": "disabled"
-            },
-            "dataPath": [],
-            "objectType": "object"
         }
     ]
 }

catalystwan/tests/templates/schemas/cisco_vpn.json

@@ -290,7 +290,7 @@
                     "defaultOption": "constant",
                     "dataType": {
                         "type": "ip",
-                        "max": 14
+                        "max": 8
                     },
                     "dataPath": [],
                     "objectType": "list"
@@ -1162,32 +1162,6 @@
                             },
                             "dataPath": [],
                             "objectType": "object"
-                        },
-                        {
-                            "key": "region",
-                            "description": "Region",
-                            "details": "Region",
-                            "optionType": [
-                                "constant",
-                                "variable",
-                                "ignore"
-                            ],
-                            "defaultOption": "ignore",
-                            "dataType": {
-                                "type": "enum",
-                                "values": [
-                                    {
-                                        "key": "core",
-                                        "value": "Core"
-                                    },
-                                    {
-                                        "key": "access",
-                                        "value": "Access"
-                                    }
-                                ]
-                            },
-                            "dataPath": [],
-                            "objectType": "object"
                         }
                     ]
                 }
@@ -1337,32 +1311,6 @@
                             },
                             "dataPath": [],
                             "objectType": "object"
-                        },
-                        {
-                            "key": "region",
-                            "description": "Region",
-                            "details": "Region",
-                            "optionType": [
-                                "constant",
-                                "variable",
-                                "ignore"
-                            ],
-                            "defaultOption": "constant",
-                            "dataType": {
-                                "type": "enum",
-                                "values": [
-                                    {
-                                        "key": "core",
-                                        "value": "Core"
-                                    },
-                                    {
-                                        "key": "access",
-                                        "value": "Access"
-                                    }
-                                ]
-                            },
-                            "dataPath": [],
-                            "objectType": "object"
                         }
                     ]
                 }

catalystwan/tests/templates/schemas/omp-vsmart.json

@@ -197,26 +197,6 @@
                 "outbound"
             ],
             "objectType": "object"
-        },
-        {
-            "key": "tloc-color",
-            "description": "Enable Filtering Route Updates Based on TLOC-Color",
-            "details": "Filter routes based on TLOC color",
-            "optionType": [
-                "constant",
-                "variable",
-                "ignore"
-            ],
-            "defaultOption": "ignore",
-            "dataType": {
-                "type": "boolean",
-                "default": "false"
-            },
-            "dataPath": [
-                "filter-route",
-                "outbound"
-            ],
-            "objectType": "object"
         }
     ]
 }

catalystwan/tests/templates/test_chose_model.py

@@ -4,18 +4,22 @@ import unittest
 
 from parameterized import parameterized  # type: ignore
 
-from catalystwan.api.templates.models.supported import available_models
+from catalystwan.api.templates.models.cisco_aaa_model import CiscoAAAModel
+from catalystwan.api.templates.models.cisco_system import CiscoSystemModel
+from catalystwan.api.templates.models.omp_vsmart_model import OMPvSmart
+from catalystwan.api.templates.models.security_vsmart_model import SecurityvSmart
+from catalystwan.api.templates.models.system_vsmart_model import SystemVsmart
 from catalystwan.utils.feature_template.choose_model import choose_model
 
-# For "cisco_secure_internet_gateway" there are required values
-
 
 class TestChooseModel(unittest.TestCase):
     @parameterized.expand(
         [
-            (key, value)
-            for key, value in available_models.items()
-            if key not in ["cisco_secure_internet_gateway", "vpn_vsmart"]  # required values
+            ("cedge_aaa", CiscoAAAModel),
+            ("omp-vsmart", OMPvSmart),
+            ("security-vsmart", SecurityvSmart),
+            ("system-vsmart", SystemVsmart),
+            ("cisco_system", CiscoSystemModel),
         ]
     )
     def test_choose_model(self, model_type, model_cls):

catalystwan/tests/templates/test_deserialize_model.py

@@ -13,7 +13,7 @@ from parameterized import parameterized
 
 import catalystwan.tests.templates.models as models
 from catalystwan.api.templates.feature_template import FeatureTemplate
-from catalystwan.models.templates import FeatureTemplateInformation
+from catalystwan.dataclasses import FeatureTemplateInfo
 from catalystwan.typed_list import DataSequence
 from catalystwan.utils.creation_tools import create_dataclass
 
@@ -42,13 +42,13 @@ class TestFeatureTemplate(TestCase):
                     "template_type": template.type,
                     "device_type": ["vedge-C8000V"],
                     "version": "15.0.0",
-                    "template_definition": f"{json.dumps(definition)}",
+                    "template_definiton": f"{json.dumps(definition)}",
                 }
             )
 
         self.get_feature_templates_response = DataSequence(
-            FeatureTemplateInformation,
-            [create_dataclass(FeatureTemplateInformation, response) for response in feature_template_response],
+            FeatureTemplateInfo,
+            [create_dataclass(FeatureTemplateInfo, response) for response in feature_template_response],
         )
 
     @parameterized.expand([(template,) for template in map(models.__dict__.get, models.__all__)])

catalystwan/tests/templates/test_find_template_values.py

@@ -1,6 +1,4 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
-import logging
-
 from catalystwan.api.templates.device_variable import DeviceVariable
 from catalystwan.utils.feature_template.find_template_values import find_template_values
 
@@ -193,230 +191,3 @@ def test_find_template_values():
     result = find_template_values(input_values)
     # Assert
     assert expected_values == result
-
-
-def test_log_error_when_overwriting_existing_variable_value(caplog):
-    input_values = {
-        "if-name": {
-            "vipObjectType": "object",
-            "vipType": "variableName",
-            "vipValue": "",
-            "vipVariableName": "inet-if_name",
-        },
-        "description": {
-            "vipObjectType": "object",
-            "vipType": "variableName",
-            "vipValue": "",
-            "vipVariableName": "inet-if_desc",
-        },
-        "ip": {
-            "value": {
-                "vipObjectType": "object",
-                "vipType": "variableName",
-                "vipValue": "",
-                "vipVariableName": "first_test_value_variable",
-            },
-            "address": {
-                "vipObjectType": "object",
-                "vipType": "variableName",
-                "vipValue": "",
-                "vipVariableName": "inet-if_ipv4_address",
-            },
-        },
-        "tunnel-interface": {
-            "color": {
-                "value": {
-                    "vipObjectType": "object",
-                    "vipType": "variableName",
-                    "vipValue": "",
-                    "vipVariableName": "second_test_value_variable",
-                },
-                "restrict": {
-                    "vipObjectType": "node-only",
-                    "vipType": "ignore",
-                    "vipValue": "false",
-                    "vipVariableName": "vpn_if_tunnel_color_restrict",
-                },
-            },
-        },
-    }
-
-    expected_error_log = (
-        "Overwriting existing value for field: 'value' in templated_values. "
-        "Previous value: name='first_test_value_variable', new value: name='second_test_value_variable'."
-    )
-    # Act
-    result = find_template_values(input_values)
-
-    # Assert
-    error_logs = [log.getMessage() for log in caplog.records if log.levelno == logging.ERROR]
-    assert expected_error_log in error_logs
-    assert isinstance(result.get("value"), DeviceVariable)
-    assert result.get("value").name == "second_test_value_variable"
-
-
-def test_log_error_when_overwriting_existing_top_level_global_value(caplog):
-    input_values = {
-        "if-name": {
-            "vipObjectType": "object",
-            "vipType": "variableName",
-            "vipValue": "",
-            "vipVariableName": "inet-if_name",
-        },
-        "description": {
-            "vipObjectType": "object",
-            "vipType": "variableName",
-            "vipValue": "",
-            "vipVariableName": "inet-if_desc",
-        },
-        "value": {
-            "vipObjectType": "object",
-            "vipType": "constant",
-            "vipValue": "test_value",
-            "vipVariableName": "first_test_value_variable",
-        },
-        "ip": {
-            "address": {
-                "vipObjectType": "object",
-                "vipType": "variableName",
-                "vipValue": "",
-                "vipVariableName": "inet-if_ipv4_address",
-            },
-        },
-        "tunnel-interface": {
-            "color": {
-                "value": {
-                    "vipObjectType": "object",
-                    "vipType": "variableName",
-                    "vipValue": "",
-                    "vipVariableName": "second_test_value_variable",
-                },
-                "restrict": {
-                    "vipObjectType": "node-only",
-                    "vipType": "ignore",
-                    "vipValue": "false",
-                    "vipVariableName": "vpn_if_tunnel_color_restrict",
-                },
-            },
-        },
-    }
-
-    expected_error_log = (
-        "Overwriting existing value for field: 'value' in templated_values. "
-        "Previous value: test_value, new value: name='second_test_value_variable'."
-    )
-    # Act
-    result = find_template_values(input_values)
-
-    # Assert
-    error_logs = [log.getMessage() for log in caplog.records if log.levelno == logging.ERROR]
-
-    assert expected_error_log in error_logs
-    assert isinstance(result.get("value"), DeviceVariable)
-    assert result.get("value").name == "second_test_value_variable"
-
-
-def test_no_log_error_when_setting_value_first_time(caplog):
-    input_values = {
-        "if-name": {
-            "vipObjectType": "object",
-            "vipType": "variableName",
-            "vipValue": "",
-            "vipVariableName": "inet-if_name",
-        },
-        "description": {
-            "vipObjectType": "object",
-            "vipType": "variableName",
-            "vipValue": "",
-            "vipVariableName": "inet-if_desc",
-        },
-        "ip": {
-            "address": {
-                "vipObjectType": "object",
-                "vipType": "variableName",
-                "vipValue": "",
-                "vipVariableName": "inet-if_ipv4_address",
-            },
-        },
-        "tunnel-interface": {
-            "color": {
-                "value": {
-                    "vipObjectType": "object",
-                    "vipType": "variableName",
-                    "vipValue": "",
-                    "vipVariableName": "test_value_variable",
-                },
-                "restrict": {
-                    "vipObjectType": "node-only",
-                    "vipType": "ignore",
-                    "vipValue": "false",
-                    "vipVariableName": "vpn_if_tunnel_color_restrict",
-                },
-            },
-        },
-    }
-
-    # Act
-    result = find_template_values(input_values)
-
-    # Assert
-    error_logs = [log.getMessage() for log in caplog.records if log.levelno == logging.ERROR]
-    assert len(error_logs) == 0
-    assert isinstance(result.get("value"), DeviceVariable)
-    assert result.get("value").name == "test_value_variable"
-
-
-def test_no_log_error_when_global_value_is_nested(caplog):
-    input_values = {
-        "if-name": {
-            "vipObjectType": "object",
-            "vipType": "variableName",
-            "vipValue": "",
-            "vipVariableName": "inet-if_name",
-        },
-        "description": {
-            "vipObjectType": "object",
-            "vipType": "variableName",
-            "vipValue": "",
-            "vipVariableName": "inet-if_desc",
-        },
-        "ip": {
-            "address": {
-                "vipObjectType": "object",
-                "vipType": "variableName",
-                "vipValue": "",
-                "vipVariableName": "inet-if_ipv4_address",
-            },
-            "value": {
-                "vipObjectType": "object",
-                "vipType": "constant",
-                "vipValue": "test_value",
-                "vipVariableName": "first_test_value_variable",
-            },
-        },
-        "tunnel-interface": {
-            "color": {
-                "value": {
-                    "vipObjectType": "object",
-                    "vipType": "variableName",
-                    "vipValue": "",
-                    "vipVariableName": "second_test_value_variable",
-                },
-                "restrict": {
-                    "vipObjectType": "node-only",
-                    "vipType": "ignore",
-                    "vipValue": "false",
-                    "vipVariableName": "vpn_if_tunnel_color_restrict",
-                },
-            },
-        },
-    }
-
-    # Act
-    result = find_template_values(input_values)
-
-    # Assert
-    error_logs = [log.getMessage() for log in caplog.records if log.levelno == logging.ERROR]
-    assert len(error_logs) == 0
-    assert isinstance(result.get("value"), DeviceVariable)
-    assert result.get("value").name == "second_test_value_variable"

catalystwan/tests/templates/test_serialize_model.py

@@ -35,13 +35,14 @@ class TestFeatureTemplate2(TestCase):
             Path(__file__).resolve().parents[0] / Path("definitions") / Path(f"{template.template_name}.json")
         ) as f:
             definition = json.load(f)
+
         # Act
         feature_template_payload = templates_api.generate_feature_template_payload(
             template=template, schema=schema, debug=False
         )
         # Assert
         # self.assertDictEqual
-        self.maxDiff = 2**16
+        self.maxDiff = 10000
         self.assertDictEqual(
             definition["templateDefinition"],
             feature_template_payload.model_dump(by_alias=True, mode="json")["templateDefinition"],