tdl-xoa-driver 1.2.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

xoa_driver/internals/core/transporter/_request_id_counter.py

@@ -12,7 +12,7 @@ class ReservedRequestID(IntEnum):
 
 
 class RequestIdCounter:
-    """Aggrigator of request ID."""
+    """Aggregator of request ID."""
     __slots__ = ("__req_id", "__lock",)
 
     def __init__(self) -> None:

xoa_driver/internals/core/transporter/protocol/payload/__init__.py

@@ -14,7 +14,8 @@ from .types import (
     XmpSequence,
     XmpShort,
     XmpStr,
-    Hex
+    Hex,
+    XmpJson,
 )
 
 __all__ = (
@@ -32,6 +33,7 @@ __all__ = (
     "XmpShort",
     "XmpStr",
     "Hex",
+    "XmpJson"
 )
 
 

xoa_driver/internals/core/transporter/protocol/payload/field.py

@@ -38,6 +38,7 @@ from .types import (
     # Preconverted Dynamic
     XmpStr,
     XmpSequence,
+    XmpJson,
 )
 
 
@@ -53,6 +54,7 @@ TYPES_FIXED = (
 TYPES_COMBI = (XmpHex,)
 TYPES_DYNAMIC = (XmpStr,)
 TYPES_COMPOSED = (XmpSequence,)
+TYPES_JSON = (XmpJson,)
 
 # Important: The instances of the FieldSpecs will live as a class variables
 # which mean wea are not able to update its attributes during runtime.
@@ -194,6 +196,43 @@ class HexSpec(FieldSpecs):
         return next(iter(struct.unpack_from(format, buffer, offset)), b"")
 
 
+class JsonSpec(FieldSpecs):
+    xmp_type: XmpJson
+
+    def __init__(
+        self,
+        xmp_type: XmpJson,
+        min_version: int | None = None,
+        max_version: int | None = None,
+        deprecated: bool = False,
+        deprecation_reason: str | None = None,
+    ) -> None:
+        super().__init__(xmp_type, min_version, max_version, deprecated, deprecation_reason)
+
+    @property
+    def is_dynamic(self) -> bool:
+        return True
+
+    def format(self, bsize: int | None = None) -> str:
+        return _build_format(self.xmp_type.data_format, bsize)
+
+    def calc_bsize(self, buff: memoryview | None = None, left_offset: int = 0) -> int | None:
+        if buff is None:
+            return None
+        return len(buff[left_offset:])
+
+    def get_context_formatter(self, client_type: Type[Any], is_response: bool) -> Callable[[Any], Any]:
+        if is_response:
+            return self.xmp_type.client_format
+        return self.xmp_type.server_format
+
+    def pack(self, format: str, val: bytes) -> bytes:
+        return val
+    
+    def unpack(self, format: str, buffer: memoryview, offset: int) -> Any:
+        return next(iter(struct.unpack_from(format, buffer, offset)), b"")
+    
+
 def _prepare_client_chunks(client_type: Type[Any], xmp_types_chunks: tuple) -> Callable[[Any], List[Tuple[Any, ...]]]:
     """Selecting the function for parsing data chunks from XMP types to Python types"""
     def converted_dcls(val_):
@@ -284,6 +323,8 @@ def field(
         specs_type = FieldSpecs
     elif isinstance(xmp_type, TYPES_COMBI):
         specs_type = HexSpec
+    elif isinstance(xmp_type, TYPES_JSON):
+        specs_type = JsonSpec
     else:
         return None
 

xoa_driver/internals/core/transporter/protocol/payload/types.py

@@ -10,6 +10,7 @@ from typing import (
     TypeVar,
     cast,
 )
+import json
 
 FMT_ORDER_NETWORK = '!'
 FMT_BYTES_STRING = 's'
@@ -21,6 +22,7 @@ FMT_INT = 'i'
 FMT_U_INT = 'I'
 FMT_SHORT = 'h'
 FMT_U_SHORT = 'H'
+FMT_BYTES_JSON = 's'
 
 # region Base Type
 
@@ -170,4 +172,21 @@ class XmpSequence(XmpType[tuple]):
         self.repetitions = None
         self.data_format = "".join(f"{t.repetitions or ''}{t.data_format}" for t in self.types_chunk)
 
+
+class XmpJson(XmpType[bytes]):
+    """Description class of XMP JSON type representation"""
+
+    __slots__ = ("min_len",)
+
+    def __init__(self, min_len: int | None = None) -> None:
+        self.data_format = FMT_BYTES_JSON
+        self.repetitions = None
+        self.min_len = min_len
+
+    def client_format(self, val: bytes) -> dict[str, Any]:
+        return json.loads(val.decode())
+
+    def server_format(self, val: dict) -> bytes:
+        return json.dumps(val).encode()
+
 # endregion

xoa_driver/internals/{hli_v1 → hli}/indices/filter/base_filter.py

@@ -62,4 +62,4 @@ class BaseFilterIdx(BaseIndex):
     @classmethod
     async def _new(cls: Type[FT], conn: "itf.IConnection", kind: "kind.IndicesKind", observer: "idx_obs.IndicesObserver") -> FT:
         await PF_CREATE(conn, *kind).set()
-        return cls(conn, kind, observer)
+        return cls(conn, kind, observer) # type: ignore

xoa_driver/internals/{hli_v1 → hli}/indices/length_term.py

@@ -46,4 +46,4 @@ class LengthTermIdx(BaseIndex):
     @classmethod
     async def _new(cls: Type[LT], conn: "itf.IConnection", kind: "kind.IndicesKind", observer: "idx_obs.IndicesObserver") -> LT:
         await PL_CREATE(conn, *kind).set()
-        return cls(conn, kind, observer)
+        return cls(conn, kind, observer) # type: ignore

xoa_driver/internals/{hli_v1 → hli}/indices/macsecscs/base_macsecsc.py

@@ -190,7 +190,7 @@ class BaseMacSecTxScIdx(BaseIndex):
     @classmethod
     async def _new(cls: Type[BS], conn: "itf.IConnection", kind: "kind.IndicesKind", observer: "idx_obs.IndicesObserver") -> BS:
         await P_MACSEC_TXSC_CREATE(conn, *kind).set()
-        return cls(conn, kind, observer)
+        return cls(conn, kind, observer) # type: ignore
 
 
 class BaseMacSecRxScIdx(BaseIndex):
@@ -221,4 +221,4 @@ class BaseMacSecRxScIdx(BaseIndex):
     @classmethod
     async def _new(cls: Type[BS], conn: "itf.IConnection", kind: "kind.IndicesKind", observer: "idx_obs.IndicesObserver") -> BS:
         await P_MACSEC_RXSC_CREATE(conn, *kind).set()
-        return cls(conn, kind, observer)
+        return cls(conn, kind, observer) # type: ignore

xoa_driver/internals/{hli_v1 → hli}/indices/match_term.py

@@ -61,4 +61,4 @@ class MatchTermIdx(BaseIndex):
     @classmethod
     async def _new(cls: Type[MT], conn: "itf.IConnection", kind: "kind.IndicesKind", observer: "idx_obs.IndicesObserver") -> MT:
         await PM_CREATE(conn, *kind).set()
-        return cls(conn, kind, observer)
+        return cls(conn, kind, observer) # type: ignore

xoa_driver/internals/{hli_v1 → hli}/indices/port_dataset.py

@@ -69,4 +69,4 @@ class PortDatasetIdx(BaseIndex):
     @classmethod
     async def _new(cls: Type[PD], conn: "itf.IConnection", kind: "kind.IndicesKind", observer: "idx_obs.IndicesObserver") -> PD:
         await PD_CREATE(conn, *kind).set()
-        return cls(conn, kind, observer)
+        return cls(conn, kind, observer) # type: ignore

xoa_driver/internals/{hli_v1 → hli}/indices/streams/base_stream.py

@@ -401,5 +401,5 @@ class BaseStreamIdx(BaseIndex):
     @classmethod
     async def _new(cls: Type[BS], conn: "itf.IConnection", kind: "kind.IndicesKind", observer: "idx_obs.IndicesObserver") -> BS:
         await PS_CREATE(conn, *kind).set()
-        return cls(conn, kind, observer)
+        return cls(conn, kind, observer) # type: ignore
 

xoa_driver/internals/{hli_v1 → hli}/modules/module_chimera.py

@@ -23,19 +23,20 @@ from xoa_driver.internals.commands import (
     M_CFPCONFIGEXT,
     M_UPGRADEPAR,
     M_VERSIONSTR,
+    M_RECONFIG_STATUS,
 )
 
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 from xoa_driver.internals.utils import attributes as utils
 from xoa_driver.internals.state_storage import modules_state
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1.modules.modules_l23.module_l23_base import MediaModule, CfpModule
+from xoa_driver.internals.hli.modules.modules_l23.module_l23_base import MediaModule, CfpModule
 from . import base_module as bm
 
 if typing.TYPE_CHECKING:
     from xoa_driver.internals.core import interfaces as itf
-    from xoa_driver.internals.hli_v1.modules.modules_l23.module_l23_base import ModuleL23
+    from xoa_driver.internals.hli.modules.modules_l23.module_l23_base import ModuleL23
     from . import __interfaces as m_itf
 
 
@@ -71,13 +72,20 @@ class ChCFP:
 
         :type: M_CFPTYPE
         """
-        self.config = CfpModule(conn, module)
-        """
-        The CFP configuration of the test module.
 
-        :type: CfpModule
-        """
 
+class ChConfig:
+    """Configuration test module (Chimera)."""
+
+    def __init__(self, conn: "itf.IConnection", module: typing.Union["ModuleL23", "ModuleChimera"]) -> None:
+        self.media = MediaModule(conn, module)
+        """Test module's media type configuration."""
+
+        self.port_speed = CfpModule(conn, module)
+        """Test module's port speed configuration."""
+
+        self.status = M_RECONFIG_STATUS(conn, module.module_id)
+        """Test module's configuration status."""
 
 class ChUpgrade:
     """
@@ -220,13 +228,7 @@ class ModuleChimera(bm.BaseModule["modules_state.ModuleLocalState"]):
         :type: M_VERSIONSTR
         """
 
-        self.media = MediaModule(conn, self)
-        """Test module's media type.
-
-        :type: MediaModule
-        """
-
-        self.available_speeds = M_MEDIASUPPORT(conn, self.module_id)
+        self.supported_configs = M_MEDIASUPPORT(conn, self.module_id)
         """Test module's available speeds.
 
         :type: M_MEDIASUPPORT
@@ -238,6 +240,9 @@ class ModuleChimera(bm.BaseModule["modules_state.ModuleLocalState"]):
         :type: M_NAME
         """
 
+        self.config = ChConfig(conn, self)
+        """Test module's configuration."""
+
         self.ports: pm.PortsManager["ports.PortChimera"] = pm.PortsManager(
             conn=conn,
             ports_type=ports.PortChimera,

xoa_driver/internals/{hli_v1 → hli}/modules/module_l47.py

@@ -37,7 +37,7 @@ from xoa_driver.internals.commands import (
     M4E_RESERVE,
     M4_TLS_CIPHER_SUITES,
 )
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils import attributes as utils
 from xoa_driver.internals.utils.managers import ports_manager as pm
 from xoa_driver.internals.state_storage import modules_state

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_combi.py

@@ -1,7 +1,7 @@
 import typing
 import functools
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.commands import P_CAPABILITIES
 from xoa_driver.internals.utils.managers import ports_manager as pm
 from xoa_driver.internals.utils.cap_id import CapID

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_d.py

@@ -1,6 +1,6 @@
 import typing
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 
 

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_e.py

@@ -1,6 +1,6 @@
 import typing
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 
 if typing.TYPE_CHECKING:

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_f.py

@@ -1,6 +1,6 @@
 import typing
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 
 if typing.TYPE_CHECKING:

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_g.py

@@ -1,6 +1,6 @@
 import typing
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 
 if typing.TYPE_CHECKING:
@@ -81,4 +81,19 @@ class MLoki100G3S1PB_b(ModuleL23):
             module_id=self.module_id,
             ports_count=self.ports_count
         )
-        """Port index manager of Loki-100G-3S-1P-B[b]"""
+        """Port index manager of Loki-100G-3S-1P-B[b]"""
+
+
+@typing.final
+@revisions.register_valkyrie_module(rev="Loki-100G-5S-4P[a]")
+class MLoki100G35S4P_a(ModuleL23):
+    """Test module Loki-100G-5S-4P[a]"""
+    def __init__(self, conn: "itf.IConnection", init_data: "m_itf.ModuleInitData") -> None:
+        super().__init__(conn, init_data)
+        self.ports: pm.PortsManager[ports.PLoki100G5S4P_a] = pm.PortsManager(
+            conn=conn,
+            ports_type=ports.PLoki100G5S4P_a,
+            module_id=self.module_id,
+            ports_count=self.ports_count
+        )
+        """Port index manager of Loki-100G-5S-4P[a]"""

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_h.py

@@ -1,6 +1,6 @@
 import typing
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 
 if typing.TYPE_CHECKING:

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_i.py

@@ -1,6 +1,6 @@
 import typing
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 
 if typing.TYPE_CHECKING:

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_j.py

@@ -1,6 +1,6 @@
 import typing
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 
 if typing.TYPE_CHECKING:

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_k.py

@@ -1,6 +1,6 @@
 import typing
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 
 if typing.TYPE_CHECKING:

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_l.py

@@ -1,6 +1,6 @@
 import typing
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 
 if typing.TYPE_CHECKING:

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_l1.py

@@ -1,6 +1,6 @@
 import typing
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 
 if typing.TYPE_CHECKING:

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_m.py

@@ -1,6 +1,6 @@
 import typing
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 
 if typing.TYPE_CHECKING:

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/family_n.py

@@ -1,6 +1,6 @@
 import typing
 from xoa_driver import ports
-from xoa_driver.internals.hli_v1 import revisions
+from xoa_driver.internals.hli import revisions
 from xoa_driver.internals.utils.managers import ports_manager as pm
 
 if typing.TYPE_CHECKING:

xoa_driver/internals/{hli_v1 → hli}/modules/modules_l23/module_l23_base.py

@@ -29,6 +29,7 @@ from xoa_driver.internals.commands import (
     M_TXCLOCKFILTER_NEW,
     M_UPGRADEPAR,
     M_VERSIONSTR,
+    M_RECONFIG_STATUS,
 )
 
 from xoa_driver.internals.utils import attributes as utils
@@ -41,7 +42,7 @@ from .. import __interfaces as m_itf
 
 if typing.TYPE_CHECKING:
     from xoa_driver.internals.core import interfaces as itf
-    from xoa_driver.internals.hli_v1.modules.module_chimera import ModuleChimera
+    from xoa_driver.internals.hli.modules.module_chimera import ModuleChimera
 
 
 class TXClock:
@@ -161,12 +162,20 @@ class CFP:
         :type: M_CFPTYPE
         """
 
-        self.config = CfpModule(conn, module)
-        """The CFP configuration of the test module.
 
-        :type: CfpModule
-        """
 
+class ModuleConfig:
+    """Test module CFP"""
+
+    def __init__(self, conn: "itf.IConnection", module: typing.Union["ModuleL23", "ModuleChimera"]) -> None:
+        self.media = MediaModule(conn, module)
+        """Test module's media type configuration."""
+
+        self.port_speed = CfpModule(conn, module)
+        """Test module's port speed configuration."""
+
+        self.status = M_RECONFIG_STATUS(conn, module.module_id)
+        """Test module's configuration status."""
 
 class MTiming:
     """Test module timing and clock configuration"""
@@ -249,13 +258,7 @@ class ModuleL23(bm.BaseModule["modules_state.ModuleL23LocalState"]):
         :type: M_STATUS
         """
 
-        self.media = MediaModule(conn, self)
-        """Test module's media type.
-
-        :type: ModuleMedia
-        """
-
-        self.available_speeds = M_MEDIASUPPORT(conn, self.module_id)
+        self.supported_configs = M_MEDIASUPPORT(conn, self.module_id)
         """Test module's available speeds.
 
         :type: M_MEDIASUPPORT
@@ -303,6 +306,9 @@ class ModuleL23(bm.BaseModule["modules_state.ModuleL23LocalState"]):
         :type: CFP
         """
 
+        self.config = ModuleConfig(conn, self)
+        """Test module's configuration."""
+
         self.upgrade = MUpgrade(conn, self.module_id)
         """Test module's upgrade settings.
 

xoa_driver/internals/{hli_v1 → hli}/ports/port_l23/bases/port_l23.py

@@ -55,12 +55,12 @@ from xoa_driver.internals.commands import (
 )
 if typing.TYPE_CHECKING:
     from xoa_driver.internals.core import interfaces as itf
-from xoa_driver.internals.hli_v1.ports import base_port
+from xoa_driver.internals.hli.ports import base_port
 from xoa_driver.internals.utils import attributes as utils
 from xoa_driver.internals.utils.indices import index_manager as idx_mgr
 from xoa_driver.internals.state_storage import ports_state
-from xoa_driver.internals.hli_v1.indices.length_term import LengthTermIdx
-from xoa_driver.internals.hli_v1.indices.match_term import MatchTermIdx
+from xoa_driver.internals.hli.indices.length_term import LengthTermIdx
+from xoa_driver.internals.hli.indices.match_term import MatchTermIdx
 
 from .port_capture import PortCapture
 

xoa_driver/internals/{hli_v1 → hli}/ports/port_l23/bases/port_l23_genuine.py

@@ -16,11 +16,11 @@ from xoa_driver.internals.commands import (
 )
 from xoa_driver.internals.utils import attributes as utils
 from xoa_driver.internals.utils.indices import index_manager as idx_mgr
-from xoa_driver.internals.hli_v1.indices.streams.genuine_stream import GenuineStreamIdx
-from xoa_driver.internals.hli_v1.indices.filter.genuine_filter import GenuineFilterIdx
-from xoa_driver.internals.hli_v1.indices.port_dataset import PortDatasetIdx
+from xoa_driver.internals.hli.indices.streams.genuine_stream import GenuineStreamIdx
+from xoa_driver.internals.hli.indices.filter.genuine_filter import GenuineFilterIdx
+from xoa_driver.internals.hli.indices.port_dataset import PortDatasetIdx
 from xoa_driver.internals.state_storage import ports_state
-from xoa_driver.internals.hli_v1.indices.macsecscs.genuine_macsecsc import GenuineMacSecTxScIdx, GenuineMacSecRxScIdx
+from xoa_driver.internals.hli.indices.macsecscs.genuine_macsecsc import GenuineMacSecTxScIdx, GenuineMacSecRxScIdx
 
 from .port_l23 import (
     BasePortL23,