Allow vlan parameter to set native vlan on trunk ports

Marcelo · squeed · commit e0b9952318ee · 2025-06-02T17:24:10.000+02:00
This allows to set the native vlan on trunk ports
via the vlan parameter. It removes all previous
limitations set on the vlan trunk implementation.

Signed-off-by: Marcelo &lt;marguerr@redhat.com&gt;
diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go
@@ -123,11 +123,6 @@ func loadNetConf(bytes []byte, envArgs string) (*NetConf, string, error) {
 		return nil, "", err
 	}
 
-	// Currently bridge CNI only support access port(untagged only) or trunk port(tagged only)
-	if n.Vlan > 0 && n.vlans != nil {
-		return nil, "", errors.New("cannot set vlan and vlanTrunk at the same time")
-	}
-
 	if envArgs != "" {
 		e := MacEnvArgs{}
 		if err := types.LoadArgs(envArgs, &e); err != nil {
@@ -468,7 +463,6 @@ func setupVeth(
 		}
 	}
 
-	// Currently bridge CNI only support access port(untagged only) or trunk port(tagged only)
 	if vlanID != 0 {
 		err = netlink.BridgeVlanAdd(hostVeth, uint16(vlanID), true, true, false, true)
 		if err != nil {
@@ -483,6 +477,15 @@ func setupVeth(
 		}
 	}
 
+	// Backwards compatibility with users that did not specify a vlanID
+	if vlanID == 0 && len(vlans) > 0 {
+		// If no vlan is specified, we set the native vlan on the trunk equal to 1
+		err = netlink.BridgeVlanAdd(hostVeth, 1, true, true, false, true)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to setup default native vlan tag on interface %q: %v", hostIface.Name, err)
+		}
+	}
+
 	return hostIface, contIface, nil
 }
 
diff --git a/plugins/main/bridge/bridge_test.go b/plugins/main/bridge/bridge_test.go
@@ -691,6 +691,13 @@ func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 					}
 				}
 			}
+
+			// Check native vlan
+			nativeVlan := tc.vlan
+			if tc.vlan == 0 {
+				nativeVlan = 1
+			}
+			Expect(checkVlan(nativeVlan, vlans)).To(BeTrue())
 		}
 
 		// Check that the bridge has a different mac from the veth
@@ -1032,6 +1039,13 @@ func (tester *testerV04x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 					}
 				}
 			}
+
+			// Check native vlan
+			nativeVlan := tc.vlan
+			if tc.vlan == 0 {
+				nativeVlan = 1
+			}
+			Expect(checkVlan(nativeVlan, vlans)).To(BeTrue())
 		}
 
 		// Check that the bridge has a different mac from the veth
@@ -1366,6 +1380,13 @@ func (tester *testerV03x) cmdAddTest(tc testCase, dataDir string) (types.Result,
 					}
 				}
 			}
+
+			// Check native vlan
+			nativeVlan := tc.vlan
+			if tc.vlan == 0 {
+				nativeVlan = 1
+			}
+			Expect(checkVlan(nativeVlan, vlans)).To(BeTrue())
 		}
 
 		// Check that the bridge has a different mac from the veth
@@ -2021,11 +2042,31 @@ var _ = Describe("bridge Operations", func() {
 		})
 
 		// TODO find some way to put pointer
-		It(fmt.Sprintf("[%s] configures and deconfigures a l2 bridge with vlan id 100, vlanTrunk 101,200~210 using ADD/DEL", ver), func() {
+		It(fmt.Sprintf("[%s] configures and deconfigures a l2 bridge with vlanTrunk 101,200~210 using ADD/DEL", ver), func() {
+			id, minID, maxID := 101, 200, 210
+			tc := testCase{
+				cniVersion: ver,
+				isLayer2:   true,
+				vlanTrunk: []*VlanTrunk{
+					{ID: &id},
+					{
+						MinID: &minID,
+						MaxID: &maxID,
+					},
+				},
+				AddErr020: "cannot convert: no valid IP addresses",
+				AddErr010: "cannot convert: no valid IP addresses",
+			}
+			cmdAddDelTest(originalNS, targetNS, tc, dataDir)
+		})
+
+		It(fmt.Sprintf("[%s] configures and deconfigures a l2 bridge with vlan 100, and vlanTrunk 101,200~210 using ADD/DEL", ver), func() {
+			nativeVlan := 100
 			id, minID, maxID := 101, 200, 210
 			tc := testCase{
 				cniVersion: ver,
 				isLayer2:   true,
+				vlan:       nativeVlan,
 				vlanTrunk: []*VlanTrunk{
 					{ID: &id},
 					{

Original file line number	Diff line number	Diff line change
`@@ -123,11 +123,6 @@ func loadNetConf(bytes []byte, envArgs string) (*NetConf, string, error) {`
`123`	`123`	`return nil, "", err`
`124`	`124`	`}`
`125`	`125`
`126`		`- // Currently bridge CNI only support access port(untagged only) or trunk port(tagged only)`
`127`		`- if n.Vlan > 0 && n.vlans != nil {`
`128`		`- return nil, "", errors.New("cannot set vlan and vlanTrunk at the same time")`
`129`		`- }`
`130`		`-`
`131`	`126`	`if envArgs != "" {`
`132`	`127`	`e := MacEnvArgs{}`
`133`	`128`	`if err := types.LoadArgs(envArgs, &e); err != nil {`
`@@ -468,7 +463,6 @@ func setupVeth(`
`468`	`463`	`}`
`469`	`464`	`}`
`470`	`465`
`471`		`- // Currently bridge CNI only support access port(untagged only) or trunk port(tagged only)`
`472`	`466`	`if vlanID != 0 {`
`473`	`467`	`err = netlink.BridgeVlanAdd(hostVeth, uint16(vlanID), true, true, false, true)`
`474`	`468`	`if err != nil {`
`@@ -483,6 +477,15 @@ func setupVeth(`
`483`	`477`	`}`
`484`	`478`	`}`
`485`	`479`
	`480`	`+ // Backwards compatibility with users that did not specify a vlanID`
	`481`	`+ if vlanID == 0 && len(vlans) > 0 {`
	`482`	`+ // If no vlan is specified, we set the native vlan on the trunk equal to 1`
	`483`	`+ err = netlink.BridgeVlanAdd(hostVeth, 1, true, true, false, true)`
	`484`	`+ if err != nil {`
	`485`	`+ return nil, nil, fmt.Errorf("failed to setup default native vlan tag on interface %q: %v", hostIface.Name, err)`
	`486`	`+ }`
	`487`	`+ }`
	`488`	`+`
`486`	`489`	`return hostIface, contIface, nil`
`487`	`490`	`}`
`488`	`491`
Original file line number	Diff line number	Diff line change
`@@ -691,6 +691,13 @@ func (tester *testerV10x) cmdAddTest(tc testCase, dataDir string) (types.Result,`
`691`	`691`	`}`
`692`	`692`	`}`
`693`	`693`	`}`
	`694`	`+`
	`695`	`+ // Check native vlan`
	`696`	`+ nativeVlan := tc.vlan`
	`697`	`+ if tc.vlan == 0 {`
	`698`	`+ nativeVlan = 1`
	`699`	`+ }`
	`700`	`+ Expect(checkVlan(nativeVlan, vlans)).To(BeTrue())`
`694`	`701`	`}`
`695`	`702`
`696`	`703`	`// Check that the bridge has a different mac from the veth`
`@@ -1032,6 +1039,13 @@ func (tester *testerV04x) cmdAddTest(tc testCase, dataDir string) (types.Result,`
`1032`	`1039`	`}`
`1033`	`1040`	`}`
`1034`	`1041`	`}`
	`1042`	`+`
	`1043`	`+ // Check native vlan`
	`1044`	`+ nativeVlan := tc.vlan`
	`1045`	`+ if tc.vlan == 0 {`
	`1046`	`+ nativeVlan = 1`
	`1047`	`+ }`
	`1048`	`+ Expect(checkVlan(nativeVlan, vlans)).To(BeTrue())`
`1035`	`1049`	`}`
`1036`	`1050`
`1037`	`1051`	`// Check that the bridge has a different mac from the veth`
`@@ -1366,6 +1380,13 @@ func (tester *testerV03x) cmdAddTest(tc testCase, dataDir string) (types.Result,`
`1366`	`1380`	`}`
`1367`	`1381`	`}`
`1368`	`1382`	`}`
	`1383`	`+`
	`1384`	`+ // Check native vlan`
	`1385`	`+ nativeVlan := tc.vlan`
	`1386`	`+ if tc.vlan == 0 {`
	`1387`	`+ nativeVlan = 1`
	`1388`	`+ }`
	`1389`	`+ Expect(checkVlan(nativeVlan, vlans)).To(BeTrue())`
`1369`	`1390`	`}`
`1370`	`1391`
`1371`	`1392`	`// Check that the bridge has a different mac from the veth`
`@@ -2021,11 +2042,31 @@ var _ = Describe("bridge Operations", func() {`
`2021`	`2042`	`})`
`2022`	`2043`
`2023`	`2044`	`// TODO find some way to put pointer`
`2024`		`- It(fmt.Sprintf("[%s] configures and deconfigures a l2 bridge with vlan id 100, vlanTrunk 101,200~210 using ADD/DEL", ver), func() {`
	`2045`	`+ It(fmt.Sprintf("[%s] configures and deconfigures a l2 bridge with vlanTrunk 101,200~210 using ADD/DEL", ver), func() {`
	`2046`	`+ id, minID, maxID := 101, 200, 210`
	`2047`	`+ tc := testCase{`
	`2048`	`+ cniVersion: ver,`
	`2049`	`+ isLayer2: true,`
	`2050`	`+ vlanTrunk: []*VlanTrunk{`
	`2051`	`+ {ID: &id},`
	`2052`	`+ {`
	`2053`	`+ MinID: &minID,`
	`2054`	`+ MaxID: &maxID,`
	`2055`	`+ },`
	`2056`	`+ },`
	`2057`	`+ AddErr020: "cannot convert: no valid IP addresses",`
	`2058`	`+ AddErr010: "cannot convert: no valid IP addresses",`
	`2059`	`+ }`
	`2060`	`+ cmdAddDelTest(originalNS, targetNS, tc, dataDir)`
	`2061`	`+ })`
	`2062`	`+`
	`2063`	`+ It(fmt.Sprintf("[%s] configures and deconfigures a l2 bridge with vlan 100, and vlanTrunk 101,200~210 using ADD/DEL", ver), func() {`
	`2064`	`+ nativeVlan := 100`
`2025`	`2065`	`id, minID, maxID := 101, 200, 210`
`2026`	`2066`	`tc := testCase{`
`2027`	`2067`	`cniVersion: ver,`
`2028`	`2068`	`isLayer2: true,`
	`2069`	`+ vlan: nativeVlan,`
`2029`	`2070`	`vlanTrunk: []*VlanTrunk{`
`2030`	`2071`	`{ID: &id},`
`2031`	`2072`	`{`