use both port and port descriptors in swswitch for mirror

Summary: As titled, set both port and port descriptor while resolving mirror in sw switch. Subsequent diffs will transition away from using egress port and move everything to use port descriptor. Reviewed By: jasmeetbagga Differential Revision: D61224824 fbshipit-source-id: bc60051b1570b15373e3574529dac616a49a6f8f
facebook · Aug 16, 2024 · 7e2fe07 · 7e2fe07
1 parent 1a80c73
commit 7e2fe07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/fboss/agent/ApplyThriftConfig.cpp b/fboss/agent/ApplyThriftConfig.cpp
@@ -4842,6 +4842,8 @@ std::shared_ptr<Mirror> ThriftConfigApplier::updateMirror(
     }
     if (orig->getEgressPort()) {
       newMirror->setEgressPort(orig->getEgressPort().value());
+      newMirror->setEgressPortDesc(
+          PortDescriptor(orig->getEgressPort().value()));
     }
   }
   if (*newMirror == *orig) {

diff --git a/fboss/agent/MirrorManagerImpl.cpp b/fboss/agent/MirrorManagerImpl.cpp
@@ -147,6 +147,7 @@ std::shared_ptr<Mirror> MirrorManagerImpl<AddrT>::updateMirror(
         entry,
         newMirror->getTunnelUdpPorts()));
     newMirror->setEgressPort(egressPort.value());
+    newMirror->setEgressPortDesc(PortDescriptor(egressPort.value()));
     break;
   }
 
@@ -155,6 +156,7 @@ std::shared_ptr<Mirror> MirrorManagerImpl<AddrT>::updateMirror(
       asic->isSupported(HwAsic::Feature::EVENTOR_PORT_FOR_SFLOW)) {
     auto eventorPort = getEventorPortForSflowMirror(mirror->getSwitchId());
     newMirror->setEgressPort(eventorPort);
+    newMirror->setEgressPortDesc(PortDescriptor(eventorPort));
     newMirror->setDestinationMac(
         getEventorPortInterfaceMac(state, eventorPort));
   }