Re-sync with internal repository

The internal and external repositories are out of sync. This Pull Request attempts to brings them back in sync by patching the GitHub repository. Please carefully review this patch. You must disable ShipIt for your project in order to merge this pull request. DO NOT IMPORT this pull request. Instead, merge it directly on GitHub using the MERGE BUTTON. Re-enable ShipIt after merging.

fbshipit-source-id: a4a13e29a11d714847903917f8a629584b1d48d0

Author: facebook-github-bot

README.md

@@ -11,17 +11,6 @@ are expressed as structured configurations rather than imperative scripts.
 
 See the [documentation](https://github.com/facebook/DNE-Taac) for setup instructions.
 
-## Running TAAC modules under OSS
-
-TAAC's Python modules (e.g. `taac.libs.taac_runner`) include Meta-internal imports that aren't shipped in this slice. Set `TAAC_OSS=1` so the imports take their OSS branch:
-
-```bash
-export TAAC_OSS=1
-python3 -c 'import taac.libs.taac_runner; print("ok")'
-```
-
-Some runtime functionality is stubbed in OSS mode (NDS drainer, COOP patcher, ValidationStep, AristaSSHHelper, etc.) and will raise `NotImplementedError` if invoked on a code path that requires it. Imports succeed; trying to actually use those features fails.
-
 ## License
 
 This project is licensed under the Apache License 2.0 — see the [LICENSE](LICENSE) file for details.

taac/custom_test_handlers/registry.py

@@ -1,26 +1,18 @@
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 # pyre-unsafe
-import os
 import typing as t
 
+from taac.ai_bb.dsf.dsf_test_handler import DsfTestHandler
 from taac.custom_test_handlers.base_custom_test_handler import (
     BaseCustomTestHandler,
 )
 from taac.custom_test_handlers.patcher_cleanup_handler import (
     PatcherCleanupHandler,
 )
 
-TAAC_OSS = os.environ.get("TAAC_OSS", "").lower() in ("1", "true", "yes")
 
 # pyre-ignore
 CUSTOM_TEST_HANDLERS: t.List[BaseCustomTestHandler] = [
+    DsfTestHandler,
     PatcherCleanupHandler,
 ]
-
-if not TAAC_OSS:
-    # DsfTestHandler lives in the Meta-internal taac.ai_bb subpackage which
-    # isn't shipped in the OSS slice.
-    from taac.ai_bb.dsf.dsf_test_handler import DsfTestHandler
-
-    # pyre-ignore[6]: registry holds handler classes, annotated as instances.
-    CUSTOM_TEST_HANDLERS.append(DsfTestHandler)

taac/driver/fboss_switch.py

@@ -36,71 +36,15 @@
 # =============================================================================
 # Third-party (PyPI / OSS-compatible)
 # =============================================================================
-if t.TYPE_CHECKING:
-    # Keep Pyre on the real `bunch` types; the runtime fallback below would
-    # otherwise widen `bunch.Bunch` to `Bunch | SimpleNamespace`, which breaks
-    # callers (and the `import *` re-export in dne/drivers/fboss_switch.py).
-    import bunch
-else:
-    try:
-        import bunch
-    except ImportError:
-        # bunch is abandoned (last updated 2011), use types.SimpleNamespace as replacement
-        from types import SimpleNamespace as Bunch
-
-        class BunchModule:
-            """Compatibility wrapper for abandoned bunch module"""
-
-            Bunch = Bunch
-
-        bunch = BunchModule()
+import bunch
 
 # =============================================================================
 # FBOSS thrift types & clients (already OSS'd)
 # =============================================================================
 import neteng.fboss.bgp_thrift.types as fboss_bgp_thrift_types
 import neteng.fboss.fsdb.types as fsdb_types
 import pexpect
-
-TAAC_OSS = os.environ.get("TAAC_OSS", "").lower() in ("1", "true", "yes")
-
-# `t.TYPE_CHECKING or` keeps the real FbossAgentClient visible to Pyre so
-# `with self._get_fboss_agent_client() as client:` type-checks as a context
-# manager (the OSS stub below is a runtime-only fallback).
-if t.TYPE_CHECKING or not TAAC_OSS:
-    from fboss.fb_thrift_clients import FbossAgentClient, FbossAgentClientWrapper
-else:
-    # OSS stubs - fboss.fb_thrift_clients is Meta-internal
-    # Use FbossCtrl from OSS bindings as base
-    class FbossAgentClient:  # type: ignore
-        """OSS stub - using FbossCtrl from neteng.fboss.ctrl.clients"""
-
-        def __init__(self, hostname: str, port: int = 5909, timeout: int = 30):
-            from neteng.fboss.ctrl.clients import FbossCtrl
-
-            self.hostname = hostname
-            self.port = port
-            self.timeout = timeout
-            self._client = FbossCtrl
-
-    class FbossAgentClientWrapper:  # type: ignore
-        """OSS stub - context manager wrapper for FbossCtrl"""
-
-        def __init__(self, host: str, timeout: int = 30):
-            self.host = host
-            self.timeout = timeout
-            self._client = None
-
-        def __enter__(self):
-            from neteng.fboss.ctrl.clients import FbossCtrl
-
-            # In OSS, return the client class - actual instantiation happens elsewhere
-            return FbossCtrl
-
-        def __exit__(self, *args):
-            pass
-
-
+from fboss.fb_thrift_clients import FbossAgentClient, FbossAgentClientWrapper
 from neteng.fboss.bgp_attr.types import TBgpAfi, TIpPrefix
 from neteng.fboss.bgp_route_types.types import TBgpPath, TRibEntry
 from neteng.fboss.bgp_thrift.clients import TBgpService
@@ -217,6 +161,8 @@ def __exit__(self, *args):
     to_fb_uqdn,
 )
 
+TAAC_OSS = os.environ.get("TAAC_OSS", "").lower() in ("1", "true", "yes")
+
 if not TAAC_OSS:
     from openr.py.openr.cli.utils.commands import OpenrCtrlCmd
     from openr.py.openr.clients.openr_client import get_openr_ctrl_cpp_client

taac/health_checks/all_health_checks.py

@@ -3,8 +3,6 @@
 import os
 import typing as t
 
-TAAC_OSS = os.environ.get("TAAC_OSS", "").lower() in ("1", "true", "yes")
-
 from taac.health_checks.abstract_health_check import (
     AbstractDeviceHealthCheck,
     AbstractIxiaHealthCheck,
@@ -50,6 +48,9 @@
 from taac.health_checks.device_health_checks.clear_counters_health_check import (
     ClearCountersHealthCheck,
 )
+from taac.health_checks.device_health_checks.cpu_utilization_health_check import (
+    CpuUtilizationHealthCheck,
+)
 from taac.health_checks.device_health_checks.device_core_dumps_health_check import (
     DeviceCoreDumpsHealthCheck,
 )
@@ -65,6 +66,9 @@
 from taac.health_checks.device_health_checks.file_exists_health_check import (
     FileExistsHealthCheck,
 )
+from taac.health_checks.device_health_checks.generic_ods_health_check import (
+    GenericOdsHealthCheck,
+)
 from taac.health_checks.device_health_checks.hardware_capacity_health_check import (
     HardwareCapacityHealthCheck,
 )
@@ -77,6 +81,9 @@
 from taac.health_checks.device_health_checks.log_parsing_health_check import (
     LogParsingHealthCheck,
 )
+from taac.health_checks.device_health_checks.memory_utilization_health_check import (
+    MemoryUtilizationHealthCheck,
+)
 from taac.health_checks.device_health_checks.oomd_kill_health_check import (
     OomdKillHealthCheck,
 )
@@ -128,6 +135,15 @@
 from taac.health_checks.device_health_checks.systemctl_active_state_health_check import (
     SystemctlActiveStateHealthCheck,
 )
+from taac.health_checks.device_health_checks.tm_reconciliation_firing_health_check import (
+    TmReconciliationFiringHealthCheck,
+)
+from taac.health_checks.device_health_checks.ucmp_traffic_distribution_health_check import (
+    UcmpTrafficDistributionHealthCheck,
+)
+from taac.health_checks.device_health_checks.unclean_exit_health_check import (
+    UncleanExitHealthCheck,
+)
 from taac.health_checks.device_health_checks.wedge_agent_configured_health_check import (
     WedgeAgentConfiguredHealthCheck,
 )
@@ -143,6 +159,12 @@
 from taac.health_checks.dsf_health_checks.dsf_fsdb_subscriber_timestamp_health_check import (
     DsfFsdbSubscriberTimestampHealthCheck,
 )
+from taac.health_checks.dsf_health_checks.dsf_pfc_health_check import (
+    DsfPfcHealthCheck,
+)
+from taac.health_checks.dsf_health_checks.dsf_traffic_rebalance_health_check import (
+    DsfTrafficRebalanceHealthCheck,
+)
 from taac.health_checks.ixia_health_checks.ixia_packet_loss_health_check import (
     IxiaPacketLossHealthCheck,
 )
@@ -190,6 +212,8 @@
 )
 from taac.health_check.health_check import types as hc_types
 
+TAAC_OSS = os.environ.get("TAAC_OSS", "").lower() in ("1", "true", "yes")
+
 HealthCheck = t.Union[
     t.Type[AbstractIxiaHealthCheck],
     t.Type[AbstractDeviceHealthCheck],
@@ -202,23 +226,23 @@
     DrainStateHealthCheck,
     DsfDrainStateHealthCheck,
     DsfFabricReachabilityHealthCheck,
-    # DsfTrafficRebalanceHealthCheck,  # neteng.test_infra.dne.taac dep, excluded in OSS
+    DsfTrafficRebalanceHealthCheck,
     DsfFsdbSessionHealthCheck,
     DsfFsdbSubscriberTimestampHealthCheck,
     NdpHealthCheck,
     IxiaPortStatsHealthCheck,
     SystemctlActiveStateHealthCheck,
     WedgeAgentConfiguredHealthCheck,
-    # DsfPfcHealthCheck,  # neteng.test_infra.dne.taac dep, excluded in OSS
+    DsfPfcHealthCheck,
     CoreDumpsHealthCheck,
     PortStateHealthCheck,
     LldpHealthCheck,
     IxiaTrafficRateHealthCheck,
     PfcWdHealthCheck,
     CpuQueueHealthCheck,
-    # UncleanExitHealthCheck,  # ODS-dependent (taac.internal), excluded in OSS
-    # CpuUtilizationHealthCheck,  # ODS-dependent (taac.internal), excluded in OSS
-    # MemoryUtilizationHealthCheck,  # ODS-dependent (taac.internal), excluded in OSS
+    UncleanExitHealthCheck,
+    CpuUtilizationHealthCheck,
+    MemoryUtilizationHealthCheck,
     BgpSessionEstablishedHealthCheck,
     BgpConvergenceHealthCheck,
     BgpGracefulRestartHealthCheck,
@@ -228,7 +252,7 @@
     BgpNonBestRouteHealthCheck,
     BgpTcpdumpHealthCheck,
     L2EntryThresholdHealthCheck,
-    # GenericOdsHealthCheck,  # ODS-dependent (taac.internal), excluded in OSS
+    GenericOdsHealthCheck,
     OomdKillHealthCheck,
     EcmpGroupAndMemberCountHealthCheck,
     DeviceCoreDumpsHealthCheck,
@@ -248,7 +272,7 @@
     BgpFibProgrammingCheck,
     PortSpeedHealthCheck,
     PortSpeedSnapshotHealthCheck,
-    # UcmpTrafficDistributionHealthCheck,  # ODS-dependent (taac.internal), excluded in OSS
+    UcmpTrafficDistributionHealthCheck,
     BgpRouteCountVerificationHealthCheck,
     BgpMultipathNextHopCountHealthCheck,
     RouteConvergenceTimeHealthCheck,
@@ -262,7 +286,7 @@
     OpenrKvstoreConsistencyHealthCheck,
     AristaFbossNextHopValidityHealthCheck,
     PortChannelExpectedStateHealthCheck,
-    # TmReconciliationFiringHealthCheck,  # ODS-dependent (taac.internal), excluded in OSS
+    TmReconciliationFiringHealthCheck,
     TmKernelStateSnapshotHealthCheck,
 ]
 

taac/ixia/ixia.py

@@ -42,49 +42,25 @@
     retryable,
     to_fb_uqdn,
 )
-
-# The monorepo ships these constants at neteng.test_infra.ixia.ixnetwork_restpy.constants;
-# in OSS we vendor a copy alongside this module.
-if TAAC_OSS:
-    from taac.ixia.ixnetwork_restpy_constants import (
-        ALLOWED_IPV4_ADVERTISEMENTS,
-        ALLOWED_IPV6_ADVERTISEMENTS,
-        API_SERVER_PASSWORD,
-        API_SERVER_USERNAME,
-        DESIRED_BGP_V4_PEER_NAME,
-        DESIRED_BGP_V4_PREFIX_NAME,
-        DESIRED_BGP_V6_PEER_NAME,
-        DESIRED_BGP_V6_PREFIX_NAME,
-        DESIRED_DEVICE_GROUP_NAME,
-        DESIRED_ETHERNET_NAME,
-        DESIRED_IPV4_NAME,
-        DESIRED_IPV6_NAME,
-        DESIRED_IPV6_PTP_NAME,
-        DESIRED_TOPOLOGY_NAME,
-        DESIRED_V4_BGP_PREFIX_NAME,
-        DESIRED_V6_BGP_PREFIX_NAME,
-        DESIRED_VPORT_NAME,
-    )
-else:
-    from neteng.test_infra.ixia.ixnetwork_restpy.constants import (
-        ALLOWED_IPV4_ADVERTISEMENTS,
-        ALLOWED_IPV6_ADVERTISEMENTS,
-        API_SERVER_PASSWORD,
-        API_SERVER_USERNAME,
-        DESIRED_BGP_V4_PEER_NAME,
-        DESIRED_BGP_V4_PREFIX_NAME,
-        DESIRED_BGP_V6_PEER_NAME,
-        DESIRED_BGP_V6_PREFIX_NAME,
-        DESIRED_DEVICE_GROUP_NAME,
-        DESIRED_ETHERNET_NAME,
-        DESIRED_IPV4_NAME,
-        DESIRED_IPV6_NAME,
-        DESIRED_IPV6_PTP_NAME,
-        DESIRED_TOPOLOGY_NAME,
-        DESIRED_V4_BGP_PREFIX_NAME,
-        DESIRED_V6_BGP_PREFIX_NAME,
-        DESIRED_VPORT_NAME,
-    )
+from neteng.test_infra.ixia.ixnetwork_restpy.constants import (
+    ALLOWED_IPV4_ADVERTISEMENTS,
+    ALLOWED_IPV6_ADVERTISEMENTS,
+    API_SERVER_PASSWORD,
+    API_SERVER_USERNAME,
+    DESIRED_BGP_V4_PEER_NAME,
+    DESIRED_BGP_V4_PREFIX_NAME,
+    DESIRED_BGP_V6_PEER_NAME,
+    DESIRED_BGP_V6_PREFIX_NAME,
+    DESIRED_DEVICE_GROUP_NAME,
+    DESIRED_ETHERNET_NAME,
+    DESIRED_IPV4_NAME,
+    DESIRED_IPV6_NAME,
+    DESIRED_IPV6_PTP_NAME,
+    DESIRED_TOPOLOGY_NAME,
+    DESIRED_V4_BGP_PREFIX_NAME,
+    DESIRED_V6_BGP_PREFIX_NAME,
+    DESIRED_VPORT_NAME,
+)
 from uhd_restpy.assistants.sessions.sessionassistant import (
     SessionAssistant as UhdSessionAssistant,
 )
@@ -5078,6 +5054,47 @@ def find_bgp_peers(
             )
         return bgp_peers
 
+    def get_bgp_session_addresses(
+        self, regex: str, session_idx: int, ignore_case: bool = False
+    ) -> t.Tuple[str, str]:
+        """Resolve the ``(peer_ip, dut_ip)`` pair for a 1-based BGP session index.
+
+        For the first BGP peer (device group) whose name matches ``regex``,
+        returns the addresses for session ``session_idx``:
+          - ``peer_ip``: the IXIA-side neighbor address -- the UPDATE *destination*
+            when the DUT dumps routes to the peer,
+          - ``dut_ip``: the DUT-side address the peer points at -- the UPDATE
+            *source*.
+
+        These are used to scope a packet capture to a single DUT->peer direction,
+        which is required to compare exactly what the DUT sent each peer (an IXIA
+        vport carries every session on the link, plus the peers' own
+        advertisements back to the DUT).
+        """
+        peers = self.find_bgp_peers(regex, ignore_case)
+        if not peers:
+            raise ValueError(f"No BGP peer matches regex {regex!r}")
+        peer = peers[0]
+        idx = session_idx - 1
+        if idx < 0:
+            raise ValueError(f"session_idx must be >= 1; got {session_idx}")
+        # DutIp lives on the BGP peer; the peer's own address lives on the parent
+        # IP (Ipv6/Ipv4) stack. Both are Multivalues with one entry per session.
+        dut_ips = list(peer.DutIp.Values)
+        ip_stack = peer.parent
+        peer_ips = list(ip_stack.Address.Values)
+        if idx >= len(dut_ips) or idx >= len(peer_ips):
+            raise ValueError(
+                f"session_idx {session_idx} out of range for peer {peer.Name!r}: "
+                f"{len(peer_ips)} session address(es), {len(dut_ips)} DUT IP(s)"
+            )
+        peer_ip, dut_ip = peer_ips[idx], dut_ips[idx]
+        self.logger.info(
+            f"BGP session {session_idx} of {peer.Name!r}: "
+            f"DUT {dut_ip} -> peer {peer_ip}"
+        )
+        return peer_ip, dut_ip
+
     def find_bgp_ipv6_peer(self, port_identifier: str) -> t.Optional["BgpIpv6Peer"]:
         """Finds the BGP peer in the IXIA setup"""
         ipv6 = self.find_ipv6(port_identifier)