acex-devkit 1.14.0__tar.gz → 1.15.0__tar.gz

{acex_devkit-1.14.0 → acex_devkit-1.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acex-devkit
-Version: 1.14.0
+Version: 1.15.0
 Summary: ACE-X DevKit - Development kit for building ACE-X drivers and plugins
 License: AGPL-3.0
 Keywords: automation,devkit,sdk,drivers,plugins

{acex_devkit-1.14.0 → acex_devkit-1.15.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "acex-devkit"
-version = "1.14.0"
+version = "1.15.0"
 description = "ACE-X DevKit - Development kit for building ACE-X drivers and plugins"
 authors = ["Johan Lahti <johan.lahti@acebit.se>"]
 readme = "README.md"

{acex_devkit-1.14.0 → acex_devkit-1.15.0}/src/acex_devkit/models/acl_model.py

@@ -70,14 +70,14 @@ class Ipv4AclAttributes(ContainerEntry, BaseModel):
     identity_fields: ClassVar[tuple[str, ...]] = ("name",)
     name: AttributeValue[str]
     type: AttributeValue[str] = "ipv4_acl"
-    acl_entries: Optional[Dict[str, Ipv4AclEntryAttributes]] = None
+    acl_entries: Optional[Dict[str, Ipv4AclEntryAttributes]] = {}
 
 class Ipv6AclAttributes(ContainerEntry, BaseModel):
     identity_fields: ClassVar[tuple[str, ...]] = ("name",)
     name: AttributeValue[str]
     type: AttributeValue[str] = "ipv6_acl"
-    acl_entries: Optional[Dict[str, Ipv6AclEntryAttributes]] = None
+    acl_entries: Optional[Dict[str, Ipv6AclEntryAttributes]] = {}
     
 class Acl(BaseModel):
-    ipv4_acls: Optional[Dict[str, Ipv4AclAttributes]] = None
-    ipv6_acls: Optional[Dict[str, Ipv6AclAttributes]] = None
+    ipv4_acls: Optional[Dict[str, Ipv4AclAttributes]] = {}
+    ipv6_acls: Optional[Dict[str, Ipv6AclAttributes]] = {}

{acex_devkit-1.14.0 → acex_devkit-1.15.0}/src/acex_devkit/models/composed_configuration.py

@@ -16,32 +16,7 @@ from acex_devkit.models.logging import (
 )
 from acex_devkit.models.spanning_tree import SpanningTree
 from acex_devkit.models.acl_model import Acl
-
-class MetadataValueType(str, Enum):
-    CONCRETE = "concrete"
-    EXTERNALVALUE = "externalValue"
-    REFERENCE = "reference"
-
-class Metadata(BaseModel):
-    type: Optional[str] = "str"
-    value_source: MetadataValueType = MetadataValueType.CONCRETE 
-
-class Reference(ContainerEntry, BaseModel):
-    identity_fields: ClassVar[tuple[str, ...]] = ("pointer",)
-    pointer: str
-    metadata: Metadata = Metadata(type="str", value_source="reference")
-
-class ReferenceTo(Reference):
-    pointer: str
-    metadata: Optional[Dict] = {}
-
-class ReferenceFrom(Reference):
-    pointer: str
-    metadata: Optional[Dict] = {}
-
-class RenderedReference(BaseModel):
-    from_ptr: str
-    to_ptr: str
+from acex_devkit.models.reference import MetadataValueType, Metadata, Reference, ReferenceTo, ReferenceFrom, RenderedReference
 
 class SystemConfig(BaseModel):
     contact: Optional[AttributeValue[str]] = None
@@ -389,7 +364,24 @@ class NetworkInstance(ContainerEntry, BaseModel):
 class LacpConfig(BaseModel):
     system_priority: Optional[AttributeValue[int]] = None
     system_id_mac: Optional[AttributeValue[str]] = None
-    load_balance_algorithm: Optional[AttributeValue[list[Literal["src-mac", "dst-mac", "src-dst-mac", "src-ip", "dst-ip", "src-dst-ip", "src-port", "dst-port", "src-dst-port"]]]] = None
+    load_balance_algorithm: Optional[
+        AttributeValue[
+            list[
+                Literal[
+                    "src-mac",
+                    "dst-mac",
+                    "src-dst-mac",
+                    "src-ip",
+                    "dst-ip",
+                    "src-dst-ip",
+                    "src-port",
+                    "dst-port",
+                    "src-dst-port",
+                ]
+            ]
+        ]
+    ] = None
+
 
 class Lacp(BaseModel):
     config: Optional[LacpConfig] = LacpConfig()
@@ -812,9 +804,12 @@ class NetflowFormat(str, Enum):
     NETFLOW_V9 = "NetFlow v9"
     NETFLOW_V5 = "NetFlow v5"
 
-class NetflowRecordIpv4Match(BaseModel):
+
+class NetflowRecordIpv4Match(ContainerEntry, BaseModel):
+    identity_fields: ClassVar[tuple[str, ...]] = ("name",)
+    name: AttributeValue[str]
     # Leaf-level ipv4 matches (Cisco style "match ipv4 <field>"). True = match this field, False = No. None = Ignore the field
-    netflow_record: Optional[AttributeValue[str]] = None # Reference to parent record, used for easier access in config component
+    netflow_record: Optional[AttributeValue[str]] = None  # Reference to parent record, used for easier access in config component
     dscp: Optional[AttributeValue[bool]] = None
     fragmentation: Optional[AttributeValue[bool]] = None
     header_length: Optional[AttributeValue[bool]] = None
@@ -829,35 +824,46 @@ class NetflowRecordIpv4Match(BaseModel):
     ttl: Optional[AttributeValue[bool]] = None
     version: Optional[AttributeValue[bool]] = None
 
-class NetflowRecordAttributes(BaseModel): # Cisco flow record
+
+class NetflowRecordAttributes(ContainerEntry, BaseModel):  # Cisco flow record
+    identity_fields: ClassVar[tuple[str, ...]] = ("name",)
+    name: AttributeValue[str]
     match_ipv4: Optional[NetflowRecordIpv4Match] = None
-    #match_ipv4: Optional[Dict[str, NetflowRecordIpv4Match]] = {}
+    # match_ipv4: Optional[Dict[str, NetflowRecordIpv4Match]] = {}
     application_name: Optional[AttributeValue[bool]] = None
 
     # Escape hatch for vendor-specific match knobs not yet modeled
-    match_vendor_specific: Optional[AttributeValue[Dict[str, Any]]] = None # keeping a flexible option if needed. Not advertised to users.
+    match_vendor_specific: Optional[AttributeValue[Dict[str, Any]]] = None  # keeping a flexible option if needed. Not advertised to users.
 
     collect_timestamp_absolute_first: Optional[AttributeValue[bool]] = None
     collect_timestamp_absolute_last: Optional[AttributeValue[bool]] = None
 
-class NetflowCollectorAttributes(BaseModel): # Cisco flow monitor
-    netflow_record: Optional[AttributeValue[str]] = None # Reference to record, used for easier access in config component
-    netflow_exporter: Optional[AttributeValue[str]] = None # Reference to exporter, used for easier access in config component
+
+class NetflowCollectorAttributes(ContainerEntry, BaseModel):  # Cisco flow monitor
+    identity_fields: ClassVar[tuple[str, ...]] = ("name",)
+    name: AttributeValue[str]
+    records: Optional[Dict[str, Reference]] = {} # References to records, used for easier access in config component
+    exporters: Optional[Dict[str, Reference]] = {} # References to exporters, used for easier access in config component
     cache_inactive: Optional[AttributeValue[int]] = None
     cache_active: Optional[AttributeValue[int]] = None
     interfaces: Optional[Dict[str, Reference]] = {} # allow for disabling netflow on specific interfaces
 
-class NetflowExporterOptions(BaseModel):
+
+class NetflowExporterOptions(ContainerEntry, BaseModel):
     # Mostly timeouts atm
+    identity_fields: ClassVar[tuple[str, ...]] = ("name",)
+    name: AttributeValue[str]
     interface_table_timeout: Optional[AttributeValue[int]] = None
     vrf_table_timeout: Optional[AttributeValue[int]] = None
     sampler_table: Optional[AttributeValue[bool]] = None
     application_table_timeout: Optional[AttributeValue[int]] = None
     application_attributes_timeout: Optional[AttributeValue[int]] = None
-    netflow_exporter: Optional[AttributeValue[str]] = None # Reference to parent exporter, used for easier access in config component
+    netflow_exporter: Optional[AttributeValue[str]] = None  # Reference to parent exporter, used for easier access in config component
 
-class NetflowExporterAttributes(ContainerEntry, BaseModel): # Cisco flow exporter
-    identity_fields: ClassVar[tuple[str, ...]] = ("address",)
+
+class NetflowExporterAttributes(ContainerEntry, BaseModel):  # Cisco flow exporter
+    identity_fields: ClassVar[tuple[str, ...]] = ("name",)
+    name: AttributeValue[str]
     address: Optional[AttributeValue[str]] = None
     port: Optional[AttributeValue[int]] = None
     netflow_format: Optional[AttributeValue[str]] = None
@@ -865,10 +871,14 @@ class NetflowExporterAttributes(ContainerEntry, BaseModel): # Cisco flow exporte
     network_instance: Optional[AttributeValue[str]] = None
     options: Optional[NetflowExporterOptions] = None
 
-class NetflowGlobalConfigAttributes(BaseModel):
+
+class NetflowGlobalConfigAttributes(ContainerEntry, BaseModel):
+    identity_fields: ClassVar[tuple[str, ...]] = ("name",)
+    name: AttributeValue[str]
     enabled: Optional[AttributeValue[bool]] = None
     version: Optional[AttributeValue[int]] = None
 
+
 class Netflow(BaseModel):
     config: Optional[NetflowGlobalConfigAttributes] = None
     records: Optional[Dict[str, NetflowRecordAttributes]] = {}

{acex_devkit-1.14.0 → acex_devkit-1.15.0}/src/acex_devkit/models/logging.py

@@ -1,6 +1,7 @@
 from pydantic import BaseModel
 from acex_devkit.models.attribute_value import AttributeValue
 from acex_devkit.models.container_entry import ContainerEntry
+from acex_devkit.models.reference import Reference
 from enum import Enum
 from typing import ClassVar, Optional, Dict
 
@@ -35,8 +36,6 @@ class LoggingFacility(str, Enum):
     CHANGELOG = "CHANGELOG"
     INTERACTIVE_COMMANDS = "INTERACTIVE_COMMANDS"
 
-class Reference(BaseModel): ...
-
 class LoggingConfig(BaseModel):
     rate_limit: Optional[AttributeValue[int]] = None
     severity: Optional[AttributeValue[LoggingSeverity]] = None
@@ -64,6 +63,10 @@ class VtyLine(ContainerEntry, BaseModel):
     line_number: Optional[AttributeValue[int]] = None
     logging_synchronous: Optional[AttributeValue[bool]] = None
     transport_input: Optional[AttributeValue[str]] = None # default is SSH. Mostly used by Cisco.
+    ipv4acl: Optional[Reference] = None # reference to an ACL object. Only used by Cisco.
+    ipv6acl: Optional[Reference] = None # reference to an ACL object. Only used by Cisco.
+    acl_direction: Optional[AttributeValue[str]] = None # direction of ACL, either 'in' or 'out'
+    acl_network_instance: Optional[AttributeValue[str]] = None # network instance where ACL is
 
 class FileLogging(ContainerEntry, BaseModel):
     identity_fields: ClassVar[tuple[str, ...]] = ("filename",)
@@ -81,4 +84,5 @@ class LoggingEvent(BaseModel):
 
 
 class LoggingEvents(BaseModel):
-    events: Optional[Dict[str, LoggingEvent]] = None
+    events: Optional[Dict[str, LoggingEvent]] = None
+

acex_devkit-1.15.0/src/acex_devkit/models/reference.py

@@ -0,0 +1,37 @@
+from pydantic import BaseModel
+from typing import Optional, Dict, ClassVar
+from enum import Enum
+
+from acex_devkit.models.container_entry import ContainerEntry
+
+
+class MetadataValueType(str, Enum):
+    CONCRETE = "concrete"
+    EXTERNALVALUE = "externalValue"
+    REFERENCE = "reference"
+
+
+class Metadata(BaseModel):
+    type: Optional[str] = "str"
+    value_source: MetadataValueType = MetadataValueType.CONCRETE
+
+
+class Reference(ContainerEntry, BaseModel):
+    identity_fields: ClassVar[tuple[str, ...]] = ("pointer",)
+    pointer: str
+    metadata: Metadata = Metadata(type="str", value_source="reference")
+
+
+class ReferenceTo(Reference):
+    pointer: str
+    metadata: Optional[Dict] = {}
+
+
+class ReferenceFrom(Reference):
+    pointer: str
+    metadata: Optional[Dict] = {}
+
+
+class RenderedReference(BaseModel):
+    from_ptr: str
+    to_ptr: str