fix(evpn-bridge): disable pvid on vlans for bridge ports

Signed-off-by: Dimitrios Markou <dimitrios.markou@ericsson.com>
opiproject · Apr 8, 2024 · a6fa8fe · a6fa8fe
1 parent 32e2992
commit a6fa8fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/LinuxGeneralModule/lgm.go b/pkg/LinuxGeneralModule/lgm.go
@@ -332,7 +332,7 @@ func setUpTenantBridge() {
 	brTenantMtu := ipMtu + 20
 	vlanfiltering := true
 	bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: brTenant},
-		VlanDefaultPVID: nil,
+		VlanDefaultPVID: new(uint16),
 		VlanFiltering:   &vlanfiltering,
 	}
 

diff --git a/pkg/LinuxVendorModule/ipu/ipu.go b/pkg/LinuxVendorModule/ipu/ipu.go
@@ -180,7 +180,7 @@ func setUpBp(bp *infradb.BridgePort) bool {
 		}
 		//TODO: Update opi-api to change vlanid to uint16 in LogiclaBridge
 		vid := uint16(BrObj.Spec.VlanID)
-		if err = nlink.BridgeVlanAdd(ctx, vlanLink, vid, true, false, false, false); err != nil {
+		if err = nlink.BridgeVlanAdd(ctx, vlanLink, vid, false, false, false, false); err != nil {
 			log.Printf("Failed to add VLAN %d to bridge interface %s: %v\n", vportID, link, err)
 			return false
 		}