acex-devkit 2.0.0__tar.gz → 2.1.0__tar.gz

{acex_devkit-2.0.0 → acex_devkit-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acex-devkit
-Version: 2.0.0
+Version: 2.1.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-2.0.0 → acex_devkit-2.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "acex-devkit"
-version = "2.0.0"
+version = "2.1.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-2.0.0 → acex_devkit-2.1.0}/src/acex_devkit/models/composed_configuration.py

@@ -706,8 +706,14 @@ class aaaAuthenticationAdminUsers(ContainerEntry, BaseModel):
     identity_fields: ClassVar[tuple[str, ...]] = ()
     config: Optional[Dict[str, adminUser]] = {}
 
+class aaaAuthenticationConfig(ContainerEntry, Augmentable):
+    identity_fields: ClassVar[tuple[str, ...]] = ("name",) 
+    name: Optional[AttributeValue[str]] = None # ex. default, CONSOLE, etc.
+    methods: Optional[Dict[str, aaaAuthenticationMethods]] = {}
+
 class aaaAuthentication(BaseModel):
-    config: Optional[Dict[str, aaaAuthenticationMethods]] = {}
+    #config: Optional[Dict[str, aaaAuthenticationMethods]] = {}
+    config: aaaAuthenticationConfig = aaaAuthenticationConfig()
     admin_user: Optional[Dict[str, aaaAuthenticationAdminUsers]] = {}
     users: Optional[Dict[str, aaaAuthenticationUsers]] = {}
 
@@ -738,10 +744,18 @@ class aaaAuthorizationEvents(aaaBaseClass):
     #event: Optional[AttributeValue[List[str]]] = None
     event: Optional[AttributeValue[str]] = None
 
-class aaaAuthorization(BaseModel):
-    config: Optional[Dict[str, aaaAuthorizationMethods]] = {}
+class aaaAuthorizationConfig(ContainerEntry, Augmentable):
+    identity_fields: ClassVar[tuple[str, ...]] = ("name",) 
+    name: Optional[AttributeValue[str]] = None # ex. default, CONSOLE, etc.
+    methods: Optional[Dict[str, aaaAuthorizationMethods]] = {}
     events: Optional[Dict[str, aaaAuthorizationEvents]] = {}
 
+class aaaAuthorization(BaseModel):
+    #config: Optional[Dict[str, aaaAuthorizationMethods]] = {}
+    config: aaaAuthorizationConfig = aaaAuthorizationConfig()
+    #methods: Optional[Dict[str, aaaAuthorizationMethods]] = {}
+    #events: Optional[Dict[str, aaaAuthorizationEvents]] = {}
+
 # Accounting Models
 class aaaAccountingMethods(ContainerEntry, BaseModel):
     identity_fields: ClassVar[tuple[str, ...]] = ()
@@ -769,11 +783,21 @@ class aaaAccountingEvents(ContainerEntry, BaseModel):
     #events: Optional[List[str]] = Field(default_factory=list) # Ex. ['send','stop-record','authentication', 'failure']
     event: Optional[AttributeValue[str]] = None
 
-class aaaAccounting(BaseModel):
-    config: Optional[Dict[str, aaaAccountingMethods]] = {}
+class aaaAccountingConfig(ContainerEntry, Augmentable):
+    identity_fields: ClassVar[tuple[str, ...]] = ("name",) 
+    name: Optional[AttributeValue[str]] = None # ex. default, CONSOLE, etc.
+    methods: Optional[Dict[str, aaaAccountingMethods]] = {}
     events: Optional[Dict[str, aaaAccountingEvents]] = {}
 
-class aaaGlobalAttributes(BaseModel):
+class aaaAccounting(BaseModel):
+    #config: Optional[Dict[str, aaaAccountingMethods]] = {}
+    config: aaaAccountingConfig = aaaAccountingConfig()
+    #methods: Optional[Dict[str, aaaAccountingMethods]] = {}
+    #events: Optional[Dict[str, aaaAccountingEvents]] = {}
+
+class aaaGlobalAttributes(ContainerEntry, BaseModel):
+    identity_fields: ClassVar[tuple[str, ...]] = ("name",) 
+    name: Optional[AttributeValue[str]] = None # ex. default, CONSOLE, etc.
     enabled: Optional[AttributeValue[bool]] = False # default False
 
 class TripleA(BaseModel):

{acex_devkit-2.0.0 → acex_devkit-2.1.0}/src/acex_devkit/models/logging.py

@@ -42,7 +42,8 @@ class LoggingConfig(Augmentable):
     severity: Optional[AttributeValue[LoggingSeverity]] = None
     buffer_size: Optional[AttributeValue[int]] = None
 
-class Console(Augmentable):
+class Console(ContainerEntry, Augmentable):
+    identity_fields: ClassVar[tuple[str, ...]] = ("name",)
     name: Optional[AttributeValue[str]] = None
     line_number: Optional[AttributeValue[int]] = None
     logging_synchronous: Optional[AttributeValue[bool]] = None
@@ -58,7 +59,7 @@ class RemoteServer(ContainerEntry, BaseModel):
 class RemoteServers(BaseModel):
     servers: Dict[str, RemoteServer] = {}
 
-class VtyLine(ContainerEntry, BaseModel):
+class VtyLine(ContainerEntry, Augmentable):
     identity_fields: ClassVar[tuple[str, ...]] = ("line_number",)
     name: Optional[AttributeValue[str]] = None
     line_number: Optional[AttributeValue[int]] = None