Skip to content

Commit bb2335e

Browse files
VladimirMakaevmeta-codesync[bot]
authored andcommitted
Daily arc lint --take CLANGFORMAT
Reviewed By: ionutluzinschi Differential Revision: D85728900 fbshipit-source-id: 022ac989ce5519b5b065a9fa8a20ce6438309b4c
1 parent abc4477 commit bb2335e

File tree

4 files changed

+26
-19
lines changed

4 files changed

+26
-19
lines changed

fboss/agent/DsfSubscription.cpp

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,10 @@ DsfSubscription::DsfSubscription(
9696
getConnectionOptions(localIp.str(), remoteIp.str()),
9797
reconnectEvb,
9898
subscriberEvb)),
99-
validator_(std::make_unique<DsfUpdateValidator>(
100-
sw->getSwitchInfoTable().getSwitchIDs(),
101-
remoteNodeSwitchIds)),
99+
validator_(
100+
std::make_unique<DsfUpdateValidator>(
101+
sw->getSwitchInfoTable().getSwitchIDs(),
102+
remoteNodeSwitchIds)),
102103
localNodeName_(std::move(localNodeName)),
103104
remoteNodeName_(std::move(remoteNodeName)),
104105
remoteNodeSwitchIds_(std::move(remoteNodeSwitchIds)),
@@ -283,17 +284,19 @@ void DsfSubscription::handleFsdbUpdate(fsdb::OperSubPathUnit&& operStateUnit) {
283284
// Process the actual state changes
284285
if (getSystemPortsPath().matchesPath(*change.path()->path())) {
285286
XLOG(DBG2) << "Got sys port update from : " << remoteNodeName_;
286-
curMswitchSysPorts_.fromThrift(thrift_cow::deserialize<
287-
MultiSwitchSystemPortMapTypeClass,
288-
MultiSwitchSystemPortMapThriftType>(
289-
fsdb::OperProtocol::BINARY, *change.state()->contents()));
287+
curMswitchSysPorts_.fromThrift(
288+
thrift_cow::deserialize<
289+
MultiSwitchSystemPortMapTypeClass,
290+
MultiSwitchSystemPortMapThriftType>(
291+
fsdb::OperProtocol::BINARY, *change.state()->contents()));
290292
portsOrIntfsChanged = true;
291293
} else if (getInterfacesPath().matchesPath(*change.path()->path())) {
292294
XLOG(DBG2) << "Got rif update from : " << remoteNodeName_;
293-
curMswitchIntfs_.fromThrift(thrift_cow::deserialize<
294-
MultiSwitchInterfaceMapTypeClass,
295-
MultiSwitchInterfaceMapThriftType>(
296-
fsdb::OperProtocol::BINARY, *change.state()->contents()));
295+
curMswitchIntfs_.fromThrift(
296+
thrift_cow::deserialize<
297+
MultiSwitchInterfaceMapTypeClass,
298+
MultiSwitchInterfaceMapThriftType>(
299+
fsdb::OperProtocol::BINARY, *change.state()->contents()));
297300
portsOrIntfsChanged = true;
298301
} else if (getDsfSubscriptionsPath(
299302
makeRemoteEndpoint(localNodeName_, localIp_))

fboss/agent/hw/sai/hw_test/dataplane_tests/SaiAclTableGroupTrafficTests.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,9 @@ class SaiAclTableGroupTrafficTest : public HwLinkStateDependentTest {
503503
return dscpAclMatch && ttlAclMatch;
504504
};
505505

506-
EXPECT_TRUE(getHwSwitchEnsemble()->waitStatsCondition(
507-
intermediateAclStatsMatch, updateStats));
506+
EXPECT_TRUE(
507+
getHwSwitchEnsemble()->waitStatsCondition(
508+
intermediateAclStatsMatch, updateStats));
508509

509510
auto intermediateAclPkts = pktCounterHelper();
510511
sendAllPacketshelper<AddrT>(dstIP, frontPanel, utility::kIcpDscp());
@@ -538,8 +539,9 @@ class SaiAclTableGroupTrafficTest : public HwLinkStateDependentTest {
538539
return dscpAclMatch && ttlAclMatch;
539540
};
540541

541-
EXPECT_TRUE(getHwSwitchEnsemble()->waitStatsCondition(
542-
afterAclStatsMatch, updateStats));
542+
EXPECT_TRUE(
543+
getHwSwitchEnsemble()->waitStatsCondition(
544+
afterAclStatsMatch, updateStats));
543545
}
544546

545547
void verifyDscpTtlAclTablesHelper() {

fboss/agent/hw/test/HwSwitchEnsemble.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,8 +709,9 @@ void HwSwitchEnsemble::setupEnsemble(
709709
scopeResolver_->switchIdToSwitchInfo());
710710
// this is supporting single ASIC (or switch only)
711711
for (auto& switchIdAndSwitchInfo : switchIdToSwitchInfo) {
712-
auto matcher = HwSwitchMatcher(std::unordered_set<SwitchID>(
713-
{static_cast<SwitchID>(switchIdAndSwitchInfo.first)}));
712+
auto matcher = HwSwitchMatcher(
713+
std::unordered_set<SwitchID>(
714+
{static_cast<SwitchID>(switchIdAndSwitchInfo.first)}));
714715
multiSwitchSwitchSettings->addNode(
715716
matcher.matcherString(), switchSettings);
716717
}

fboss/agent/state/tests/InterfaceTests.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,8 +801,9 @@ TEST(Interface, getRemoteInterfacesBySwitchId) {
801801

802802
remoteInterfaces->addNode(
803803
rif,
804-
HwSwitchMatcher(std::unordered_set<SwitchID>(
805-
{static_cast<SwitchID>(static_cast<uint16_t>(remoteSwitchId))})));
804+
HwSwitchMatcher(
805+
std::unordered_set<SwitchID>(
806+
{static_cast<SwitchID>(static_cast<uint16_t>(remoteSwitchId))})));
806807

807808
EXPECT_EQ(stateV2->getInterfaces(SwitchID(remoteSwitchId))->size(), 1);
808809
}

0 commit comments

Comments
 (0)