bridge: add/del vlan range

[tjjh89017]

Allow user to add vlan range in one rtnetlink call.
Usually, users will want to allow all vlans (2~4094) for some ports via iproute2 command (as below)

bridge vlan add vid 2-4094 dev dum0

Avoid to call rtnetlink 4000 times.
We should invlove vlan range to the modify function.

NOTE: original function didn't check if the vlan value is valid, so I didn't add validation.

[tjjh89017]

@vishvananda @aboch please take a look
thanks a lot

[aboch]

Thanks @tjjh89017
Can you please address the minor comments, then we merge this.

[tjjh89017]

Thanks @tjjh89017 Can you please address the minor comments, then we merge this.

Hi @aboch
I didn't see any comment in the review?
Did you send the review already?
Thank you!

[aboch]

I would remove the else and have only one instance of

br.AddRtAttr(nl.IFLA_BRIDGE_VLAN_INFO, vlanInfo.Serialize())

invoked after the if block.

[tjjh89017]

according to the testing.
We can not add "vlanInfo" after the "vlanEndInfo".
It will cause that only the last vlan will be added into the bridge.
e.g. add vlan 4~6, but only vlan6 is added.

Thank you!

[aboch]

Thank you for checking.

[aboch]

sorry, I published the comments now

[tjjh89017]

Hi @aboch
I updated the code with your comment.
But Test is failed.
So I rollback to the original commit.

[tjjh89017]

@aboch
If we added BRIDGE_VLAN_INFO_RANGE_BEGIN after BRIDGE_VLAN_INFO_RANGE_END.
It will only add the last vlan into the bridge.
That is not our purpose.
So I have to rollback it.
Please check the orginal code.
Thank you!

=== RUN   TestBridgeVlan
    bridge_linux_test.go:76: unexpected result [{Flags:4 Vid:1} {Flags:0 Vid:2} {Flags:6 Vid:3} {Flags:0 Vid:6}]

It should be vlan4,5,6.
But only vlan6 is here.

Failed Code

diff --git a/bridge_linux.go b/bridge_linux.go
index 6c340b0..9f0903b 100644
--- a/bridge_linux.go
+++ b/bridge_linux.go
@@ -134,14 +134,12 @@ func (h *Handle) bridgeVlanModify(cmd int, link Link, vid, vidEnd uint16, pvid,
                vlanEndInfo := &nl.BridgeVlanInfo{Vid: vidEnd}
                vlanEndInfo.Flags = vlanInfo.Flags

-               vlanInfo.Flags |= nl.BRIDGE_VLAN_INFO_RANGE_BEGIN
-               br.AddRtAttr(nl.IFLA_BRIDGE_VLAN_INFO, vlanInfo.Serialize())

                vlanEndInfo.Flags |= nl.BRIDGE_VLAN_INFO_RANGE_END
                br.AddRtAttr(nl.IFLA_BRIDGE_VLAN_INFO, vlanEndInfo.Serialize())
-       } else {
-               br.AddRtAttr(nl.IFLA_BRIDGE_VLAN_INFO, vlanInfo.Serialize())
+               vlanInfo.Flags |= nl.BRIDGE_VLAN_INFO_RANGE_BEGIN
        }
+       br.AddRtAttr(nl.IFLA_BRIDGE_VLAN_INFO, vlanInfo.Serialize())

        req.AddData(br)
        _, err := req.Execute(unix.NETLINK_ROUTE, 0)

[aboch]

LGTM