acex-devkit 1.1.1__tar.gz → 1.2.0__tar.gz

{acex_devkit-1.1.1 → acex_devkit-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acex-devkit
-Version: 1.1.1
+Version: 1.2.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.1.1 → acex_devkit-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "acex-devkit"
-version = "1.1.1"
+version = "1.2.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.1.1 → acex_devkit-1.2.0}/src/acex_devkit/configdiffer/configdiffer.py

@@ -167,6 +167,12 @@ class ConfigDiffer:
                     changed_attributes=self._attribute_changes(observed_comp, desired_comp),
                 ))
 
-        return Diff(added=added, removed=removed, changed=changed)
+        return Diff(
+            added=added,
+            removed=removed,
+            changed=changed,
+            total_desired=len(desired_paths),
+            total_observed=len(observed_paths),
+        )
 
     

{acex_devkit-1.1.1 → acex_devkit-1.2.0}/src/acex_devkit/configdiffer/diff.py

@@ -6,7 +6,7 @@ added, removed, or changed when comparing two configurations. This enables drive
 to render device-specific command patches based on the component changes.
 """
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_serializer, computed_field
 from typing import Any, Dict, List, Optional, Type
 from enum import Enum
 
@@ -58,6 +58,15 @@ class ComponentChange(BaseModel):
     
     model_config = {"arbitrary_types_allowed": True}
 
+    @field_serializer("component_type")
+    def serialize_component_type(self, v: Type[Any]) -> str:
+        return v.__name__
+
+    @property
+    def component_type_name(self) -> str:
+        """Return the class name of the component type, e.g., 'FrontpanelPort'"""
+        return self.component_type.__name__
+
     def get_path_str(self, separator: str = "/") -> str:
         """Return the component path as a string, e.g., 'interfaces/GigabitEthernet0-0-1'"""
         return separator.join(self.path) if self.path else ""
@@ -74,17 +83,46 @@ class Diff(BaseModel):
     removed: List[ComponentChange] = Field(default_factory=list)
     changed: List[ComponentChange] = Field(default_factory=list)
 
+    # Total number of config points in desired/observed configs — populated by ConfigDiffer
+    total_desired: int = 0
+    total_observed: int = 0
+
+    @computed_field
+    @property
+    def compliant_count(self) -> int:
+        """
+        Number of desired config points that are fully compliant (present and
+        identical on the device). Equals total desired minus points that are
+        missing (added) or incorrect (changed).
+        """
+        return max(0, self.total_desired - len(self.added) - len(self.changed))
+
+    @computed_field
+    @property
+    def compliance_percentage(self) -> float:
+        """
+        Percentage of desired config points that are compliant.
+        Returns 100.0 when there are no desired config points.
+        """
+        if self.total_desired == 0:
+            return 100.0
+        return round(self.compliant_count / self.total_desired * 100, 2)
+
     def is_empty(self) -> bool:
         """Check if there are no changes"""
         return not (self.added or self.removed or self.changed)
 
-    def summary(self) -> Dict[str, int]:
-        """Get a summary of changes"""
+    def summary(self) -> Dict[str, Any]:
+        """Get a summary of changes and compliance metadata"""
         return {
             "added": len(self.added),
             "removed": len(self.removed),
             "changed": len(self.changed),
-            "total": len(self.added) + len(self.removed) + len(self.changed)
+            "total_changes": len(self.added) + len(self.removed) + len(self.changed),
+            "total_desired": self.total_desired,
+            "total_observed": self.total_observed,
+            "compliant_count": self.compliant_count,
+            "compliance_percentage": self.compliance_percentage,
         }
 
     def get_all_changes(self) -> List[ComponentChange]:
@@ -95,7 +133,7 @@ class Diff(BaseModel):
         """Get all changes for a specific component type (e.g., 'Loopback')"""
         return [
             change for change in self.get_all_changes()
-            if change.component_type == component_type
+            if change.component_type.__name__ == component_type
         ]
 
     def get_changes_by_path_prefix(self, path_prefix: List[str]) -> List[ComponentChange]:

{acex_devkit-1.1.1 → acex_devkit-1.2.0}/src/acex_devkit/models/acl_model.py

@@ -67,13 +67,13 @@ class Ipv6AclEntryAttributes(IpAclOptions):
 class Ipv4AclAttributes(BaseModel):
     name: AttributeValue[str]
     type: AttributeValue[str] = "ipv4_acl"
-    acl_entries: Optional[Dict[str, Ipv4AclEntryAttributes]] = {}
+    acl_entries: Optional[Dict[str, Ipv4AclEntryAttributes]] = None
 
 class Ipv6AclAttributes(BaseModel):
     name: AttributeValue[str]
     type: AttributeValue[str] = "ipv6_acl"
-    acl_entries: Optional[Dict[str, Ipv6AclEntryAttributes]] = {}
+    acl_entries: Optional[Dict[str, Ipv6AclEntryAttributes]] = None
     
 class Acl(BaseModel):
-    ipv4_acls: Optional[Dict[str, Ipv4AclAttributes]] = {}
-    ipv6_acls: Optional[Dict[str, Ipv6AclAttributes]] = {}
+    ipv4_acls: Optional[Dict[str, Ipv4AclAttributes]] = None
+    ipv6_acls: Optional[Dict[str, Ipv6AclAttributes]] = None

{acex_devkit-1.1.1 → acex_devkit-1.2.0}/src/acex_devkit/models/composed_configuration.py

@@ -55,10 +55,10 @@ class SystemConfig(BaseModel):
 class LoggingComponents(BaseModel): 
     config: LoggingConfig = LoggingConfig()
     console: Optional[Console] = None
-    remote_servers: Optional[Dict[str, RemoteServer]] = {}
+    remote_servers: Optional[Dict[str, RemoteServer]] = None
     events: Optional[LoggingEvents] = None
-    vty: Optional[Dict[str, VtyLine]] = {}
-    files: Optional[Dict[str, FileLogging]] = {}
+    vty: Optional[Dict[str, VtyLine]] = None
+    files: Optional[Dict[str, FileLogging]] = None
 
 class NtpConfig(BaseModel):
     enabled: AttributeValue[bool] = AttributeValue(value=False)
@@ -73,7 +73,7 @@ class NtpServer(BaseModel):
 
 class Ntp(BaseModel): 
     config: Optional[NtpConfig] = None
-    servers: Optional[Dict[str, NtpServer]] = {}
+    servers: Optional[Dict[str, NtpServer]] = None
 
 class SshServer(BaseModel): 
     enable: Optional[AttributeValue[bool]] = None
@@ -100,7 +100,7 @@ class AuthorizedKey(BaseModel):
 
 class Ssh(BaseModel): 
     config: Optional[SshServer] = None
-    host_keys: Optional[Dict[str, AuthorizedKey]] = {}
+    host_keys: Optional[Dict[str, AuthorizedKey]] = None
 
 class Lldp(BaseModel): ...
 
@@ -164,23 +164,22 @@ class EthernetCsmacdInterface(Interface):
     lacp_interval: Optional[AttributeValue[Literal["fast", "slow"]]] = None
 
     # Spanning-tree relaterade attribut
-    stp_port_priority: Optional[int] = None
-    stp_cost: Optional[int] = None
-    stp_edge_port: Optional[bool] = False # Disabled by default
-    stp_bpdu_filter: Optional[bool] = False # Disabled by default
-    stp_bpdu_guard: Optional[bool] = False # Disabled by default
-    stp_loop_guard: Optional[bool] = False # Disabled by default
-    stp_root_guard: Optional[bool] = False # Disabled by default
-    stp_portfast: Optional[bool] = False # Disabled by default
-    stp_link_type: Optional[Literal["point-to-point", "shared"]] = None  # e.g., "point-to-point", "shared"
+    stp_port_priority: Optional[AttributeValue[int]] = None
+    stp_cost: Optional[AttributeValue[int]] = None
+    stp_edge_port: Optional[AttributeValue[bool]] = None
+    stp_bpdu_filter: Optional[AttributeValue[bool]] = None
+    stp_bpdu_guard: Optional[AttributeValue[bool]] = None
+    stp_loop_guard: Optional[AttributeValue[bool]] = None
+    stp_root_guard: Optional[AttributeValue[bool]] = None
+    stp_portfast: Optional[AttributeValue[bool]] = None
+    stp_link_type: Optional[AttributeValue[Literal["point-to-point", "shared"]]] = None
 
 
 class Ieee8023adLagInterface(Interface):
     "LAG Interface"
     type: Literal["ieee8023adLag"] = "ieee8023adLag"
-    #aggregate_id: AttributeValue[int] = None
-    aggregate_id: int = None
-    members: list[str] = Field(default_factory=list)
+    aggregate_id: Optional[AttributeValue[int]] = None
+    members: Optional[AttributeValue[List[str]]] = None
     max_ports: Optional[AttributeValue[int]] = None
     switchport: Optional[AttributeValue[bool]] = None
     switchport_mode: Optional[AttributeValue[Literal["access", "trunk"]]] = None
@@ -226,15 +225,15 @@ class StaticRouteNextHop(BaseModel):
 class StaticRoute(BaseModel):
     route_name: Optional[AttributeValue[str]] = None
     prefix: AttributeValue[str]
-    next_hops: Optional[Dict[str, StaticRouteNextHop]] = {}
+    next_hops: Optional[Dict[str, StaticRouteNextHop]] = None
     network_instance: Optional[AttributeValue[str]] = None
 
 class Protocols(BaseModel):
-    static_routes: Optional[Dict[str, StaticRoute]] = {}
+    static_routes: Optional[Dict[str, StaticRoute]] = None
     # OSPF, BGP, etc. can be added here as needed
 
 class RouteTarget(BaseModel):
-    value: str # TODO: Add constraints and validators... 
+    value: Optional[AttributeValue[str]] = None
 
 class ImportExportPolicy(BaseModel):
     export_route_target: Optional[List[RouteTarget]] = None
@@ -246,9 +245,9 @@ class InterInstancePolicy(BaseModel):
 class NetworkInstance(BaseModel): 
     name: AttributeValue[str]
     description: Optional[AttributeValue[str]] = None
-    vlans: Optional[Dict[str, Vlan]] = {}
+    vlans: Optional[Dict[str, Vlan]] = None
     interfaces: Optional[Dict[str, Reference]] = {}
-    inter_instance_policies: Optional[Dict[str, InterInstancePolicy]] = {}
+    inter_instance_policies: Optional[Dict[str, InterInstancePolicy]] = None
     protocols: Optional[Protocols] = Protocols()
 
 class LacpConfig(BaseModel):
@@ -258,7 +257,7 @@ class LacpConfig(BaseModel):
 
 class Lacp(BaseModel):
     config: Optional[LacpConfig] = LacpConfig()
-    interfaces: Optional[Dict[str, Interface]] = {}
+    interfaces: Optional[Dict[str, Interface]] = None
 
 # SNMP
 class SnmpAccess(str, Enum):
@@ -323,7 +322,7 @@ class SnmpView(BaseModel):
 
 
 class SnmpServer(BaseModel):
-    name: str
+    name: Optional[AttributeValue[str]] = None
     address: AttributeValue[str]
     port: Optional[AttributeValue[int]] = AttributeValue(value=162)
     enabled: Optional[AttributeValue[bool]] = AttributeValue(value=True)
@@ -450,41 +449,41 @@ class TrapEventOptions(str, Enum):
 	BULKSTAT_TRANSFER = "bulkstat_transfer"
 
 class TrapEvent(BaseModel):
-    name: str
-    event_name: TrapEventOptions
+    name: Optional[AttributeValue[str]] = None
+    event_name: Optional[AttributeValue[TrapEventOptions]] = None
 
 #class SnmpTrap(BaseModel): ...
 
 class Snmp(BaseModel):
-    config: Optional[Dict[str, SnmpConfig]] = {}
-    communities: Optional[Dict[str, SnmpCommunity]] = {}
-    users: Optional[Dict[str, SnmpUser]] = {}
-    trap_servers: Optional[Dict[str, SnmpServer]] = {}
-    trap_events: Optional[Dict[str, TrapEvent]] = {}
-    views: Optional[Dict[str, SnmpView]] = {}
+    config: Optional[Dict[str, SnmpConfig]] = None
+    communities: Optional[Dict[str, SnmpCommunity]] = None
+    users: Optional[Dict[str, SnmpUser]] = None
+    trap_servers: Optional[Dict[str, SnmpServer]] = None
+    trap_events: Optional[Dict[str, TrapEvent]] = None
+    views: Optional[Dict[str, SnmpView]] = None
 
 # AAA
 class aaaBaseClass(BaseModel):
-    name: str = None
+    name: Optional[AttributeValue[str]] = None
 
 class aaaTacacsAttributes(BaseModel):
-    port: Optional[int] = 49
-    secret_key: Optional[str] = None
-    secret_key_hashed: Optional[str] = None
-    address: Optional[str] = None
-    timeout: Optional[int] = 30
-    source_interface: Optional[Reference] = None #Optional[Reference] = None # should be reference
+    port: Optional[AttributeValue[int]] = None
+    secret_key: Optional[AttributeValue[str]] = None
+    secret_key_hashed: Optional[AttributeValue[str]] = None
+    address: Optional[AttributeValue[str]] = None
+    timeout: Optional[AttributeValue[int]] = None
+    source_interface: Optional[Reference] = None
     server_group: Optional[AttributeValue[str]] = None
 
 class aaaRadiusAttributes(BaseModel):
-    auth_port: Optional[int] = 1812
-    acct_port: Optional[int] = 1813
-    secret_key: Optional[str] = None
-    secret_key_hashed: Optional[str] = None
-    address: Optional[str] = None
-    timeout: Optional[int] = 30
-    source_interface: Optional[Reference] = None #Optional[Reference] = None # should be reference
-    retransmit_attempts: Optional[int] = 3
+    auth_port: Optional[AttributeValue[int]] = None
+    acct_port: Optional[AttributeValue[int]] = None
+    secret_key: Optional[AttributeValue[str]] = None
+    secret_key_hashed: Optional[AttributeValue[str]] = None
+    address: Optional[AttributeValue[str]] = None
+    timeout: Optional[AttributeValue[int]] = None
+    source_interface: Optional[Reference] = None
+    retransmit_attempts: Optional[AttributeValue[int]] = None
     server_group: Optional[AttributeValue[str]] = None
 
 class aaaServerGroupAttributes(BaseModel):
@@ -494,13 +493,13 @@ class aaaServerGroupAttributes(BaseModel):
     Type is used to tell future renderers what kind of server group this is.
     Example:
     type = 'tacacs' or type = 'radius'
-    
+
     The tacacs and radius attributes expect a reference to the aaaTacacs and aaaRadius models respectively.
 
     Example in config map:
     enable = True
     type = 'tacacs'
-    tacacs = [tacacs_server1, tacacs_server2] 
+    tacacs = [tacacs_server1, tacacs_server2]
     radius = radius_server1
 
     Cisco example:
@@ -508,10 +507,10 @@ class aaaServerGroupAttributes(BaseModel):
      server name tacacs_server1
      server name tacacs_server2
     """
-    enable: Optional[bool] = False
-    type: Optional[Literal['tacacs','radius']] = None
-    tacacs: Optional[Dict[str, aaaTacacsAttributes]] = {} #Optional[Dict[str, Reference]] = None
-    radius: Optional[Dict[str, aaaRadiusAttributes]] = {} #Optional[Dict[str, Reference]] = None
+    enable: Optional[AttributeValue[bool]] = None
+    type: Optional[AttributeValue[Literal['tacacs','radius']]] = None
+    tacacs: Optional[Dict[str, aaaTacacsAttributes]] = None
+    radius: Optional[Dict[str, aaaRadiusAttributes]] = None
 
 # Authentication Models
 class aaaAuthenticationMethods(aaaBaseClass):
@@ -534,26 +533,26 @@ class aaaAuthenticationMethods(aaaBaseClass):
     # aaa authentication enable default group TACACS-GROUP-NEW enable
 
 class authenticationUser(aaaBaseClass):
-    username: Optional[str] = None
-    password: Optional[str] = None
-    password_hahsed: Optional[str] = None
-    ssh_key: Optional[str] = None
-    role: Optional[str] = None
+    username: Optional[AttributeValue[str]] = None
+    password: Optional[AttributeValue[str]] = None
+    password_hahsed: Optional[AttributeValue[str]] = None
+    ssh_key: Optional[AttributeValue[str]] = None
+    role: Optional[AttributeValue[str]] = None
 
 class aaaAuthenticationUsers(aaaBaseClass):
-    username: Optional[Dict[str, authenticationUser]] = {}
+    username: Optional[Dict[str, authenticationUser]] = None
 
-class adminUser(aaaBaseClass): # when to use this?
-    admin_password: Optional[str] = None
-    admin_password_hashed: Optional[str] = None
+class adminUser(aaaBaseClass):
+    admin_password: Optional[AttributeValue[str]] = None
+    admin_password_hashed: Optional[AttributeValue[str]] = None
 
 class aaaAuthenticationAdminUsers(BaseModel):
-    config: Optional[Dict[str, adminUser]] = {}
+    config: Optional[Dict[str, adminUser]] = None
 
 class aaaAuthentication(BaseModel):
-    config: Optional[Dict[str, aaaAuthenticationMethods]] = {}
-    admin_user: Optional[Dict[str, aaaAuthenticationAdminUsers]] = {}
-    users: Optional[Dict[str, aaaAuthenticationUsers]] = {}
+    config: Optional[Dict[str, aaaAuthenticationMethods]] = None
+    admin_user: Optional[Dict[str, aaaAuthenticationAdminUsers]] = None
+    users: Optional[Dict[str, aaaAuthenticationUsers]] = None
 
 # Authorization Models
 class aaaAuthorizationMethods(aaaBaseClass):
@@ -583,10 +582,8 @@ class aaaAuthorizationEvents(aaaBaseClass):
     event: Optional[AttributeValue[str]] = None
 
 class aaaAuthorization(BaseModel):
-    #config: Optional[Dict[str, aaaAuthorizationMethods]] = {}
-    config: Optional[Dict[str, aaaAuthorizationMethods]] = {}
-    #events: Optional[Dict[str, aaaAuthorizationEvents]] = {}
-    events: Optional[Dict[str, aaaAuthorizationEvents]] = {}
+    config: Optional[Dict[str, aaaAuthorizationMethods]] = None
+    events: Optional[Dict[str, aaaAuthorizationEvents]] = None
 
 # Accounting Models
 class aaaAccountingMethods(BaseModel):
@@ -614,17 +611,15 @@ class aaaAccountingEvents(BaseModel):
     event: Optional[AttributeValue[str]] = None
 
 class aaaAccounting(BaseModel):
-    #config: aaaAccountingMethods = aaaAccountingMethods()
-    config: Optional[Dict[str, aaaAccountingMethods]] = {}
-    #events: aaaAccountingEvents = aaaAccountingEvents()
-    events: Optional[Dict[str, aaaAccountingEvents]] = {}
+    config: Optional[Dict[str, aaaAccountingMethods]] = None
+    events: Optional[Dict[str, aaaAccountingEvents]] = None
 
 class aaaGlobalAttributes(BaseModel):
     enabled: Optional[AttributeValue[bool]] = False # default False
 
 class TripleA(BaseModel):
     config: aaaGlobalAttributes = aaaGlobalAttributes()
-    server_groups: Optional[Dict[str, aaaServerGroupAttributes]] = {}
+    server_groups: Optional[Dict[str, aaaServerGroupAttributes]] = None
     authentication: aaaAuthentication = aaaAuthentication()
     authorization: aaaAuthorization = aaaAuthorization()
     accounting: aaaAccounting = aaaAccounting()
@@ -654,4 +649,14 @@ class ComposedConfiguration(BaseModel):
     lacp: Optional[Lacp] = Lacp()
     interfaces: Dict[str, InterfaceType] = {}
     network_instances: Dict[str, NetworkInstance] = {"global": NetworkInstance(name="global")}
-    stp: Optional[SpanningTree] = SpanningTree()
+    stp: Optional[SpanningTree] = SpanningTree()
+
+
+""" 
+GUIDELINES FOR COMPOSED CONFIGURATION:
+
+1. All values must always be typed as AttributeValue.
+2. Containers must always be defined as hierarchical pydantic types, no dicts as placeholders.
+3. Component collections are always Dict[str, BaseModel] — the key identifies the component
+4. Default values for Optional is always None.
+"""

{acex_devkit-1.1.1 → acex_devkit-1.2.0}/src/acex_devkit/models/logging.py

@@ -42,36 +42,36 @@ class LoggingConfig(BaseModel):
     buffer_size: Optional[AttributeValue[int]] = None
 
 class Console(BaseModel):
-    name: str = None
-    line_number: int = None
-    logging_synchronous: bool = True
+    name: Optional[AttributeValue[str]] = None
+    line_number: Optional[AttributeValue[int]] = None
+    logging_synchronous: Optional[AttributeValue[bool]] = None
 
 class RemoteServer(BaseModel):
-    name: str = None
-    host: str = None
-    port: Optional[int] = 514
-    transfer: Optional[str] = 'udp'
+    name: Optional[AttributeValue[str]] = None
+    host: Optional[AttributeValue[str]] = None
+    port: Optional[AttributeValue[int]] = None
+    transfer: Optional[AttributeValue[str]] = None
     source_address: Optional[AttributeValue[str]] = None # Can be an IP address or an interface reference
 
 class VtyLine(BaseModel):
-    name: str = None
-    line_number: int = None
-    logging_synchronous: bool = True
-    transport_input: Optional[str] = 'ssh' # default is SSH. Mostly used by Cisco.
+    name: Optional[AttributeValue[str]] = None
+    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.
 
 class FileLogging(BaseModel):
-    name: str = None # object name
-    filename: str = None # name of the file
-    rotate: Optional[int] = None # How many versions to keep. Juniper specific. 
-    max_size: Optional[int] = None # Max size in bytes. Used both for Cisco and Juniper. 
-    min_size: Optional[int] = None # Min size in bytes. Only used for Cisco.
-    facility: LoggingFacility # Type of log
-    severity: LoggingSeverity # Severity level
+    name: Optional[AttributeValue[str]] = None # object name
+    filename: Optional[AttributeValue[str]] = None # name of the file
+    rotate: Optional[AttributeValue[int]] = None # How many versions to keep. Juniper specific.
+    max_size: Optional[AttributeValue[int]] = None # Max size in bytes. Used both for Cisco and Juniper.
+    min_size: Optional[AttributeValue[int]] = None # Min size in bytes. Only used for Cisco.
+    facility: Optional[AttributeValue[LoggingFacility]] = None # Type of log
+    severity: Optional[AttributeValue[LoggingSeverity]] = None # Severity level
 
 class LoggingEvent(BaseModel):
-    enabled: bool
-    severity: LoggingSeverity
+    enabled: Optional[AttributeValue[bool]] = None
+    severity: Optional[AttributeValue[LoggingSeverity]] = None
 
 
 class LoggingEvents(BaseModel):
-    events: Optional[Dict[str, LoggingEvent]] = {}
+    events: Optional[Dict[str, LoggingEvent]] = None

{acex_devkit-1.1.1 → acex_devkit-1.2.0}/src/acex_devkit/models/spanning_tree.py

@@ -4,27 +4,27 @@ from enum import Enum
 from typing import Optional, Dict
 
 class SpanningTreeGlobalAttributes(BaseModel):
-    mode: Optional[str] = None # Needs to be defined by user. Default for Cisco is RAPID-PVST and for Juniper it's just RSTP
-    bpdu_filter: Optional[bool] = False # Disabled by default
-    bpdu_guard: Optional[bool] = False # Disabled by default
-    loop_guard: Optional[bool] = False # Disabled by default
-    portfast: Optional[bool] = False # Disabled by default. Global setting for access ports.
-    bridge_assurance: Optional[bool] = False # Disabled by default. Only supported by MST and PVRST+
-    #interfaces: Optional[Dict[str, Reference]] = {}
+    mode: Optional[AttributeValue[str]] = None # Needs to be defined by user. Default for Cisco is RAPID-PVST and for Juniper it's just RSTP
+    bpdu_filter: Optional[AttributeValue[bool]] = None # Disabled by default
+    bpdu_guard: Optional[AttributeValue[bool]] = None # Disabled by default
+    loop_guard: Optional[AttributeValue[bool]] = None # Disabled by default
+    portfast: Optional[AttributeValue[bool]] = None # Disabled by default. Global setting for access ports.
+    bridge_assurance: Optional[AttributeValue[bool]] = None # Disabled by default. Only supported by MST and PVRST+
+    #interfaces: Optional[Dict[str, Reference]] = None
 
 class SpanningTreeModeConfig(BaseModel):
-    hello_time: Optional[int] = None
-    max_age: Optional[int] = None
-    forward_delay: Optional[int] = None
-    bridge_priority: Optional[int] = None
-    hold_count: Optional[int] = None # Range 1..10
+    hello_time: Optional[AttributeValue[int]] = None
+    max_age: Optional[AttributeValue[int]] = None
+    forward_delay: Optional[AttributeValue[int]] = None
+    bridge_priority: Optional[AttributeValue[int]] = None
+    hold_count: Optional[AttributeValue[int]] = None # Range 1..10
 
 ## RSTP
 class RstpAttributes(SpanningTreeModeConfig): ...
 
 class RSTPConfig(BaseModel):
     #config: RstpAttributes = RstpAttributes()
-    config: Optional[Dict[str, RstpAttributes]] = {}
+    config: Optional[Dict[str, RstpAttributes]] = None
 
 ### MSTP
 class MstpInstanceAttributes(SpanningTreeModeConfig):
@@ -38,8 +38,8 @@ class MstpAttributes(SpanningTreeModeConfig):
 
 class MSTPConfig(BaseModel):
     #config: MstpAttributes = MstpAttributes()
-    config: Optional[Dict[str, MstpAttributes]] = {}
-    mst_instances: Optional[Dict[str, MstpInstanceAttributes]] = {}
+    config: Optional[Dict[str, MstpAttributes]] = None
+    mst_instances: Optional[Dict[str, MstpInstanceAttributes]] = None
 
 ### Rapid PVST
 class RapidPVSTAttributes(SpanningTreeModeConfig):
@@ -57,10 +57,10 @@ class RapidPVSTAttributes(SpanningTreeModeConfig):
     vlan: Optional[AttributeValue[int | list[int]]] = None  # Single VLAN ID or list of VLANs using Rapid PVST+
 
 class RapidPVSTConfig(BaseModel):
-    vlan: Optional[Dict[str, RapidPVSTAttributes]] = {}
+    vlan: Optional[Dict[str, RapidPVSTAttributes]] = None
 
 class SpanningTree(BaseModel):
-    config: Optional[Dict[str, SpanningTreeGlobalAttributes]] = {}#SpanningTreeGlobalAttributes()
+    config: Optional[Dict[str, SpanningTreeGlobalAttributes]] = None#SpanningTreeGlobalAttributes()
     rstp: Optional[RSTPConfig] = RSTPConfig()
     mstp: Optional[MSTPConfig] = MSTPConfig()
     rapidpvst: Optional[RapidPVSTConfig] = RapidPVSTConfig()