Skip to content

Commit 34f671e

Browse files
Fix rebase fallout: orphaned ConfigSession includes, stale findFirstEthInterface call
main renamed findFirstEthInterface() to getRandomInterfacePortName() (virtual-management-port fix); convert the branch-added no-op-commit test to the new helper. Drop the three includes ConfigSession.cpp no longer uses directly (misc-include-cleaner runs as errors in CI).
1 parent 8d74003 commit 34f671e

2 files changed

Lines changed: 1 addition & 4 deletions

File tree

fboss/cli/fboss2/session/ConfigSession.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,10 @@
4141
#include "fboss/agent/AgentDirectoryUtil.h"
4242
#include "fboss/agent/gen-cpp2/agent_config_types.h"
4343
#include "fboss/agent/gen-cpp2/switch_config_types.h"
44-
#include "fboss/agent/if/gen-cpp2/FbossCtrl.h"
45-
#include "fboss/agent/if/gen-cpp2/FbossCtrlAsyncClient.h"
4644
#include "fboss/cli/fboss2/gen-cpp2/cli_metadata_types.h"
4745
#include "fboss/cli/fboss2/session/FbossServiceUtil.h"
4846
#include "fboss/cli/fboss2/session/Git.h"
4947
#include "fboss/cli/fboss2/utils/CmdClientUtils.h"
50-
#include "fboss/cli/fboss2/utils/CmdClientUtilsCommon.h"
5148
#include "fboss/cli/fboss2/utils/HostInfo.h"
5249
#include "fboss/cli/fboss2/utils/PortMap.h"
5350

fboss/cli/fboss2/test/integration_test/ConfigInterfaceDescriptionTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ TEST_F(ConfigInterfaceDescriptionTest, SetAndVerifyDescription) {
9696
// agent (skip-when-unchanged). Regression test for the agent-side unification.
9797
TEST_F(ConfigInterfaceDescriptionTest, SetSameDescriptionIsNoOpCommit) {
9898
XLOG(INFO) << "[Step 1] Finding an interface to test...";
99-
Interface interface = findFirstEthInterface();
99+
Interface interface = getInterfaceInfo(getRandomInterfacePortName());
100100
const std::string originalDescription = interface.description;
101101
XLOG(INFO) << " Using interface: " << interface.name << " (description: '"
102102
<< originalDescription << "')";

0 commit comments

Comments
 (0)