fix conflict

kubeovn · Aug 14, 2023 · 6dc3f03 · 6dc3f03
1 parent b998768
commit 6dc3f03
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/mocks/pkg/ovs/interface.go b/mocks/pkg/ovs/interface.go
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -761,12 +761,12 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 
 	multicastSnoopFlag := map[string]string{"mcast_snoop": "true", "mcast_querier": "false"}
 	if subnet.Spec.EnableMulicastSnoop {
-		if err := c.ovnClient.LogicalSwitchUpdateOtherConfig(subnet.Name, ovsdb.MutateOperationInsert, multicastSnoopFlag); err != nil {
+		if err := c.ovnNbClient.LogicalSwitchUpdateOtherConfig(subnet.Name, ovsdb.MutateOperationInsert, multicastSnoopFlag); err != nil {
 			klog.Errorf("enable logical switch multicast snoop %s: %v", subnet.Name, err)
 			return err
 		}
 	} else {
-		if err := c.ovnClient.LogicalSwitchUpdateOtherConfig(subnet.Name, ovsdb.MutateOperationDelete, multicastSnoopFlag); err != nil {
+		if err := c.ovnNbClient.LogicalSwitchUpdateOtherConfig(subnet.Name, ovsdb.MutateOperationDelete, multicastSnoopFlag); err != nil {
 			klog.Errorf("disable logical switch multicast snoop  %s: %v", subnet.Name, err)
 			return err
 		}

diff --git a/pkg/ovs/ovn-nb-logical_switch.go b/pkg/ovs/ovn-nb-logical_switch.go
@@ -171,7 +171,7 @@ func (c *ovnNbClient) LogicalSwitchUpdateLoadBalancers(lsName string, op ovsdb.M
 }
 
 // LogicalSwitchUpdateOtherConfig add other config to or from logical switch once
-func (c *ovnClient) LogicalSwitchUpdateOtherConfig(lsName string, op ovsdb.Mutator, otherConfig map[string]string) error {
+func (c *ovnNbClient) LogicalSwitchUpdateOtherConfig(lsName string, op ovsdb.Mutator, otherConfig map[string]string) error {
 	if len(otherConfig) == 0 {
 		return nil
 	}
@@ -306,7 +306,7 @@ func (c *ovnNbClient) LogicalSwitchUpdatePortOp(lsName string, lspUUID string, o
 }
 
 // LogicalSwitchUpdateOtherConfigOp create operations add otherConfig to or delete otherConfig from logical switch
-func (c *ovnClient) LogicalSwitchUpdateOtherConfigOp(lsName string, otherConfig map[string]string, op ovsdb.Mutator) ([]ovsdb.Operation, error) {
+func (c *ovnNbClient) LogicalSwitchUpdateOtherConfigOp(lsName string, otherConfig map[string]string, op ovsdb.Mutator) ([]ovsdb.Operation, error) {
 	if len(otherConfig) == 0 {
 		return nil, nil
 	}