feat(bridge): decouple linux devname from object resource id

Signed-off-by: Boris Glimcher <Boris.Glimcher@emc.com>
opiproject · Aug 30, 2023 · e21063e · e21063e
1 parent 0ae986a
commit e21063e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/pkg/evpn/bridge.go b/pkg/evpn/bridge.go
@@ -71,7 +71,8 @@ func (s *Server) CreateLogicalBridge(_ context.Context, in *pb.CreateLogicalBrid
 		myip := make(net.IP, 4)
 		// TODO: remove hard-coded 167772162 == "10.0.0.2"
 		binary.BigEndian.PutUint32(myip, 167772162)
-		vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: resourceID}, VxlanId: int(*in.LogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
+		vxlanName := fmt.Sprintf("vni%d", *in.LogicalBridge.Spec.Vni)
+		vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: vxlanName}, VxlanId: int(*in.LogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
 		log.Printf("Creating Vxlan %v", vxlan)
 		// TODO: take Port from proto instead of hard-coded
 		if err := s.nLink.LinkAdd(vxlan); err != nil {
@@ -125,13 +126,13 @@ func (s *Server) DeleteLogicalBridge(_ context.Context, in *pb.DeleteLogicalBrid
 		log.Printf("error: %v", err)
 		return nil, err
 	}
-	resourceID := path.Base(obj.Name)
 	// only if VNI is not empty
 	if obj.Spec.Vni != nil {
 		// use netlink to find vxlan device
-		vxlan, err := s.nLink.LinkByName(resourceID)
+		vxlanName := fmt.Sprintf("vni%d", *obj.Spec.Vni)
+		vxlan, err := s.nLink.LinkByName(vxlanName)
 		if err != nil {
-			err := status.Errorf(codes.NotFound, "unable to find key %s", resourceID)
+			err := status.Errorf(codes.NotFound, "unable to find key %s", vxlanName)
 			log.Printf("error: %v", err)
 			return nil, err
 		}

diff --git a/pkg/evpn/bridge_test.go b/pkg/evpn/bridge_test.go
@@ -195,22 +195,25 @@ func Test_CreateLogicalBridge(t *testing.T) {
 				// myip := net.ParseIP("10.0.0.2")
 				myip := make(net.IP, 4)
 				binary.BigEndian.PutUint32(myip, 167772162)
-				vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: testLogicalBridgeID}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
+				vxlanName := fmt.Sprintf("vni%d", *testLogicalBridge.Spec.Vni)
+				vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: vxlanName}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
 				bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
 				mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
 				mockNetlink.EXPECT().LinkAdd(vxlan).Return(errors.New(tt.errMsg)).Once()
 			} else if strings.Contains(name, "failed LinkSetMaster") {
 				myip := make(net.IP, 4)
 				binary.BigEndian.PutUint32(myip, 167772162)
-				vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: testLogicalBridgeID}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
+				vxlanName := fmt.Sprintf("vni%d", *testLogicalBridge.Spec.Vni)
+				vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: vxlanName}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
 				bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
 				mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
 				mockNetlink.EXPECT().LinkAdd(vxlan).Return(nil).Once()
 				mockNetlink.EXPECT().LinkSetMaster(vxlan, bridge).Return(errors.New(tt.errMsg)).Once()
 			} else if strings.Contains(name, "failed LinkSetUp") {
 				myip := make(net.IP, 4)
 				binary.BigEndian.PutUint32(myip, 167772162)
-				vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: testLogicalBridgeID}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
+				vxlanName := fmt.Sprintf("vni%d", *testLogicalBridge.Spec.Vni)
+				vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: vxlanName}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
 				bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
 				mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
 				mockNetlink.EXPECT().LinkAdd(vxlan).Return(nil).Once()
@@ -219,7 +222,8 @@ func Test_CreateLogicalBridge(t *testing.T) {
 			} else if strings.Contains(name, "failed BridgeVlanAdd") {
 				myip := make(net.IP, 4)
 				binary.BigEndian.PutUint32(myip, 167772162)
-				vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: testLogicalBridgeID}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
+				vxlanName := fmt.Sprintf("vni%d", *testLogicalBridge.Spec.Vni)
+				vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: vxlanName}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
 				bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
 				mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
 				mockNetlink.EXPECT().LinkAdd(vxlan).Return(nil).Once()