catalystwan 0.41.4.dev2__tar.gz → 0.41.4.dev3__tar.gz

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

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

{catalystwan-0.41.4.dev2 → catalystwan-0.41.4.dev3}/catalystwan/integration_tests/feature_profile/sdwan/test_service.py

@@ -90,8 +90,9 @@ from catalystwan.models.configuration.feature_profile.sdwan.service.multicast im
     PimAttributes,
     PimBsrAttributes,
     PimInterfaceParameters,
-    RPAnnounce,
     RpDiscoveryScope,
+    SendRpAnnounce,
+    SendRpDiscovery,
     SsmAttributes,
     SsmFlag,
     StaticJoin,
@@ -112,11 +113,11 @@ from catalystwan.models.configuration.feature_profile.sdwan.service.switchport i
 from catalystwan.models.configuration.feature_profile.sdwan.service.wireless_lan import (
     SSID,
     CountryCode,
+    EnterpriseSecurityConfig,
     MeIpConfig,
     MeStaticIpConfig,
     QosProfile,
     RadioType,
-    SecurityConfig,
     SecurityType,
     WirelessLanParcel,
 )
@@ -616,10 +617,10 @@ class TestServiceFeatureProfileModels(TestCaseBase):
                 auto_rp=AutoRpAttributes(
                     enable_auto_rp_flag=as_global(False),
                     send_rp_announce_list=[
-                        RPAnnounce(interface_name=as_global("GigabitEthernet0/0/0"), scope=as_global(3))
+                        SendRpAnnounce(interface_name=as_global("GigabitEthernet0/0/0"), scope=as_global(3))
                     ],
                     send_rp_discovery=[
-                        RPAnnounce(interface_name=as_global("GigabitEthernet0/0/0"), scope=as_global(3))
+                        SendRpDiscovery(interface_name=as_global("GigabitEthernet0/0/0"), scope=as_global(3))
                     ],
                 ),
                 pim_bsr=PimBsrAttributes(
@@ -685,7 +686,7 @@ class TestServiceFeatureProfileModels(TestCaseBase):
                     broadcast_ssid=as_global(True),
                     radio_type=as_global("all", RadioType),
                     qos_profile=as_global("platinum", QosProfile),
-                    security_config=SecurityConfig(
+                    security_config=EnterpriseSecurityConfig(
                         security_type=as_global("enterprise", SecurityType),
                         radius_server_ip=as_global(IPv4Address("1.1.1.1")),
                         radius_server_port=as_global(1884),

{catalystwan-0.41.4.dev2 → catalystwan-0.41.4.dev3}/catalystwan/models/common.py

@@ -2049,3 +2049,7 @@ SpaceSeparatedServiceAreaList = Annotated[
     PlainSerializer(lambda x: " ".join(map(str, x)), return_type=str, when_used="json-unless-none"),
     BeforeValidator(str_as_service_area_list),
 ]
+
+IntrusionPreventionSignatureSet = Literal["balanced", "connectivity", "security", "max-detect"]
+IntrusionPreventionInspectionMode = Literal["protection", "detection"]
+IntrusionPreventionLogLevel = Literal["emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"]

{catalystwan-0.41.4.dev2 → catalystwan-0.41.4.dev3}/catalystwan/models/configuration/feature_profile/sdwan/policy_object/security/intrusion_prevention.py

@@ -6,11 +6,14 @@ from uuid import UUID
 from pydantic import AliasPath, ConfigDict, Field
 
 from catalystwan.api.configuration_groups.parcel import Global, _ParcelBase
+from catalystwan.models.common import (
+    IntrusionPreventionInspectionMode,
+    IntrusionPreventionLogLevel,
+    IntrusionPreventionSignatureSet,
+)
 from catalystwan.models.configuration.feature_profile.common import RefIdItem
 
-SignatureSet = Literal["balanced", "connectivity", "security"]
-InspectionMode = Literal["detection", "protection"]
-LogLevel = Literal["emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"]
+SignatureSet = Literal[IntrusionPreventionSignatureSet, "no-rules-active"]
 
 
 class IntrusionPreventionParcel(_ParcelBase):
@@ -19,14 +22,15 @@ class IntrusionPreventionParcel(_ParcelBase):
     signature_set: Global[SignatureSet] = Field(
         default=Global[SignatureSet](value="balanced"), validation_alias=AliasPath("data", "signatureSet")
     )
-    inspection_mode: Global[InspectionMode] = Field(
-        default=Global[InspectionMode](value="detection"), validation_alias=AliasPath("data", "inspectionMode")
+    inspection_mode: Global[IntrusionPreventionInspectionMode] = Field(
+        default=Global[IntrusionPreventionInspectionMode](value="detection"),
+        validation_alias=AliasPath("data", "inspectionMode"),
     )
     signature_allowed_list: Optional[RefIdItem] = Field(
         default=None, validation_alias=AliasPath("data", "signatureAllowedList")
     )
-    log_level: Global[LogLevel] = Field(
-        default=Global[LogLevel](value="error"), validation_alias=AliasPath("data", "logLevel")
+    log_level: Global[IntrusionPreventionLogLevel] = Field(
+        default=Global[IntrusionPreventionLogLevel](value="error"), validation_alias=AliasPath("data", "logLevel")
     )
     custom_signature: Global[bool] = Field(
         default=Global[bool](value=False), validation_alias=AliasPath("data", "customSignature")
@@ -38,9 +42,9 @@ class IntrusionPreventionParcel(_ParcelBase):
         parcel_name: str,
         parcel_description: str,
         signature_set: SignatureSet = "balanced",
-        inspection_mode: InspectionMode = "detection",
+        inspection_mode: IntrusionPreventionInspectionMode = "detection",
         signature_allowed_list: Optional[UUID] = None,
-        log_level: LogLevel = "error",
+        log_level: IntrusionPreventionLogLevel = "error",
         custom_signature: bool = False,
     ) -> "IntrusionPreventionParcel":
         sal: Optional[RefIdItem] = None
@@ -51,8 +55,8 @@ class IntrusionPreventionParcel(_ParcelBase):
             parcel_name=parcel_name,
             parcel_description=parcel_description,
             signature_set=Global[SignatureSet](value=signature_set),
-            inspection_mode=Global[InspectionMode](value=inspection_mode),
+            inspection_mode=Global[IntrusionPreventionInspectionMode](value=inspection_mode),
             signature_allowed_list=sal,
-            log_level=Global[LogLevel](value=log_level),
+            log_level=Global[IntrusionPreventionLogLevel](value=log_level),
             custom_signature=Global[bool](value=custom_signature),
         )

{catalystwan-0.41.4.dev2 → catalystwan-0.41.4.dev3}/catalystwan/models/configuration/feature_profile/sdwan/service/multicast.py

@@ -98,11 +98,13 @@ class StaticRpAddress(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 
     address: Union[Global[IPv4Address], Variable]
-    access_list: Union[Global[str], Variable] = Field(serialization_alias="accessList", validation_alias="accessList")
+    access_list: Union[Global[str], Variable, Default[None]] = Field(
+        serialization_alias="accessList", validation_alias="accessList"
+    )
     override: Optional[Union[Global[bool], Variable, Default[bool]]] = Default[bool](value=False)
 
 
-class RPAnnounce(BaseModel):
+class SendRpDiscovery(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 
     interface_name: Union[Global[str], Variable] = Field(
@@ -111,16 +113,29 @@ class RPAnnounce(BaseModel):
     scope: Union[Global[int], Variable]
 
 
+class SendRpAnnounce(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+
+    interface_name: Union[Global[str], Variable] = Field(
+        validation_alias="interfaceName", serialization_alias="interfaceName"
+    )
+    scope: Union[Global[int], Variable] = Field()
+    group_list: Optional[Union[Global[str], Variable, Default[None]]] = Field(
+        default=None, validation_alias="groupList", serialization_alias="groupList"
+    )
+    interval: Optional[Union[Default[None], Global[int], Variable]] = Field(default=None)
+
+
 class AutoRpAttributes(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 
     enable_auto_rp_flag: Optional[Union[Global[bool], Variable, Default[bool]]] = Field(
         serialization_alias="enableAutoRPFlag", validation_alias="enableAutoRPFlag", default=Default[bool](value=False)
     )
-    send_rp_announce_list: Optional[List[RPAnnounce]] = Field(
+    send_rp_announce_list: Optional[List[SendRpAnnounce]] = Field(
         serialization_alias="sendRpAnnounceList", validation_alias="sendRpAnnounceList", default=None
     )
-    send_rp_discovery: Optional[List[RPAnnounce]] = Field(
+    send_rp_discovery: Optional[List[SendRpDiscovery]] = Field(
         serialization_alias="sendRpDiscovery", validation_alias="sendRpDiscovery", default=None
     )
 

{catalystwan-0.41.4.dev2 → catalystwan-0.41.4.dev3}/catalystwan/models/configuration/feature_profile/sdwan/service/wireless_lan.py

@@ -161,20 +161,43 @@ class MeIpConfig(BaseModel):
     )
 
 
-class SecurityConfig(BaseModel):
+class OpenSecurityConfig(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+    security_type: Global[Literal["open"]] = Field(
+        default=Global[Literal["open"]](value="open"),
+        serialization_alias="securityType",
+        validation_alias="securityType",
+    )
+
+
+class PersonalSecurityConfig(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
 
-    security_type: Global[SecurityType] = Field(serialization_alias="securityType", validation_alias="securityType")
-    radius_server_ip: Optional[Union[Global[IPv4Address], Variable]] = Field(
-        serialization_alias="radiusServerIp", validation_alias="radiusServerIp", default=None
+    security_type: Global[Literal["personal"]] = Field(
+        default=Global[Literal["personal"]](value="personal"),
+        serialization_alias="securityType",
+        validation_alias="securityType",
     )
-    radius_server_port: Optional[Union[Global[int], Variable, Default[int]]] = Field(
-        serialization_alias="radiusServerPort", validation_alias="radiusServerPort", default=None
+    passphrase: Union[Global[str], Variable] = Field()
+
+
+class EnterpriseSecurityConfig(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True, extra="forbid")
+
+    security_type: Global[Literal["enterprise"]] = Field(
+        default=Global[Literal["enterprise"]](value="enterprise"),
+        serialization_alias="securityType",
+        validation_alias="securityType",
+    )
+    radius_server_ip: Union[Global[IPv4Address], Variable] = Field(
+        serialization_alias="radiusServerIp", validation_alias="radiusServerIp"
     )
-    radius_server_secret: Optional[Union[Global[str], Variable]] = Field(
-        serialization_alias="radiusServerSecret", validation_alias="radiusServerSecret", default=None
+    radius_server_port: Union[Global[int], Variable, Default[int]] = Field(
+        serialization_alias="radiusServerPort", validation_alias="radiusServerPort"
+    )
+    radius_server_secret: Union[Global[str], Variable] = Field(
+        serialization_alias="radiusServerSecret", validation_alias="radiusServerSecret"
     )
-    passphrase: Optional[Union[Global[str], Variable]] = None
 
 
 class SSID(BaseModel):
@@ -191,7 +214,9 @@ class SSID(BaseModel):
     radio_type: Union[Global[RadioType], Variable, Default[RadioType]] = Field(
         serialization_alias="radioType", validation_alias="radioType", default=Default[RadioType](value="all")
     )
-    security_config: SecurityConfig = Field(serialization_alias="securityConfig", validation_alias="securityConfig")
+    security_config: Union[OpenSecurityConfig, PersonalSecurityConfig, EnterpriseSecurityConfig] = Field(
+        serialization_alias="securityConfig", validation_alias="securityConfig"
+    )
     qos_profile: Union[Global[QosProfile], Variable, Default[QosProfile]] = Field(
         serialization_alias="qosProfile",
         validation_alias="qosProfile",

{catalystwan-0.41.4.dev2 → catalystwan-0.41.4.dev3}/catalystwan/models/policy/definition/intrusion_prevention.py

@@ -4,7 +4,13 @@ from typing import List, Literal, Optional
 
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
-from catalystwan.models.common import PolicyModeType, VpnId
+from catalystwan.models.common import (
+    IntrusionPreventionInspectionMode,
+    IntrusionPreventionLogLevel,
+    IntrusionPreventionSignatureSet,
+    PolicyModeType,
+    VpnId,
+)
 from catalystwan.models.policy.policy_definition import (
     PolicyDefinitionBase,
     PolicyDefinitionGetResponse,
@@ -12,19 +18,21 @@ from catalystwan.models.policy.policy_definition import (
     Reference,
 )
 
-SignatureSetType = Literal["balanced", "connectivity", "security"]
-InspectionModeType = Literal["protection", "detection"]
-LogLevel = Literal["emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"]
-
 
 class IntrusionPreventionDefinition(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
-    signature_set: SignatureSetType = Field(validation_alias="signatureSet", serialization_alias="signatureSet")
-    inspection_mode: InspectionModeType = Field(validation_alias="inspectionMode", serialization_alias="inspectionMode")
+    signature_set: IntrusionPreventionSignatureSet = Field(
+        validation_alias="signatureSet", serialization_alias="signatureSet"
+    )
+    inspection_mode: IntrusionPreventionInspectionMode = Field(
+        validation_alias="inspectionMode", serialization_alias="inspectionMode"
+    )
     signature_white_list: Optional[Reference] = Field(
         default=None, validation_alias="signatureWhiteList", serialization_alias="signatureWhiteList"
     )
-    log_level: Optional[LogLevel] = Field(default="error", validation_alias="logLevel", serialization_alias="logLevel")
+    log_level: Optional[IntrusionPreventionLogLevel] = Field(
+        default="error", validation_alias="logLevel", serialization_alias="logLevel"
+    )
     logging: List[str] = Field(default_factory=list)
     target_vpns: List[VpnId] = Field(
         default_factory=list, validation_alias="targetVpns", serialization_alias="targetVpns"

{catalystwan-0.41.4.dev2 → catalystwan-0.41.4.dev3}/pyproject.toml

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