From 964d3d13da199628928877eca0c1ec604a060281 Mon Sep 17 00:00:00 2001
From: Paul Cruz <paulcruz74@meta.com>
Date: Fri, 20 Sep 2024 09:36:39 -0700
Subject: [PATCH] More Agent OSS build fixes

Summary: Adds required cmake dependencies for `hw_switch_reachability_change_speed` and removes unused variables.

Reviewed By: srikrishnagopu

Differential Revision: D63040254

fbshipit-source-id: 04e16dc2c3afc9a714675c645cf9cfa33b5c26c5
---
 cmake/AgentHwBenchmarks.cmake                               | 2 ++
 fboss/agent/test/agent_hw_tests/AgentHwAclQualifierTest.cpp | 5 -----
 fboss/agent/test/agent_hw_tests/BUCK                        | 1 +
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/cmake/AgentHwBenchmarks.cmake b/cmake/AgentHwBenchmarks.cmake
index 618c3cfd6c4dc..ef73c370f8c08 100644
--- a/cmake/AgentHwBenchmarks.cmake
+++ b/cmake/AgentHwBenchmarks.cmake
@@ -421,6 +421,8 @@ target_link_libraries(hw_switch_reachability_change_speed
   mono_agent_ensemble
   mono_agent_benchmarks
   config_factory
+  voq_test_utils
+  fabric_test_utils
   Folly::folly
   Folly::follybenchmark
 )
diff --git a/fboss/agent/test/agent_hw_tests/AgentHwAclQualifierTest.cpp b/fboss/agent/test/agent_hw_tests/AgentHwAclQualifierTest.cpp
index cd96f46755b02..efc5223012389 100644
--- a/fboss/agent/test/agent_hw_tests/AgentHwAclQualifierTest.cpp
+++ b/fboss/agent/test/agent_hw_tests/AgentHwAclQualifierTest.cpp
@@ -262,7 +262,6 @@ TEST_F(AgentHwAclQualifierTest, AclIp4TcpQualifiers) {
     auto& ensemble = *getAgentEnsemble();
     auto newCfg = initialConfig(ensemble);
     auto l3Asics = ensemble.getSw()->getHwAsicTable()->getL3Asics();
-    auto asic = utility::checkSameAndGetAsic(l3Asics);
 
     auto* acl1 = utility::addAcl(&newCfg, "ip4_tcp", cfg::AclActionType::DENY);
     configureAllHwQualifiers(acl1, true);
@@ -290,7 +289,6 @@ TEST_F(AgentHwAclQualifierTest, AclIp6TcpQualifiers) {
     auto& ensemble = *getAgentEnsemble();
     auto newCfg = initialConfig(ensemble);
     auto l3Asics = ensemble.getSw()->getHwAsicTable()->getL3Asics();
-    auto asic = utility::checkSameAndGetAsic(l3Asics);
 
     auto* acl1 = utility::addAcl(&newCfg, "ip6_tcp", cfg::AclActionType::DENY);
     configureAllHwQualifiers(acl1, true);
@@ -321,7 +319,6 @@ TEST_F(AgentHwAclQualifierTest, AclIcmp4Qualifiers) {
     auto& ensemble = *getAgentEnsemble();
     auto newCfg = initialConfig(ensemble);
     auto l3Asics = ensemble.getSw()->getHwAsicTable()->getL3Asics();
-    auto asic = utility::checkSameAndGetAsic(l3Asics);
 
     auto* acl1 = utility::addAcl(&newCfg, "icmp4", cfg::AclActionType::DENY);
     configureAllHwQualifiers(acl1, true);
@@ -350,7 +347,6 @@ TEST_F(AgentHwAclQualifierTest, AclIcmp6Qualifiers) {
     auto& ensemble = *getAgentEnsemble();
     auto newCfg = initialConfig(ensemble);
     auto l3Asics = ensemble.getSw()->getHwAsicTable()->getL3Asics();
-    auto asic = utility::checkSameAndGetAsic(l3Asics);
 
     auto* acl1 = utility::addAcl(&newCfg, "icmp6", cfg::AclActionType::DENY);
     configureAllHwQualifiers(acl1, true);
@@ -376,7 +372,6 @@ TEST_F(AgentHwAclQualifierTest, AclRemove) {
     auto& ensemble = *getAgentEnsemble();
     auto newCfg = initialConfig(ensemble);
     auto l3Asics = ensemble.getSw()->getHwAsicTable()->getL3Asics();
-    auto asic = utility::checkSameAndGetAsic(l3Asics);
 
     auto* acl0 = utility::addAcl(&newCfg, "acl0", cfg::AclActionType::DENY);
     acl0->proto() = 6;
diff --git a/fboss/agent/test/agent_hw_tests/BUCK b/fboss/agent/test/agent_hw_tests/BUCK
index fa15a42c24328..2bef160cb4554 100644
--- a/fboss/agent/test/agent_hw_tests/BUCK
+++ b/fboss/agent/test/agent_hw_tests/BUCK
@@ -135,6 +135,7 @@ cpp_library(
         "//fboss/agent/test/utils:voq_test_utils",
         "//fboss/lib:common_utils",
         "//folly:file_util",
+        "//folly:map_util",
         "//folly:network_address",
         "//folly/json:dynamic",
         "//folly/logging:logging",