tdl-xoa-driver 1.3.0__py3-none-any.whl → 1.5.0__py3-none-any.whl

xoa_driver/functions/exceptions.py

@@ -1,3 +1,5 @@
+"""The exception high-level function module."""
+
 from __future__ import annotations
 
 from xoa_driver.ports import GenericAnyPort

xoa_driver/functions/headers.py

@@ -1,3 +1,5 @@
+"""The packet headers high-level function module."""
+
 from ipaddress import IPv4Address, IPv6Address
 from binascii import hexlify
 from xoa_driver.misc import Hex

xoa_driver/functions/mgmt.py

@@ -1,13 +1,23 @@
+"""
+The resource management high-level function module, 
+including testers, modules, ports, and streams.
+"""
+
 from __future__ import annotations
 import asyncio
-import typing as t
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Union,
+)
 from xoa_driver import enums, testers
 from xoa_driver.utils import apply
-from xoa_driver.internals.hli_v2.ports.port_l23.family_l import FamilyL
-from xoa_driver.internals.hli_v2.ports.port_l23.family_l1 import FamilyL1
-from xoa_driver.ports import GenericAnyPort
-from xoa_driver.modules import GenericAnyModule, GenericL23Module, ModuleChimera, Z800FreyaModule
-from xoa_driver.testers import GenericAnyTester, L23Tester
+if TYPE_CHECKING:
+    from xoa_driver.internals.hli.ports.port_l23.family_l import FamilyL
+    from xoa_driver.internals.hli.ports.port_l23.family_l1 import FamilyFreya
+    from xoa_driver.ports import GenericAnyPort, GenericL23Port
+    from xoa_driver.modules import GenericAnyModule, GenericL23Module, ModuleChimera, Z800FreyaModule, Z1600EdunModule
+    from xoa_driver.testers import GenericAnyTester, L23Tester
 from .exceptions import (
     NotSupportMedia,
     NotSupportPortSpeed,
@@ -18,10 +28,6 @@ from itertools import chain  # type: ignore[Pylance false warning]
 from datetime import datetime
 import json
 
-PcsPmaSupported = (FamilyL, FamilyL1)
-AutoNegSupported = (FamilyL, FamilyL1)
-LinkTrainingSupported = FamilyL
-
 
 # region Testers
 async def reserve_tester(tester: GenericAnyTester, force: bool = True) -> None:
@@ -35,13 +41,8 @@ async def reserve_tester(tester: GenericAnyTester, force: bool = True) -> None:
     :return:
     :rtype: None
     """
-    r = await tester.reservation.get()
-    if force and r.operation == enums.ReservedStatus.RESERVED_BY_OTHER:
-        await tester.reservation.set_relinquish()
-        await asyncio.gather(*(release_module(m, True) for m in tester.modules))
-        await tester.reservation.set_reserve()
-    elif r.operation == enums.ReservedStatus.RELEASED:
-        await tester.reservation.set_reserve()
+    await release_tester(tester, force)
+    await tester.reservation.set_reserve()
 
 
 async def release_tester(
@@ -127,12 +128,8 @@ async def reserve_module(module: GenericAnyModule, force: bool = True) -> None:
     :return:
     :rtype: None
     """
-    r = await module.reservation.get()
-    if force and r.operation == enums.ReservedStatus.RESERVED_BY_OTHER:
-        await release_module(module, True)
-        await module.reservation.set_reserve()
-    elif r.operation == enums.ReservedStatus.RELEASED:
-        await module.reservation.set_reserve()
+    await release_module(module, force)
+    await module.reservation.set_reserve()
 
 
 async def release_module(
@@ -159,14 +156,14 @@ async def release_module(
 
 def get_module_supported_media(
     module: GenericL23Module | ModuleChimera,
-) -> list[dict[str, t.Any]]:
+) -> list[dict[str, Any]]:
     """
     Get a list of supported media, port speed and count of the module.
 
     :param module: The module object
     :type module: GenericAnyModule
     :return: List of supported media, port speed and count
-    :rtype: list[dict[str, t.Any]]
+    :rtype: list[dict[str, Any]]
     """
     supported_media_list = []
     item = {}
@@ -183,7 +180,7 @@ def get_module_supported_media(
 
 
 async def set_module_media_config(
-    module: t.Union[GenericL23Module, ModuleChimera],
+    module: Union[GenericL23Module, ModuleChimera],
     media: enums.MediaConfigurationType,
     force: bool = True,
 ) -> None:
@@ -219,7 +216,7 @@ async def set_module_media_config(
 
 
 async def set_module_port_config(
-    module: t.Union[GenericL23Module, ModuleChimera],
+    module: Union[GenericL23Module, ModuleChimera],
     port_count: int,
     port_speed: int,
     force: bool = True,
@@ -228,7 +225,7 @@ async def set_module_port_config(
     Set module's port-speed configuration
 
     :param module: The module object
-    :type module: t.Union[GenericL23Module, ModuleChimera]
+    :type module: Union[GenericL23Module, ModuleChimera]
     :param port_count: The port count
     :type port_count: int
     :param port_speed: The port speed in Mbps, e.g. 40000 for 40G
@@ -267,7 +264,7 @@ async def set_module_port_config(
 
 
 async def set_module_config(
-    module: t.Union[GenericL23Module, ModuleChimera],
+    module: Union[GenericL23Module, ModuleChimera],
     media: enums.MediaConfigurationType,
     port_count: int,
     port_speed: int,
@@ -276,7 +273,7 @@ async def set_module_config(
     """Change the module configuration to the target media, port count and port speed.
 
     :param module: the module object
-    :type module: t.Union[GenericL23Module, ModuleChimera]
+    :type module: Union[GenericL23Module, ModuleChimera]
     :param media: the target media for the module
     :type media: enums.MediaConfigurationType
     :param port_count: the target port count
@@ -341,12 +338,13 @@ async def get_module_eol_days(module: GenericAnyModule) -> int:
     return timedelta.days
 
 
-async def get_module_cage_insertion_count(module: Z800FreyaModule, cage_index: int) -> int:
+    from xoa_driver.modules import GenericAnyModule, GenericL23Module, ModuleChimera, Z800FreyaModule, Z1600EdunModule
+async def get_module_cage_insertion_count(module: Union[Z800FreyaModule, Z1600EdunModule], cage_index: int) -> int:
     """
     Get module cage insertion count
 
     :param module: The Z800 Freya module object
-    :type module: Z800FreyaModule
+    :type module: Union[Z800FreyaModule, Z1600EdunModule]
     :param cage_index: The cage index
     :type module: int
     :return: Insertion count of the cage
@@ -364,6 +362,22 @@ async def get_module_cage_insertion_count(module: Z800FreyaModule, cage_index: i
     return result
 
 
+async def get_module_cage_count(module: Union[Z800FreyaModule, Z1600EdunModule]) -> int:
+    """
+    Get module cage count
+
+    :param module: The Z800 Freya module object
+    :type module: Union[Z800FreyaModule, Z1600EdunModule]
+    :return: The number of cages in the module
+    :rtype: int
+    """
+    resp = await module.health.cage_insertion.get()
+    info_js = resp.info
+    info_dict = json.loads(info_js)
+    result = len(info_dict['1']['data'])
+    return result
+
+
 # endregion
 
 
@@ -470,12 +484,12 @@ async def release_ports(*ports: GenericAnyPort) -> None:
 
 
 # region Streams
-async def remove_streams(port: GenericAnyPort) -> None:
+async def remove_streams(port: GenericL23Port) -> None:
     """
     Remove all streams on a port witout resetting the port.
 
     :param port: The port object
-    :type port: GenericAnyPort
+    :type port: GenericL23Port
     """
     await port.streams.server_sync()
     await asyncio.gather(*(s.delete() for s in port.streams))

xoa_driver/functions/tools.py

@@ -1,14 +1,20 @@
 from __future__ import annotations
-from typing import Any
+from typing import (
+    TYPE_CHECKING,
+    Any,
+)
+
+if TYPE_CHECKING:
+    from xoa_driver.ports import GenericAnyPort
 
-from xoa_driver.ports import GenericAnyPort
 from xoa_driver.internals.core import interfaces as itf
 from xoa_driver.lli import commands
 from xoa_driver import enums
 
 
 def get_ctx(port: GenericAnyPort) -> tuple["itf.IConnection", int, int]:
-    return (port._conn, *port.kind)
+    module_id, port_id = port.kind  # Explicitly unpack to two ints
+    return (port._conn, module_id, port_id)
 
 
 def dictionize_autoneg_status(

xoa_driver/hlfuncs.py

@@ -1,11 +1,14 @@
 #: High-level functions
+"""High-level functions."""
+
 from xoa_driver.functions import (
     anlt,
-    cli,
+    cli as config_io,
     mgmt,
     anlt_ll_debug,
     exceptions,
     headers,
+    cmis,
 )
 
 __all__ = (
@@ -13,6 +16,7 @@ __all__ = (
     "mgmt",
     "anlt_ll_debug",
     "exceptions",
-    "cli",
-    "headers"
+    "config_io",
+    "headers",
+    "cmis",
 )

xoa_driver/internals/commands/c_commands.py

@@ -23,7 +23,8 @@ from xoa_driver.internals.core.transporter.protocol.payload import (
     XmpMacAddress,
     XmpSequence,
     XmpStr,
-    Hex
+    Hex,
+    XmpJson,
 )
 from .enums import (
     ReservedStatus,
@@ -1239,7 +1240,7 @@ class C_WATCHDOG:
 @dataclass
 class C_DEBUGCMD:
     """
-    Chassis debug command
+    Chassis debug command for internal use only.
     """
 
     code: typing.ClassVar[int] = 37
@@ -1249,16 +1250,11 @@ class C_DEBUGCMD:
     _cmd_xindex: int
 
     class GetDataAttr(ResponseBodyStruct):
-        data: typing.List[int] = field(XmpSequence(types_chunk=[XmpInt()]))
-
-    class SetDataAttr(RequestBodyStruct):
-        data: typing.List[int] = field(XmpSequence(types_chunk=[XmpInt()]))
+        data: dict = field(XmpJson(min_len=2))
 
     def get(self) -> Token[GetDataAttr]:
         return Token(self._connection, build_get_request(self, indices=[self._cmd_xindex]))
     
-    def set(self, data: typing.List[int]) -> Token[None]:
-        return Token(self._connection, build_set_request(self, indices=[self._cmd_xindex], data=data))
     
 
 @register_command
@@ -2028,8 +2024,8 @@ class C_MODEL_NUMBER:
     _connection: 'interfaces.IConnection'
 
     class GetDataAttr(ResponseBodyStruct):
-        number:  ChassisModelNumber = field(XmpInt())
-        """ChassisModelNumber, the model of the Xena tester"""
+        number:  str = field(XmpStr())
+        """str, the model of the Xena tester"""
 
     def get(self) -> Token[GetDataAttr]:
         """Get the Xena chassis model number.

xoa_driver/internals/commands/enums.py

@@ -1069,6 +1069,18 @@ class MediaConfigurationType(IntEnum):
     QSFP28_NRZ_ANLT = 123
     """QSFP28, 25G serdes, L1/ANLT"""
 
+    SMPX_112 = 124
+    """SMPX 112Gbps serdes"""
+
+    SMPX_224 = 125
+    """SMPX 224Gbps serdes"""
+
+    OSFP_1600 = 126
+    """OSFP 1.6T"""
+    
+    OSFP_1600_ANLT = 127
+    """OSFP 1.6T, L1/ANLT"""
+
     UNKNOWN = 255
 
 
@@ -3165,7 +3177,13 @@ class ChassisModelName(IntEnum):
     Z_800_Q_A_C_FREYA   = 16
     Z_800_O_A_C_FREYA   = 17
     E_100_Q_C_CHIMERA   = 18
-
+    Z_100_Q_X_C_LOKI = 19
+    Z_400_Q_X_C_THOR = 20
+    Z_800_Q_X_C_FREYA = 21
+    Z_1604_S_C_EDUN = 22
+    Z_1608_O_C_EDUN = 23
+    B_6400 = 24
+    
 class ModuleModelName(IntEnum):
     NA              = 0
     Z_01_T_ODIN     = 1
@@ -3180,6 +3198,12 @@ class ModuleModelName(IntEnum):
     Z_800_Q_FREYA   = 10
     Z_800_O_FREYA   = 11
     E_100_Q_CHIMERA = 12
+    Z_100_Q_X_LOKI = 13
+    Z_400_Q_X_THOR = 14
+    Z_800_Q_X_FREYA = 15
+    Z_1604_S_EDUN = 16
+    Z_1608_O_EDUN = 17
+    Z_1616_O_EDUN = 18
 
 class ModuleConfigStatus(IntEnum):
     UNKNOWN = 0

xoa_driver/internals/commands/p_commands.py

@@ -570,6 +570,8 @@ class P_CAPABILITIES:
         * Bit 4: Can monitor PCS RX Lane Skew
         * Bit 5: Can control PCS TX Lane Skew
         * Bit 6: Can FEC error injection
+        * Bit 8: Can Pre-coding
+        * Bit 9: Can Gray-coding
         """
         # fec_engines: int = field(XmpInt(), min_version=465)
         # """The number of FEC engines available"""
@@ -599,7 +601,44 @@ class P_CAPABILITIES:
         * Bit 0: Normal modifier (16/24-bit) supports little-endian
         * Bit 1: Extended modifier (32-bit) supports little-endian
         """
-        
+        capture_bitmask: int = field(XmpInt(), min_version=470)
+        """integer, bitmask indicating capture capabilities.
+
+        If all bits are 0: CAPTURE_NOT_SUPPORTED
+
+        Bits [0:11] are for Start triggers:
+
+        * Bit 0: CAPTURE_START_ON
+        * Bit 1: CAPTURE_START_FCSERROR
+        * Bit 2: CAPTURE_START_FILTER
+        * Bit 3: CAPTURE_START_PLDERROR
+        * Bit 4-11: Reserved
+
+        Bits [12:23] are for Stop triggers:
+
+        * Bit 12: CAPTURE_STOP_FULL
+        * Bit 13: CAPTURE_STOP_FCSERROR
+        * Bit 14: CAPTURE_STOP_FILTER
+        * Bit 15: CAPTURE_STOP_PLDERROR
+        * Bit 16: CAPTURE_STOP_USERSTOP
+        * Bit 17-23: Reserved
+
+        Bits [24:31] are for Keep modes:
+
+        * Bit 24: CAPTURE_KEEP_ALL
+        * Bit 25: CAPTURE_KEEP_FCSERR
+        * Bit 26: CAPTURE_KEEP_NOTPLD
+        * Bit 27: CAPTURE_KEEP_TPLD
+        * Bit 28: CAPTURE_KEEP_FILTER
+        * Bit 29: CAPTURE_KEEP_PLDERR
+        * Bit 30-31: Reserved
+        """
+        num_txeq_pre: int = field(XmpInt(), min_version=470)
+        """The number of postcursors = num_txeq - num_txeq_pre - 1."""
+        txeq_max_seq: typing.List[int] = field(XmpSequence(types_chunk=[XmpInt()], length=10), min_version=470)
+        """max value of individual TXEQ taps, SEQuential: <pre-n> <pre-(n-q)> ... <prr1> <main> <post1> <post2> ...."""
+        txeq_min_seq: typing.List[int] = field(XmpSequence(types_chunk=[XmpInt()], length=10), min_version=470)
+        """min-value of individual TXEQ taps, SEQuential: <pre-n> <pre-(n-q)> ... <prr1> <main> <post1> <post2> ...."""
 
 
     def get(self) -> Token[GetDataAttr]:
@@ -1510,7 +1549,6 @@ class P_XMITONE:
         A valid Frame Check Sum is written into the final four bytes.
 
         :param hex_data: raw bytes of the packet in hex to transmit
-        :rtype: typing.List[str]
         """
 
         return Token(self._connection, build_set_request(self, module=self._module, port=self._port, hex_data=hex_data))
@@ -3636,17 +3674,17 @@ class P_LPPARTNERAUTONEG:
     _port: int
 
     class GetDataAttr(ResponseBodyStruct):
-        cap_100base_tx: YesNo = field(XmpByte())
+        can_100base_tx: YesNo = field(XmpByte())
         """coded byte, specifying whether the link partner is capable of 100BASE-TX."""
-        cap_1000base_t: YesNo = field(XmpByte())
+        can_1000base_t: YesNo = field(XmpByte())
         """coded byte. specifying whether the link partner is capable of 1000BASE-T."""
-        cap_10gbase_t: YesNo = field(XmpByte())
+        can_10gbase_t: YesNo = field(XmpByte())
         """coded byte. specifying whether the link partner is capable of 10GBASE-T."""
-        cap_100base_kx: YesNo = field(XmpByte())
-        """coded byte. specifying whether the link partner is capable of 100BASE-KX."""
-        cap_10gbase_kx4: YesNo = field(XmpByte())
-        """coded byte. specifying whether the link partner is capable of 10GBASE-KX4."""
-        cap_10gbase_kr: YesNo = field(XmpByte())
+        can_2p5gbase_t: YesNo = field(XmpByte())
+        """coded byte. specifying whether the link partner is capable of 2.5GBASE-T."""
+        can_5gbase_t: YesNo = field(XmpByte())
+        """coded byte. specifying whether the link partner is capable of 5GBASE-T."""
+        can_10gbase_kr: YesNo = field(XmpByte())
         """coded byte. specifying whether the link partner is capable of 10GBASE-KR."""
 
     def get(self) -> Token[GetDataAttr]:
@@ -3654,8 +3692,8 @@ class P_LPPARTNERAUTONEG:
             * whether the link partner is capable of 100BASE-TX
             * whether the link partner is capable of 1000BASE-T
             * whether the link partner is capable of 10GBASE-T
-            * whether the link partner is capable of 100BASE-KX
-            * whether the link partner is capable of 10GBASE-KX4
+            * whether the link partner is capable of 2.5GBASE-T
+            * whether the link partner is capable of 5GBASE-T
             * whether the link partner is capable of 10GBASE-KR
 
         :return: the the Energy Efficient Ethernet (EEE) capabilities advertised during auto-negotiation by the far side (link partner)