acex-devkit 1.3.3__tar.gz → 1.4.0__tar.gz

{acex_devkit-1.3.3 → acex_devkit-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acex-devkit
-Version: 1.3.3
+Version: 1.4.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.3.3 → acex_devkit-1.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "acex-devkit"
-version = "1.3.3"
+version = "1.4.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.3.3 → acex_devkit-1.4.0}/src/acex_devkit/models/__init__.py

@@ -5,11 +5,12 @@
 
 from .external_value import ExternalValue
 from .attribute_value import AttributeValue
-from .node_response import NodeResponse, LogicalNodeResponse
+from .node_response import NodeResponse, NodeListItem, LogicalNodeResponse
 
 __all__ = [
     ExternalValue,
     AttributeValue,
     NodeResponse,
+    NodeListItem,
     LogicalNodeResponse
     ]

{acex_devkit-1.3.3 → acex_devkit-1.4.0}/src/acex_devkit/models/composed_configuration.py

@@ -112,7 +112,18 @@ class Ssh(BaseModel):
     config: Optional[SshServer] = None
     host_keys: Optional[Dict[str, AuthorizedKey]] = {}
 
-class Lldp(BaseModel): ...
+class LldpConfigAttributes(BaseModel):
+    enabled: Optional[AttributeValue[bool]] = None
+    transmit_interval: Optional[AttributeValue[int]] = None
+    hold_time: Optional[AttributeValue[int]] = None
+    system_name: Optional[AttributeValue[str]] = None  # The system name field shall contain an alpha-numeric string that indicates the system's administratively assigned name.
+    suppress_tlv_advertisement: Optional[AttributeValue[List[str]]] = None # Comma-separated list of TLVs to suppress in advertisements. Values depend on device and vendor, but common ones include "system_name", "system_description", "system_capabilities", "management_address", etc.
+    interfaces: Optional[Dict[str, Reference]] = {}
+
+#class Lldp(BaseModel):
+#    config: Optional[LldpConfigAttributes] = LldpConfigAttributes()
+#    #interfaces: Optional[Dict[str, LldpInterfaceConfigAttributes]] = {}
+#    interfaces: Optional[Dict[str, Reference]] = {}
 
 class Vlan(ContainerEntry, BaseModel):
     identity_fields: ClassVar[tuple[str, ...]] = ("vlan_id",)
@@ -166,7 +177,7 @@ class EthernetCsmacdInterface(Interface):
     voice_vlan: Optional[AttributeValue[int]] = None
     mtu: Optional[AttributeValue[int]] = None # No default set as it differs between devices and vendors
     negotiation: Optional[AttributeValue[bool]] = None
-    lldp_enabled: Optional[AttributeValue[bool]] = None
+    #lldp_enabled: Optional[AttributeValue[bool]] = None
     cdp_enabled: Optional[AttributeValue[bool]] = None
 
     # LACP relaterade attribut
@@ -667,6 +678,25 @@ class VTPAttributes(BaseModel):
 class VTP(BaseModel):
     config: VTPAttributes = VTPAttributes()
 
+class DHCPSnoopingAttributes(BaseModel):
+    enabled: Optional[AttributeValue[bool]] = None
+    vlans: Optional[Dict[str, Reference]] = {} # VLANs where DHCP snooping is enabled, key is VLAN ID, value is reference to VLAN
+    trust_interfaces: Optional[Dict[str, Reference]] = {} # Interfaces that are trusted for DHCP snooping, key is interface name, value is reference to interface
+    option82: Optional[AttributeValue[bool]] = None # Whether DHCP snooping option 82 is enabled
+
+class DhcpRelayServerAttributes(ContainerEntry, BaseModel):
+    identity_fields: ClassVar[tuple[str, ...]] = ("address",)
+    address: Optional[AttributeValue[str]] = None
+    network_instance: Optional[AttributeValue[str]] = None
+    interfaces: Optional[Dict[str, Reference]] = {}
+
+class DhcpRelay(BaseModel):
+    relay_servers: Optional[Dict[str, DhcpRelayServerAttributes]] = {}
+
+class Dhcp(BaseModel): 
+    snooping: Optional[DHCPSnoopingAttributes] = DHCPSnoopingAttributes()
+    relay: Optional[DhcpRelay] = DhcpRelay()
+
 class System(BaseModel):
     config: SystemConfig = SystemConfig()
     aaa: Optional[TripleA] = TripleA()
@@ -675,6 +705,7 @@ class System(BaseModel):
     ssh: Optional[Ssh] = Ssh()
     snmp: Optional[Snmp] = Snmp()
     vtp: Optional[VTP] = VTP()
+    dhcp: Optional[Dhcp] = Dhcp()
 
 # For different types of interfaces that are fine for response model:
 InterfaceType = Union[
@@ -689,7 +720,7 @@ InterfaceType = Union[
 class ComposedConfiguration(BaseModel):
     system: Optional[System] = System()
     acl: Optional[Acl] = Acl()
-    lldp: Optional[Lldp] = Lldp()
+    lldp: Optional[LldpConfigAttributes] = LldpConfigAttributes()
     lacp: Optional[Lacp] = Lacp()
     interfaces: Dict[str, InterfaceType] = {}
     network_instances: Dict[str, NetworkInstance] = {"global": NetworkInstance(name="global")}

{acex_devkit-1.3.3 → acex_devkit-1.4.0}/src/acex_devkit/models/node_response.py

@@ -48,7 +48,23 @@ class Node(NodeBase):
     created_at: Optional[datetime] = None
     updated_at: Optional[datetime] = None
 
+
+class NodeListItem(NodeBase):
+    """Enriched list representation with denormalized fields from asset and logical_node."""
+    id: Optional[int] = None
+    # From logical_node
+    hostname: Optional[str] = None
+    site: Optional[str] = None
+    # From asset
+    vendor: Optional[str] = None
+    os: Optional[str] = None
+    ned_id: Optional[str] = None
+    created_at: Optional[datetime] = None
+    updated_at: Optional[datetime] = None
+
+
 class NodeResponse(NodeBase):
+    id: Optional[int] = None
     asset: Asset
     logical_node: LogicalNodeResponse
     created_at: datetime