Reconstruct Adj FRR loopback ports during test setup

Summary:
Reconstruct `phyLoopbackPortIds_` from the applied switch configuration during `SetUp()` so warm-boot verification has the same port list even though `initialConfig()` is skipped. Preserve the original `config.ports()` ordering and add detailed logging for selected next hops, injection and expected egress ports, and minimum/maximum byte-count ports.

___

Differential Revision: D116105296

fbshipit-source-id: 40592e3508da574217d5d66a091e89b75716a152

Author: jasmeetbagga

fboss/agent/test/agent_hw_tests/AgentAdjFrrRouteTests.cpp

@@ -96,6 +96,21 @@ class AgentAdjFrrRouteTest : public AgentHwTest {
         ProductionFeature::ADJACENCY_FRR};
   }
 
+  void SetUp() override {
+    AgentHwTest::SetUp();
+    if (FLAGS_list_production_feature) {
+      return;
+    }
+
+    phyLoopbackPortIds_.clear();
+    const auto config = getSw()->getConfig();
+    for (const auto& port : *config.ports()) {
+      if (*port.loopbackMode() == cfg::PortLoopbackMode::PHY) {
+        phyLoopbackPortIds_.emplace_back(*port.logicalID());
+      }
+    }
+  }
+
   cfg::SwitchConfig initialConfig(
       const AgentEnsemble& ensemble) const override {
     auto config = utility::onePortPerInterfaceConfig(
@@ -104,13 +119,11 @@ class AgentAdjFrrRouteTest : public AgentHwTest {
         true /* interfaceHasSubnet */);
     config.udfConfig() =
         utility::addUdfAclConfig(utility::kUdfOffsetBthReserved);
-    phyLoopbackPortIds_.clear();
     // BRCM switches require PHY loopback for FRR link
     // state detection.
     for (auto& port : *config.ports()) {
       if (*port.speed() == cfg::PortSpeed::EIGHTHUNDREDG) {
         port.loopbackMode() = cfg::PortLoopbackMode::PHY;
-        phyLoopbackPortIds_.emplace_back(*port.logicalID());
       }
     }
     utility::addFlowletConfigs(
@@ -169,8 +182,19 @@ class AgentAdjFrrRouteTest : public AgentHwTest {
         makeNextHop(3, NextHopRole::BACKUP),
         makeNextHop(4, NextHopRole::BACKUP),
     };
+    const auto state = getProgrammedState();
     if (includePrimaryNextHop) {
       nextHops.emplace(makeNextHop(0, NextHopRole::PRIMARY));
+      const auto primaryPort = phyLoopbackPortIds_.at(0);
+      XLOG(INFO) << "Selected primary next-hop port: "
+                 << state->getPorts()->getNode(primaryPort)->getName() << " ("
+                 << primaryPort << ")";
+    }
+    for (size_t i = 1; i < kNumRouteNextHops; ++i) {
+      const auto backupPort = phyLoopbackPortIds_.at(i);
+      XLOG(INFO) << "Selected backup next-hop port: "
+                 << state->getPorts()->getNode(backupPort)->getName() << " ("
+                 << backupPort << ")";
     }
     auto routeUpdater = getSw()->getRouteUpdater();
     routeUpdater.addRoute(
@@ -202,6 +226,17 @@ class AgentAdjFrrRouteTest : public AgentHwTest {
       int packetCount,
       const char* egressPortDescription) {
     CHECK(!egressPorts.empty());
+    const auto state = getProgrammedState();
+    const auto injectionPortState = state->getPorts()->getNode(injectionPort);
+    XLOG(INFO) << egressPortDescription
+               << " injection port: " << injectionPortState->getName() << " ("
+               << injectionPort << ")";
+    for (const auto& egressPort : egressPorts) {
+      const auto egressPortState = state->getPorts()->getNode(egressPort);
+      XLOG(INFO) << egressPortDescription
+                 << " expected egress port: " << egressPortState->getName()
+                 << " (" << egressPort << ")";
+    }
     auto getOutPkts = [&egressPorts](const auto& portStats) {
       uint64_t outPkts{0};
       for (auto port : egressPorts) {
@@ -217,9 +252,25 @@ class AgentAdjFrrRouteTest : public AgentHwTest {
     WITH_RETRIES({
       const auto afterPortStats = getLatestPortStats(egressPorts);
       const auto afterOutPkts = getOutPkts(afterPortStats);
-      const auto [highestOutBytesIncrement, lowestOutBytesIncrement] =
-          utility::getHighestAndLowestBytesIncrement(
-              beforePortStats, afterPortStats);
+      auto lowestOutBytesPort = egressPorts.front();
+      auto highestOutBytesPort = egressPorts.front();
+      auto lowestOutBytesIncrement =
+          *afterPortStats.at(lowestOutBytesPort).outBytes_() -
+          *beforePortStats.at(lowestOutBytesPort).outBytes_();
+      auto highestOutBytesIncrement = lowestOutBytesIncrement;
+      for (const auto& egressPort : egressPorts) {
+        const auto outBytesIncrement =
+            *afterPortStats.at(egressPort).outBytes_() -
+            *beforePortStats.at(egressPort).outBytes_();
+        if (outBytesIncrement < lowestOutBytesIncrement) {
+          lowestOutBytesIncrement = outBytesIncrement;
+          lowestOutBytesPort = egressPort;
+        }
+        if (outBytesIncrement > highestOutBytesIncrement) {
+          highestOutBytesIncrement = outBytesIncrement;
+          highestOutBytesPort = egressPort;
+        }
+      }
       const auto deviationPct = lowestOutBytesIncrement == 0
           ? (highestOutBytesIncrement == 0
                  ? 0.0
@@ -230,10 +281,15 @@ class AgentAdjFrrRouteTest : public AgentHwTest {
       XLOG(INFO) << egressPortDescription
                  << " out packets before traffic: " << beforeOutPkts
                  << ", after traffic: " << afterOutPkts
-                 << ", lowest out bytes increment: " << lowestOutBytesIncrement
-                 << ", highest out bytes increment: "
-                 << highestOutBytesIncrement << ", deviation: " << deviationPct
-                 << "%";
+                 << ", lowest out bytes port: "
+                 << state->getPorts()->getNode(lowestOutBytesPort)->getName()
+                 << " (" << lowestOutBytesPort
+                 << "), increment: " << lowestOutBytesIncrement
+                 << ", highest out bytes port: "
+                 << state->getPorts()->getNode(highestOutBytesPort)->getName()
+                 << " (" << highestOutBytesPort
+                 << "), increment: " << highestOutBytesIncrement
+                 << ", deviation: " << deviationPct << "%";
       EXPECT_EVENTUALLY_EQ(afterOutPkts, beforeOutPkts + packetCount);
       EXPECT_EVENTUALLY_TRUE(
           utility::isDeviationWithinThreshold(
@@ -317,7 +373,7 @@ class AgentAdjFrrRouteTest : public AgentHwTest {
     });
   }
 
-  mutable std::vector<PortID> phyLoopbackPortIds_;
+  std::vector<PortID> phyLoopbackPortIds_;
 };
 
 TEST_F(AgentAdjFrrRouteTest, routeWithPrimaryAndBackupNhops) {