PyPI - python-netgear-switch-library - Versions diffs - 0.1.post26__tar.gz → 0.1.post29__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-netgear-switch-library
-Version: 0.1.post26
+Version: 0.1.post29
 Summary: Python library and CLI to query and control Netgear switches over SNMP, NSDP and HTTP.
 Author-email: Tim Ansell <me@mith.ro>
 License: Apache-2.0

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
-__version__ = version = '0.1.post26'
-__version_tuple__ = version_tuple = (0, 1, 'post26')
+__version__ = version = '0.1.post29'
+__version_tuple__ = version_tuple = (0, 1, 'post29')
 __commit_id__ = commit_id = None

@@ -123,6 +123,16 @@ class PortStatus:
     #: both report the NEGOTIATED rate only, and no vendor column carrying the
     #: admin setting has been located on any of them.
     speed_config: PortSpeed | None = None
+    #: The port's IF-MIB ``ifOperStatus`` as the agent reports it (RFC 2863):
+    #: 1 up, 2 down, 3 testing, 4 unknown, 5 dormant, 6 notPresent,
+    #: 7 lowerLayerDown. ``link_up`` is ``oper_status == 1``; this keeps the
+    #: states that are neither up nor down, which ``link_up`` folds into False
+    #: (a caller that shows a link fault needs them). ``None`` where the
+    #: backend cannot tell: every backend but SNMP, whose port tables as
+    #: their parsers read them (NSDP's link speed, the web UI's and the CLI's
+    #: Link Status) give only up or down, and an SNMP agent with no
+    #: ifOperStatus row for the port.
+    oper_status: int | None = None
 @dataclass(frozen=True)

@@ -182,6 +182,9 @@ def parse_port_status(
                 # (ifHighSpeed 0 also maps to None.)
                 speed_mbps=mbps if (mbps and link_up) else None,
                 description=alias_map.get(p) or None,
+                # the raw code, so a caller can tell a link fault (testing,
+                # dormant, lowerLayerDown, ...) from a link that is just down
+                oper_status=oper_map.get(p),
             )
         )
     return result

@@ -32,6 +32,23 @@ def test_parse_port_status_joins_admin_oper_speed_name():
     assert ports[1].description is None
+def test_parse_port_status_keeps_the_raw_oper_status():
+    """link_up folds every ifOperStatus but up(1) into False; oper_status keeps
+    the code, so testing(3), dormant(5), lowerLayerDown(7) and the rest can be
+    told from a plain down(2). A port with no ifOperStatus row is None."""
+    idx = {1: "1", 2: "1", 3: "1", 4: "1", 5: "1"}
+    admin = _rows("1.3.6.1.2.1.2.2.1.7", idx, "INTEGER")
+    oper = _rows("1.3.6.1.2.1.2.2.1.8", {1: "1", 2: "2", 3: "7", 4: "3"}, "INTEGER")
+    ports = parse.parse_port_status(admin, oper, [], [], [])
+    assert [(p.port, p.oper_status, p.link_up) for p in ports] == [
+        (1, 1, True),
+        (2, 2, False),
+        (3, 7, False),
+        (4, 3, False),
+        (5, None, False),
+    ]
 def test_parse_port_status_filters_to_physical_ethernet_ports():
     """The M4300 ifTable carries 16 ethernetCsmacd(6) physical ports alongside
     ieee8023adLag(161) LAGs, a CPU(1) interface and an l2vlan(135) routing

@@ -73,6 +73,24 @@ def test_get_ports_via_reader():
     assert ports[0].description == "uplink"
+def test_both_readers_carry_the_raw_oper_status():
+    """SnmpReader and AsyncSnmpReader both hand the ifOperStatus walk to the
+    parser: a lowerLayerDown(7) port reaches the caller as oper_status 7 (and
+    link_up False), an up port as 1."""
+    tables = {
+        "1.3.6.1.2.1.2.2.1.7": _r("1.3.6.1.2.1.2.2.1.7", {1: "1", 2: "1"}),
+        "1.3.6.1.2.1.2.2.1.8": _r("1.3.6.1.2.1.2.2.1.8", {1: "1", 2: "7"}),
+    }
+    model = get_model("gsm7252ps")
+    sync = SnmpReader(FakeClient(tables), model).get_ports()
+    async_ = asyncio.run(AsyncSnmpReader(FakeAsyncClient(tables), model).get_ports())
+    for ports in (sync, async_):
+        assert [(p.port, p.oper_status, p.link_up) for p in ports] == [
+            (1, 1, True),
+            (2, 7, False),
+        ]
 def test_get_poe_joins_status_and_vendor_mw():
     tbl = "1.3.6.1.2.1.105.1.1.1"
     tables = {

python-netgear-switch-library 0.1.post26__tar.gz → 0.1.post29__tar.gz