Skip to content
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

Remove unnecessary adding BPs to default VLAN on init #193

Merged
merged 3 commits into from
Sep 15, 2023
Merged

Remove unnecessary adding BPs to default VLAN on init #193

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d271347
Remove unnecessary adding BPs to default VLAN on init
yuriilisovskyi Sep 13, 2023
598adf1
fixes according to comments
yuriilisovskyi Sep 15, 2023
be81469
fixes according to CI
yuriilisovskyi Sep 15, 2023
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: 8 additions & 8 deletions common/sai_npu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,12 @@ def init(self, attr):
assert len(self.dot1q_bp_oids) > 0
assert self.dot1q_bp_oids[0].startswith("oid:")

if self.sku_config is None:
# The ports will not be re-created.
# Make sure the bridge ports are added into the default VLAN.
for bp_oid in self.dot1q_bp_oids:
vlan_mbr_oid = self.get_vlan_member(self.default_vlan_oid, bp_oid)
if vlan_mbr_oid == None:
self.create_vlan_member(self.default_vlan_oid, bp_oid, "SAI_VLAN_TAGGING_MODE_UNTAGGED")
# The ports will not be re-created.
andriy-kokhan marked this conversation as resolved.
Show resolved Hide resolved
# Make sure the bridge ports are added into the default VLAN.
for bp_oid in self.dot1q_bp_oids:
vlan_mbr_oid = self.get_vlan_member(self.default_vlan_oid, bp_oid)
if vlan_mbr_oid == None and self.sku_config is None:
self.create_vlan_member(self.default_vlan_oid, bp_oid, "SAI_VLAN_TAGGING_MODE_UNTAGGED")

# Update SKU
if self.sku_config is not None:
Expand Down Expand Up @@ -207,7 +206,8 @@ def set_sku_mode(self, sku):
# Remove existing ports
num_ports = len(self.dot1q_bp_oids)
for idx in range(num_ports):
self.remove_vlan_member(self.default_vlan_oid, self.dot1q_bp_oids[idx])
if self.get_vlan_member(self.default_vlan_oid, self.dot1q_bp_oids[idx]):
andriy-kokhan marked this conversation as resolved.
Show resolved Hide resolved
self.remove_vlan_member(self.default_vlan_oid, self.dot1q_bp_oids[idx])
self.remove(self.dot1q_bp_oids[idx])
oid = self.get(self.port_oids[idx], ["SAI_PORT_ATTR_PORT_SERDES_ID"]).oid()
if oid != "oid:0x0":
Expand Down