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

catalystwan/endpoints/endpoints_container.py

@@ -11,22 +11,12 @@ from catalystwan.endpoints.client import Client
 from catalystwan.endpoints.cluster_management import ClusterManagement
 from catalystwan.endpoints.configuration.device.software_update import ConfigurationDeviceSoftwareUpdate
 from catalystwan.endpoints.configuration.disaster_recovery import ConfigurationDisasterRecovery
-from catalystwan.endpoints.configuration.feature_profile.sdwan.cli import CliFeatureProfile
-from catalystwan.endpoints.configuration.feature_profile.sdwan.embedded_security import EmbeddedSecurityFeatureProfile
-from catalystwan.endpoints.configuration.feature_profile.sdwan.policy_object import PolicyObjectFeatureProfile
-from catalystwan.endpoints.configuration.feature_profile.sdwan.sig_security import SIGSecurity
 from catalystwan.endpoints.configuration.feature_profile.sdwan.system import SystemFeatureProfile
-from catalystwan.endpoints.configuration.feature_profile.sdwan.topology import TopologyFeatureProfile
 from catalystwan.endpoints.configuration.feature_profile.sdwan.transport import TransportFeatureProfile
-from catalystwan.endpoints.configuration.network_hierarchy import NetworkHierarchy
-from catalystwan.endpoints.configuration.packages import DeviceConfigPackageEndpoints
 from catalystwan.endpoints.configuration.policy.definition.access_control_list import ConfigurationPolicyAclDefinition
 from catalystwan.endpoints.configuration.policy.definition.access_control_list_ipv6 import (
     ConfigurationPolicyAclIPv6Definition,
 )
-from catalystwan.endpoints.configuration.policy.definition.aip import ConfigurationPolicyAIPDefinition
-from catalystwan.endpoints.configuration.policy.definition.amp import ConfigurationPolicyAMPDefinition
-from catalystwan.endpoints.configuration.policy.definition.app_route import ConfigurationPolicyAppRouteDefinition
 from catalystwan.endpoints.configuration.policy.definition.control import ConfigurationPolicyControlDefinition
 from catalystwan.endpoints.configuration.policy.definition.device_access import (
     ConfigurationPolicyDeviceAccessDefinition,
@@ -34,27 +24,18 @@ from catalystwan.endpoints.configuration.policy.definition.device_access import
 from catalystwan.endpoints.configuration.policy.definition.device_access_ipv6 import (
     ConfigurationPolicyDeviceAccessIPv6Definition,
 )
-from catalystwan.endpoints.configuration.policy.definition.dial_peer import ConfigurationPolicyDialPeerDefinition
-from catalystwan.endpoints.configuration.policy.definition.fxo_port import ConfigurationPolicyFxoPortDefinition
-from catalystwan.endpoints.configuration.policy.definition.fxs_did_port import ConfigurationPolicyFxsDidPortDefinition
-from catalystwan.endpoints.configuration.policy.definition.fxs_port import ConfigurationPolicyFxsPortDefinition
 from catalystwan.endpoints.configuration.policy.definition.hub_and_spoke import ConfigurationPolicyHubAndSpokeDefinition
 from catalystwan.endpoints.configuration.policy.definition.mesh import ConfigurationPolicyMeshDefinition
-from catalystwan.endpoints.configuration.policy.definition.pri_isdn_port import ConfigurationPolicyPriIsdnPortDefinition
 from catalystwan.endpoints.configuration.policy.definition.qos_map import ConfigurationPolicyQoSMapDefinition
 from catalystwan.endpoints.configuration.policy.definition.rewrite import ConfigurationPolicyRewriteRuleDefinition
 from catalystwan.endpoints.configuration.policy.definition.rule_set import ConfigurationPolicyRuleSetDefinition
 from catalystwan.endpoints.configuration.policy.definition.security_group import (
     ConfigurationPolicySecurityGroupDefinition,
 )
-from catalystwan.endpoints.configuration.policy.definition.srst_phone_profile import (
-    ConfigurationPolicySrstPhoneProfileDefinition,
-)
 from catalystwan.endpoints.configuration.policy.definition.traffic_data import ConfigurationPolicyDataDefinition
 from catalystwan.endpoints.configuration.policy.definition.vpn_membership import (
     ConfigurationPolicyVPNMembershipGroupDefinition,
 )
-from catalystwan.endpoints.configuration.policy.definition.vpn_qos_map import ConfigurationPolicyVPNQoSMapDefinition
 from catalystwan.endpoints.configuration.policy.definition.zone_based_firewall import (
     ConfigurationPolicyZoneBasedFirewallDefinition,
 )
@@ -67,17 +48,13 @@ from catalystwan.endpoints.configuration.policy.list.community import Configurat
 from catalystwan.endpoints.configuration.policy.list.data_ipv6_prefix import ConfigurationPolicyDataIPv6PrefixList
 from catalystwan.endpoints.configuration.policy.list.data_prefix import ConfigurationPolicyDataPrefixList
 from catalystwan.endpoints.configuration.policy.list.expanded_community import ConfigurationPolicyExpandedCommunityList
-from catalystwan.endpoints.configuration.policy.list.extended_community import ConfigurationPolicyExtendedCommunityList
-from catalystwan.endpoints.configuration.policy.list.fax_protocol import ConfigurationPolicyFaxProtocolList
 from catalystwan.endpoints.configuration.policy.list.fqdn import ConfigurationPolicyFQDNList
 from catalystwan.endpoints.configuration.policy.list.geo_location import ConfigurationPolicyGeoLocationList
 from catalystwan.endpoints.configuration.policy.list.ips_signature import ConfigurationPolicyIPSSignatureList
 from catalystwan.endpoints.configuration.policy.list.ipv6_prefix import ConfigurationPolicyIPv6PrefixList
 from catalystwan.endpoints.configuration.policy.list.local_app import ConfigurationPolicyLocalAppList
 from catalystwan.endpoints.configuration.policy.list.local_domain import ConfigurationPolicyLocalDomainList
-from catalystwan.endpoints.configuration.policy.list.media_profile import ConfigurationPolicyMediaProfileList
 from catalystwan.endpoints.configuration.policy.list.mirror import ConfigurationPolicyMirrorList
-from catalystwan.endpoints.configuration.policy.list.modem_pass_through import ConfigurationPolicyModemPassThroughList
 from catalystwan.endpoints.configuration.policy.list.policer import ConfigurationPolicyPolicerClassList
 from catalystwan.endpoints.configuration.policy.list.port import ConfigurationPolicyPortList
 from catalystwan.endpoints.configuration.policy.list.preferred_color_group import ConfigurationPreferredColorGroupList
@@ -86,26 +63,15 @@ from catalystwan.endpoints.configuration.policy.list.protocol_name import Config
 from catalystwan.endpoints.configuration.policy.list.region import ConfigurationPolicyRegionList
 from catalystwan.endpoints.configuration.policy.list.site import ConfigurationPolicySiteList
 from catalystwan.endpoints.configuration.policy.list.sla import ConfigurationPolicySLAClassList
-from catalystwan.endpoints.configuration.policy.list.supervisory_disconnect import (
-    ConfigurationPolicySupervisoryDisconnectList,
-)
 from catalystwan.endpoints.configuration.policy.list.tloc import ConfigurationPolicyTLOCList
-from catalystwan.endpoints.configuration.policy.list.translation_profile import (
-    ConfigurationPolicyTranslationProfileList,
-)
-from catalystwan.endpoints.configuration.policy.list.translation_rules import ConfigurationPolicyTranslationRulesList
-from catalystwan.endpoints.configuration.policy.list.trunkgroup import ConfigurationPolicyTrunkGroupList
 from catalystwan.endpoints.configuration.policy.list.url_allow_list import ConfigurationPolicyURLAllowList
 from catalystwan.endpoints.configuration.policy.list.url_block_list import ConfigurationPolicyURLBlockList
 from catalystwan.endpoints.configuration.policy.list.vpn import ConfigurationPolicyVPNList
 from catalystwan.endpoints.configuration.policy.list.zone import ConfigurationPolicyZoneList
 from catalystwan.endpoints.configuration.policy.security_template import ConfigurationSecurityTemplatePolicy
 from catalystwan.endpoints.configuration.policy.vedge_template import ConfigurationVEdgeTemplatePolicy
-from catalystwan.endpoints.configuration.policy.voice_template import ConfigurationVoiceTemplatePolicy
 from catalystwan.endpoints.configuration.policy.vsmart_template import ConfigurationVSmartTemplatePolicy
-from catalystwan.endpoints.configuration.policy_group import PolicyGroupEndpoints
 from catalystwan.endpoints.configuration.software_actions import ConfigurationSoftwareActions
-from catalystwan.endpoints.configuration.topology_group import TopologyGroupEndpoints
 from catalystwan.endpoints.configuration_dashboard_status import ConfigurationDashboardStatus
 from catalystwan.endpoints.configuration_device_actions import ConfigurationDeviceActions
 from catalystwan.endpoints.configuration_device_inventory import ConfigurationDeviceInventory
@@ -114,12 +80,11 @@ from catalystwan.endpoints.configuration_feature_profile import (
     ConfigurationFeatureProfile,
     SDRoutingConfigurationFeatureProfile,
 )
-from catalystwan.endpoints.configuration_general_template import ConfigurationGeneralTemplate
 from catalystwan.endpoints.configuration_group import ConfigurationGroup
 from catalystwan.endpoints.configuration_settings import ConfigurationSettings
-from catalystwan.endpoints.configuration_template_master import ConfigurationTemplateMaster
 from catalystwan.endpoints.misc import MiscellaneousEndpoints
 from catalystwan.endpoints.monitoring.device_details import MonitoringDeviceDetails
+from catalystwan.endpoints.monitoring.security_policy import MonitoringSecurityPolicy
 from catalystwan.endpoints.monitoring.server_info import ServerInfo
 from catalystwan.endpoints.monitoring.status import MonitoringStatus
 from catalystwan.endpoints.real_time_monitoring.reboot_history import RealTimeMonitoringRebootHistory
@@ -128,6 +93,7 @@ from catalystwan.endpoints.tenant_backup_restore import TenantBackupRestore
 from catalystwan.endpoints.tenant_management import TenantManagement
 from catalystwan.endpoints.tenant_migration import TenantMigration
 from catalystwan.endpoints.troubleshooting_tools.device_connectivity import TroubleshootingToolsDeviceConnectivity
+from catalystwan.endpoints.url_monitoring import UrlMonitoring
 
 if TYPE_CHECKING:
     from catalystwan.session import ManagerSession
@@ -144,17 +110,13 @@ class ConfigurationPolicyListContainer:
         self.data_ipv6_prefix = ConfigurationPolicyDataIPv6PrefixList(session)
         self.data_prefix = ConfigurationPolicyDataPrefixList(session)
         self.expanded_community = ConfigurationPolicyExpandedCommunityList(session)
-        self.extended_community = ConfigurationPolicyExtendedCommunityList(session)
-        self.fax_protocol = ConfigurationPolicyFaxProtocolList(session)
         self.fqdn = ConfigurationPolicyFQDNList(session)
         self.geo_location = ConfigurationPolicyGeoLocationList(session)
         self.ips_signature = ConfigurationPolicyIPSSignatureList(session)
         self.ipv6_prefix = ConfigurationPolicyIPv6PrefixList(session)
         self.local_app = ConfigurationPolicyLocalAppList(session)
         self.local_domain = ConfigurationPolicyLocalDomainList(session)
-        self.media_profile = ConfigurationPolicyMediaProfileList(session)
         self.mirror = ConfigurationPolicyMirrorList(session)
-        self.modem_pass_through = ConfigurationPolicyModemPassThroughList(session)
         self.policer = ConfigurationPolicyPolicerClassList(session)
         self.port = ConfigurationPolicyPortList(session)
         self.preferred_color_group = ConfigurationPreferredColorGroupList(session)
@@ -163,63 +125,44 @@ class ConfigurationPolicyListContainer:
         self.region = ConfigurationPolicyRegionList(session)
         self.site = ConfigurationPolicySiteList(session)
         self.sla = ConfigurationPolicySLAClassList(session)
-        self.supervisory_disconnect = ConfigurationPolicySupervisoryDisconnectList(session)
         self.tloc = ConfigurationPolicyTLOCList(session)
-        self.translation_profile = ConfigurationPolicyTranslationProfileList(session)
-        self.translation_rules = ConfigurationPolicyTranslationRulesList(session)
-        self.trunkgroup = ConfigurationPolicyTrunkGroupList(session)
-        self.url_allow_list = ConfigurationPolicyURLAllowList(session)
         self.url_block_list = ConfigurationPolicyURLBlockList(session)
+        self.url_allow_list = ConfigurationPolicyURLAllowList(session)
         self.vpn = ConfigurationPolicyVPNList(session)
         self.zone = ConfigurationPolicyZoneList(session)
 
 
 class ConfigurationPolicyDefinitionContainer:
     def __init__(self, session: ManagerSession):
-        self.acl = ConfigurationPolicyAclDefinition(session)
-        self.acl_ipv6 = ConfigurationPolicyAclIPv6Definition(session)
-        self.advanced_inspection_profile = ConfigurationPolicyAIPDefinition(session)
-        self.advanced_malware_protection = ConfigurationPolicyAMPDefinition(session)
-        self.app_route = ConfigurationPolicyAppRouteDefinition(session)
-        self.control = ConfigurationPolicyControlDefinition(session)
         self.data = ConfigurationPolicyDataDefinition(session)
-        self.device_access = ConfigurationPolicyDeviceAccessDefinition(session)
-        self.device_access_ipv6 = ConfigurationPolicyDeviceAccessIPv6Definition(session)
-        self.dial_peer = ConfigurationPolicyDialPeerDefinition(session)
-        self.fxo_port = ConfigurationPolicyFxoPortDefinition(session)
-        self.fxs_port = ConfigurationPolicyFxsPortDefinition(session)
-        self.fxs_did_port = ConfigurationPolicyFxsDidPortDefinition(session)
-        self.hub_and_spoke = ConfigurationPolicyHubAndSpokeDefinition(session)
-        self.mesh = ConfigurationPolicyMeshDefinition(session)
-        self.pri_isdn_port = ConfigurationPolicyPriIsdnPortDefinition(session)
-        self.qos_map = ConfigurationPolicyQoSMapDefinition(session)
-        self.rewrite = ConfigurationPolicyRewriteRuleDefinition(session)
         self.rule_set = ConfigurationPolicyRuleSetDefinition(session)
         self.security_group = ConfigurationPolicySecurityGroupDefinition(session)
-        self.srst_phone_profile = ConfigurationPolicySrstPhoneProfileDefinition(session)
-        self.vpn_membership = ConfigurationPolicyVPNMembershipGroupDefinition(session)
-        self.vpn_qos_map = ConfigurationPolicyVPNQoSMapDefinition(session)
         self.zone_based_firewall = ConfigurationPolicyZoneBasedFirewallDefinition(session)
+        self.qos_map = ConfigurationPolicyQoSMapDefinition(session)
+        self.rewrite = ConfigurationPolicyRewriteRuleDefinition(session)
+        self.control = ConfigurationPolicyControlDefinition(session)
+        self.vpn_membership = ConfigurationPolicyVPNMembershipGroupDefinition(session)
+        self.hub_and_spoke = ConfigurationPolicyHubAndSpokeDefinition(session)
+        self.mesh = ConfigurationPolicyMeshDefinition(session)
+        self.acl = ConfigurationPolicyAclDefinition(session)
+        self.acl_ipv6 = ConfigurationPolicyAclIPv6Definition(session)
+        self.device_access = ConfigurationPolicyDeviceAccessDefinition(session)
+        self.device_access_ipv6 = ConfigurationPolicyDeviceAccessIPv6Definition(session)
 
 
 class ConfigurationPolicyContainer:
     def __init__(self, session: ManagerSession):
-        self.definition = ConfigurationPolicyDefinitionContainer(session)
         self.list = ConfigurationPolicyListContainer(session)
-        self.security_template = ConfigurationSecurityTemplatePolicy(session)
-        self.vedge_template = ConfigurationVEdgeTemplatePolicy(session)
-        self.voice_template = ConfigurationVoiceTemplatePolicy(session)
+        self.definition = ConfigurationPolicyDefinitionContainer(session)
         self.vsmart_template = ConfigurationVSmartTemplatePolicy(session)
+        self.vedge_template = ConfigurationVEdgeTemplatePolicy(session)
+        self.security_template = ConfigurationSecurityTemplatePolicy(session)
 
 
 class ConfigurationSDWANFeatureProfileContainer:
     def __init__(self, session: ManagerSession):
         self.transport = TransportFeatureProfile(client=session)
         self.system = SystemFeatureProfile(client=session)
-        self.cli = CliFeatureProfile(client=session)
-        self.topology = TopologyFeatureProfile(client=session)
-        self.policy = PolicyObjectFeatureProfile(client=session)
-        self.embedded_security = EmbeddedSecurityFeatureProfile(client=session)
 
 
 class ConfigurationFeatureProfileContainer:
@@ -230,12 +173,7 @@ class ConfigurationFeatureProfileContainer:
 class ConfigurationContainer:
     def __init__(self, session: ManagerSession):
         self.policy = ConfigurationPolicyContainer(session)
-        self.feature_profile = ConfigurationFeatureProfileContainer(session)
-        self.config_group = ConfigurationGroup(session)
-        self.topology_group = TopologyGroupEndpoints(session)
-        self.policy_group = PolicyGroupEndpoints(session)
         self.feature_profile = ConfigurationFeatureProfileContainer(session=session)
-        self.packages = DeviceConfigPackageEndpoints(session)
 
 
 class TroubleshootingToolsContainer:
@@ -263,9 +201,9 @@ class APIEndpointContainter:
         self.configuration_software_actions = ConfigurationSoftwareActions(session)
         self.configuration_disaster_recovery = ConfigurationDisasterRecovery(session)
         self.monitoring_device_details = MonitoringDeviceDetails(session)
+        self.monitoring_security_policy = MonitoringSecurityPolicy(session)
         self.monitoring_server_info = ServerInfo(session)
         self.monitoring_status = MonitoringStatus(session)
-        self.network_hierarchy = NetworkHierarchy(session)
         self.sdavc_cloud_connector = SDAVCCloudConnector(session)
         self.tenant_backup_restore = TenantBackupRestore(session)
         self.tenant_management = TenantManagement(session)
@@ -278,6 +216,4 @@ class APIEndpointContainter:
         self.misc = MiscellaneousEndpoints(session)
         self.real_time_monitoring = RealTimeMonitoringContainer(session)
         self.certificate_management_device = CertificateManagementDevice(session)
-        self.sig_security = SIGSecurity(session)
-        self.configuration_general_template = ConfigurationGeneralTemplate(session)
-        self.configuration_template_master = ConfigurationTemplateMaster(session)
+        self.url_monitoring = UrlMonitoring(session)

catalystwan/endpoints/real_time_monitoring/reboot_history.py

@@ -15,7 +15,9 @@ class RebootEntry(BaseModel):
     reason: Optional[str] = Field(default=None, validation_alias=AliasChoices("reboot_reason", "reload-desc"))
     severity: Optional[str] = Field(default=None, validation_alias="reload-severity", description=">=17.13 only")
     category: Optional[str] = Field(default=None, validation_alias="reload-category", description=">=17.13 only")
-    date_time: datetime = Field(validation_alias=AliasChoices("reboot_date_time-date", "reload-time-date"))
+    date_time: datetime = Field(
+        validation_alias=AliasChoices("reboot_date_time-date", "reboot_date_time", "reload-time-date", "reload-time")
+    )
     last_updated: datetime = Field(validation_alias="lastupdated")
     vdevice_name: str = Field(validation_alias="vdevice-name")
     vdevice_host_name: str = Field(validation_alias="vdevice-host-name")

catalystwan/endpoints/tenant_migration.py

@@ -19,8 +19,6 @@ class MigrationTokenQueryParams(BaseModel):
     @model_validator(mode="before")
     @classmethod
     def single_migration_id_required(cls, values: Any):
-        if not isinstance(values, dict):
-            return values
         migration_id = values.get("migrationId")
         if isinstance(migration_id, list) and len(migration_id) == 1:
             values["migrationId"] = migration_id[0]

catalystwan/exceptions.py

@@ -32,17 +32,6 @@ class ManagerHTTPError(HTTPError, ManagerRequestException):
             _args = (str(_args[0]) + "\n" + info_str,) + _args[1:]
         super().__init__(*_args, **kwargs)
 
-    def details(self):
-        error_info_str = str(self.info) if self.info else "No error information"
-        request_str = (
-            f"Request: Method: {self.request.method}, URL: {self.request.url},"
-            f"Headers: {self.request.headers}, Body: {self.request.body}"
-        )
-        response_str = (
-            f"Response: {str(self.response.json())}" if self.response else "Response: No response information"
-        )
-        return f"{error_info_str}\n\n {request_str}\n\n {response_str}"
-
 
 class DefaultPasswordError(CatalystwanException):
     """Default password for SDWAN Manager user was detected and needs to be changed."""
@@ -189,12 +178,6 @@ class ManagerReadyTimeout(CatalystwanException):
     pass
 
 
-class ApiGwAuthTimeout(CatalystwanException):
-    """Raised when waiting for API gateway authentication took longer than expected"""
-
-    pass
-
-
 class CatalystwanDeprecationWarning(DeprecationWarning):
     """Warning issued when using deprecated features or functionality in the Catalystwan SDK.
 
@@ -216,10 +199,3 @@ class CatalystwanDeprecationWarning(DeprecationWarning):
             f" The public API SHOULD NOT be considered stable."
         )
         return message
-
-
-class ModelNotFound(CatalystwanException):
-    """Raised when there is no model matching type specifier given as string"""
-
-    def __init__(self, type_, scope):
-        self.message = f"Cannot find model class for {type_} when searching: {scope}"

catalystwan/integration_tests/test_find_template_values.py

@@ -1,19 +1,27 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 
 import json
-from typing import Any, List
+import os
+import unittest
+from typing import Any, List, cast
 
-from catalystwan.integration_tests.base import TestCaseBase
+from catalystwan.session import create_manager_session
 from catalystwan.utils.feature_template.find_template_values import find_template_values
 
 
-class TestFindTemplateValues(TestCaseBase):
-    def test_find_template_value(self):
-        # Arrange
+class TestFindTemplateValues(unittest.TestCase):
+    def setUp(self) -> None:
+        self.session = create_manager_session(
+            url=cast(str, os.environ.get("TEST_VMANAGE_URL")),
+            port=cast(int, int(os.environ.get("TEST_VMANAGE_PORT"))),  # type: ignore
+            username=cast(str, os.environ.get("TEST_VMANAGE_USERNAME")),
+            password=cast(str, os.environ.get("TEST_VMANAGE_PASSWORD")),
+        )
         self.templates = self.session.api.templates._get_feature_templates(summary=False)
-        # Act, Assert
+
+    def test_find_template_value(self):
         for template in self.templates:
-            definition = json.loads(template.template_definition)
+            definition = json.loads(template.template_definiton)
             with self.subTest(template_name=template.name):
                 parsed_values = find_template_values(definition)
                 self.assertFalse(
@@ -36,3 +44,6 @@ class TestFindTemplateValues(TestCaseBase):
                         if self.is_key_present(v, keys):
                             return True
         return False
+
+    def tearDown(self) -> None:
+        self.session.close()