Skip to content

[Nexthop][fboss2-dev] fboss2-dev switchport access vlan: validate VLAN exists before commit #1179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hillol-nexthop wants to merge 2 commits into from
+50 −1
Closed

[Nexthop][fboss2-dev] fboss2-dev switchport access vlan: validate VLAN exists before commit #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44c1a91
fboss2-dev switchport access vlan: validate VLAN exists before commit
mabel-bot[bot] May 11, 2026
041142e
remove interface check
hillol-nexthop May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion ...mmands/config/interface/switchport/access/vlan/CmdConfigInterfaceSwitchportAccessVlan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,21 @@ CmdConfigInterfaceSwitchportAccessVlan::queryClient(
// Extract the VLAN ID (validation already done in VlanIdValue constructor)
int32_t vlanId = vlanIdValue.getVlanId();

// Validate that the VLAN exists before modifying config
auto& config = ConfigSession::getInstance().getAgentConfig();
bool vlanExists = false;
for (const auto& vlan : *config.sw()->vlans()) {
if (*vlan.id() == vlanId) {
vlanExists = true;
break;
}
}
if (!vlanExists) {
throw std::invalid_argument(
"VLAN " + std::to_string(vlanId) +
" does not exist. Create the VLAN first before assigning ports to it.");
}

// Collect the logical port IDs we need to update
std::unordered_set<int32_t> portIds;

Expand All @@ -44,7 +59,6 @@ CmdConfigInterfaceSwitchportAccessVlan::queryClient(
}

// Also update the vlanPorts entries for these ports
auto& config = ConfigSession::getInstance().getAgentConfig();
auto& vlanPorts = *config.sw()->vlanPorts();
for (auto& vlanPort : vlanPorts) {
if (portIds.count(*vlanPort.logicalPort())) {
Expand Down
35 changes: 35 additions & 0 deletions fboss/cli/fboss2/test/config/CmdConfigInterfaceSwitchportAccessVlanTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,17 @@ class CmdConfigInterfaceSwitchportAccessVlanTestFixture
"spanningTreeState": 2,
"emitTags": false
}
],
"defaultVlan": 4000,
"vlans": [
{"id": 1, "name": "vlan1", "routable": true, "intfID": 1},
{"id": 2001, "name": "vlan2001", "routable": true, "intfID": 2001},
{"id": 3000, "name": "vlan3000", "routable": true, "intfID": 0},
{"id": 4000, "name": "vlan4000", "routable": false, "intfID": 0}
],
"interfaces": [
{"intfID": 1, "vlanID": 1, "routerID": 0, "type": 1, "mtu": 9412},
{"intfID": 2001, "vlanID": 2001, "routerID": 0, "type": 1, "mtu": 9412}
]
}
})") {}
Expand Down Expand Up @@ -191,4 +202,28 @@ TEST_F(
std::invalid_argument);
}

TEST_F(
CmdConfigInterfaceSwitchportAccessVlanTestFixture,
queryClientThrowsWhenVlanDoesNotExist) {
auto cmd = CmdConfigInterfaceSwitchportAccessVlan();
utils::InterfaceList interfaces({"eth1/1/1"});
VlanIdValue vlanId({"4094"});

try {
cmd.queryClient(localhost(), interfaces, vlanId);
FAIL() << "Expected std::invalid_argument";
} catch (const std::invalid_argument& e) {
std::string msg = e.what();
EXPECT_THAT(msg, HasSubstr("VLAN 4094"));
EXPECT_THAT(msg, HasSubstr("does not exist"));
}

auto& config = ConfigSession::getInstance().getAgentConfig();
for (const auto& port : *config.sw()->ports()) {
if (*port.name() == "eth1/1/1") {
EXPECT_EQ(*port.ingressVlan(), 1);
}
}
}

} // namespace facebook::fboss
Loading