Delete HO static mac bindings

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
ovn-org · Aug 16, 2023 · 6ec6a5a · 6ec6a5a
1 parent d28c03b
commit 6ec6a5a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/go-controller/pkg/ovn/hybrid.go b/go-controller/pkg/ovn/hybrid.go
@@ -288,7 +288,8 @@ func (oc *DefaultNetworkController) setupHybridLRPolicySharedGw(nodeSubnets []*n
 	return nil
 }
 
-func (oc *DefaultNetworkController) removeHybridLRPolicySharedGW(nodeName string) error {
+func (oc *DefaultNetworkController) removeHybridLRPolicySharedGW(node *kapi.Node) error {
+	nodeName := node.Name
 	name := ovntypes.HybridSubnetPrefix + nodeName
 
 	if err := libovsdbops.DeleteLogicalRouterPoliciesWithPredicate(oc.nbClient, ovntypes.OVNClusterRouter, func(item *nbdb.LogicalRouterPolicy) bool {
@@ -307,6 +308,18 @@ func (oc *DefaultNetworkController) removeHybridLRPolicySharedGW(nodeName string
 	}); err != nil {
 		return fmt.Errorf("failed to delete static route %s from %s, error: %v", name+"gr", ovntypes.GWRouterPrefix+nodeName, err)
 	}
+
+	if node.Annotations[hotypes.HybridOverlayDRIP] != "" {
+		smb := &nbdb.StaticMACBinding{
+			IP:          node.Annotations[hotypes.HybridOverlayDRIP],
+			LogicalPort: ovntypes.RouterToSwitchPrefix + nodeName,
+		}
+		err := libovsdbops.DeleteStaticMacBindings(oc.nbClient, smb)
+		if err != nil {
+			return fmt.Errorf("failed to delete static mac binding %+v: %v", smb, err)
+		}
+	}
+
 	return nil
 }
 

diff --git a/go-controller/pkg/ovn/hybrid_test.go b/go-controller/pkg/ovn/hybrid_test.go
@@ -518,6 +518,8 @@ var _ = ginkgo.Describe("Hybrid SDN Master Operations", func() {
 				return nil
 			}, 2).Should(gomega.Equal(libovsdbclient.ErrNotFound))
 
+			gomega.Eventually(clusterController.nbClient.Get(context.Background(), expectedStaticMACBinding), 2).Should(gomega.Equal(libovsdbclient.ErrNotFound))
+
 			return nil
 		}
 		err := app.Run([]string{

diff --git a/go-controller/pkg/ovn/master.go b/go-controller/pkg/ovn/master.go
@@ -959,7 +959,7 @@ func (oc *DefaultNetworkController) deleteNodeEvent(node *kapi.Node) error {
 		if _, ok := node.Annotations[hotypes.HybridOverlayDRMAC]; ok && !houtil.IsHybridOverlayNode(node) {
 			oc.deleteHybridOverlayPort(node)
 		}
-		if err := oc.removeHybridLRPolicySharedGW(node.Name); err != nil {
+		if err := oc.removeHybridLRPolicySharedGW(node); err != nil {
 			return err
 		}
 	}