refactor: address Tim's comment

Author: santhoshmprabhu

cns/service/main.go

@@ -1123,13 +1123,13 @@ type nodeNetworkConfigGetter interface {
 	Get(context.Context) (*v1alpha.NodeNetworkConfig, error)
 }
 
-type ipamStateReconciler interface {
+type IpamStateReconciler interface {
 	ReconcileIPAMState(ncRequests []*cns.CreateNetworkContainerRequest, podInfoByIP map[string]cns.PodInfo, nnc *v1alpha.NodeNetworkConfig) cnstypes.ResponseCode
 }
 
 // TODO(rbtr) where should this live??
 // reconcileInitialCNSState initializes cns by passing pods and a CreateNetworkContainerRequest
-func reconcileInitialCNSState(ctx context.Context, cli nodeNetworkConfigGetter, ipamReconciler ipamStateReconciler, podInfoByIPProvider cns.PodInfoByIPProvider) error {
+func reconcileInitialCNSState(ctx context.Context, cli nodeNetworkConfigGetter, ipamReconciler IpamStateReconciler, podInfoByIPProvider cns.PodInfoByIPProvider) error {
 	// Get nnc using direct client
 	nnc, err := cli.Get(ctx)
 	if err != nil {

nmagent/equality.go

@@ -1,30 +1,25 @@
 package nmagent
 
-// equalPtr compares two Interfaces objects for equality.
-func (i *Interfaces) equalPtr(other *Interfaces) bool {
+// Equal compares two Interfaces objects for equality.
+func (i Interfaces) Equal(other Interfaces) bool {
 	if len(i.Entries) != len(other.Entries) {
 		return false
 	}
 	for idx, entry := range i.Entries {
-		if !entry.equalPtr(&other.Entries[idx]) {
+		if !entry.Equal(other.Entries[idx]) {
 			return false
 		}
 	}
 	return true
 }
 
-// Equal compares two Interfaces objects for equality.
-func (i Interfaces) Equal(other Interfaces) bool {
-	return i.equalPtr(&other)
-}
-
-// equalPtr compares two Interface objects for equality.
-func (i *Interface) equalPtr(other *Interface) bool {
+// Equal compares two Interface objects for equality.
+func (i Interface) Equal(other Interface) bool {
 	if len(i.InterfaceSubnets) != len(other.InterfaceSubnets) {
 		return false
 	}
 	for idx, subnet := range i.InterfaceSubnets {
-		if !subnet.equalPtr(&other.InterfaceSubnets[idx]) {
+		if !subnet.Equal(other.InterfaceSubnets[idx]) {
 			return false
 		}
 	}
@@ -34,38 +29,23 @@ func (i *Interface) equalPtr(other *Interface) bool {
 	return true
 }
 
-// Equal compares two Interface objects for equality.
-func (i Interface) Equal(other Interface) bool {
-	return i.equalPtr(&other)
-}
-
-// equalPtr compares two InterfaceSubnet objects for equality.
-func (s *InterfaceSubnet) equalPtr(other *InterfaceSubnet) bool {
+// Equal compares two InterfaceSubnet objects for equality.
+func (s InterfaceSubnet) Equal(other InterfaceSubnet) bool {
 	if len(s.IPAddress) != len(other.IPAddress) {
 		return false
 	}
 	if s.Prefix != other.Prefix {
 		return false
 	}
 	for idx, ip := range s.IPAddress {
-		if !ip.equalPtr(&other.IPAddress[idx]) {
+		if !ip.Equal(other.IPAddress[idx]) {
 			return false
 		}
 	}
 	return true
 }
 
-// Equal compares two InterfaceSubnet objects for equality.
-func (s InterfaceSubnet) Equal(other InterfaceSubnet) bool {
-	return s.equalPtr(&other)
-}
-
-// equalPtr compares two NodeIP objects for equality.
-func (ip *NodeIP) equalPtr(other *NodeIP) bool {
-	return ip.IsPrimary == other.IsPrimary && ip.Address.Equal(other.Address)
-}
-
 // Equal compares two NodeIP objects for equality.
 func (ip NodeIP) Equal(other NodeIP) bool {
-	return ip.equalPtr(&other)
+	return ip.IsPrimary == other.IsPrimary && ip.Address.Equal(other.Address)
 }