feat: cni refactor for swift v2

cni/network/invoker.go

@@ -27,8 +27,18 @@ type IPAMAddConfig struct {
 }
 
 type IPAMAddResult struct {
-	ipv4Result       *cniTypesCurr.Result
-	ipv6Result       *cniTypesCurr.Result
+	// Splitting defaultInterfaceInfo from secondaryInterfacesInfo so we don't need to loop for default CNI result every time
+	defaultInterfaceInfo    InterfaceInfo
+	secondaryInterfacesInfo []InterfaceInfo
+	// ncResponse is used for Swift 1.0 multitenancy
 	ncResponse       *cns.GetNetworkContainerResponse
 	hostSubnetPrefix net.IPNet
+	ipv6Enabled      bool
+}
+
+type InterfaceInfo struct {
+	ipResult          *cniTypesCurr.Result
+	nicType           cns.NICType
+	macAddress        net.HardwareAddr
+	skipDefaultRoutes bool
 }

cni/network/invoker_azure.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/Azure/azure-container-networking/cni"
 	"github.com/Azure/azure-container-networking/cni/log"
+	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/ipam"
 	"github.com/Azure/azure-container-networking/network"
@@ -46,10 +47,7 @@ func NewAzureIpamInvoker(plugin *NetPlugin, nwInfo *network.NetworkInfo) *AzureI
 }
 
 func (invoker *AzureIPAMInvoker) Add(addConfig IPAMAddConfig) (IPAMAddResult, error) {
-	var (
-		addResult = IPAMAddResult{}
-		err       error
-	)
+	addResult := IPAMAddResult{}
 
 	if addConfig.nwCfg == nil {
 		return addResult, invoker.plugin.Errorf("nil nwCfg passed to CNI ADD, stack: %+v", string(debug.Stack()))
@@ -60,23 +58,25 @@ func (invoker *AzureIPAMInvoker) Add(addConfig IPAMAddConfig) (IPAMAddResult, er
 	}
 
 	// Call into IPAM plugin to allocate an address pool for the network.
-	addResult.ipv4Result, err = invoker.plugin.DelegateAdd(addConfig.nwCfg.IPAM.Type, addConfig.nwCfg)
-
+	result, err := invoker.plugin.DelegateAdd(addConfig.nwCfg.IPAM.Type, addConfig.nwCfg)
 	if err != nil && strings.Contains(err.Error(), ipam.ErrNoAvailableAddressPools.Error()) {
 		invoker.deleteIpamState()
 		logger.Info("Retry pool allocation after deleting IPAM state")
-		addResult.ipv4Result, err = invoker.plugin.DelegateAdd(addConfig.nwCfg.IPAM.Type, addConfig.nwCfg)
+		result, err = invoker.plugin.DelegateAdd(addConfig.nwCfg.IPAM.Type, addConfig.nwCfg)
 	}
 
 	if err != nil {
 		err = invoker.plugin.Errorf("Failed to allocate pool: %v", err)
 		return addResult, err
 	}
+	if len(result.IPs) > 0 {
+		addResult.hostSubnetPrefix = result.IPs[0].Address
+	}
 
 	defer func() {
 		if err != nil {
-			if len(addResult.ipv4Result.IPs) > 0 {
-				if er := invoker.Delete(&addResult.ipv4Result.IPs[0].Address, addConfig.nwCfg, nil, addConfig.options); er != nil {
+			if len(addResult.defaultInterfaceInfo.ipResult.IPs) > 0 {
+				if er := invoker.Delete(&addResult.defaultInterfaceInfo.ipResult.IPs[0].Address, addConfig.nwCfg, nil, addConfig.options); er != nil {
 					err = invoker.plugin.Errorf("Failed to clean up IP's during Delete with error %v, after Add failed with error %w", er, err)
 				}
 			} else {
@@ -95,13 +95,18 @@ func (invoker *AzureIPAMInvoker) Add(addConfig IPAMAddConfig) (IPAMAddResult, er
 			nwCfg6.IPAM.Subnet = invoker.nwInfo.Subnets[1].Prefix.String()
 		}
 
-		addResult.ipv6Result, err = invoker.plugin.DelegateAdd(nwCfg6.IPAM.Type, &nwCfg6)
+		var ipv6Result *cniTypesCurr.Result
+		ipv6Result, err = invoker.plugin.DelegateAdd(nwCfg6.IPAM.Type, &nwCfg6)
 		if err != nil {
 			err = invoker.plugin.Errorf("Failed to allocate v6 pool: %v", err)
+		} else {
+			result.IPs = append(result.IPs, ipv6Result.IPs...)
+			result.Routes = append(result.Routes, ipv6Result.Routes...)
+			addResult.ipv6Enabled = true
 		}
 	}
 
-	addResult.hostSubnetPrefix = addResult.ipv4Result.IPs[0].Address
+	addResult.defaultInterfaceInfo = InterfaceInfo{ipResult: result, nicType: cns.InfraNIC}
 
 	return addResult, err
 }

cni/network/invoker_azure_test.go

@@ -16,16 +16,24 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+const (
+	ipv4cidr  = "10.0.0.1/24"
+	v4NetCidr = "10.0.0.0/24"
+	ipv4cidr2 = "10.0.0.4/24"
+	ipv6cidr  = "2001:0db8:abcd:0015::0/64"
+	v6NetCidr = "2001:db8:abcd:0012::0/64"
+)
+
 type mockDelegatePlugin struct {
 	add
 	del
 }
 
 type add struct {
+	resultsIPv4      []*cniTypesCurr.Result
+	resultsIPv6      []*cniTypesCurr.Result
 	resultsIPv4Index int
-	resultsIPv4      [](*cniTypesCurr.Result)
 	resultsIPv6Index int
-	resultsIPv6      [](*cniTypesCurr.Result)
 	errv4            error
 	errv6            error
 }
@@ -82,8 +90,8 @@ func getCIDRNotationForAddress(ipaddresswithcidr string) *net.IPNet {
 	return ipnet
 }
 
-func getResult(ip string) []*cniTypesCurr.Result {
-	res := []*cniTypesCurr.Result{
+func getSingleResult(ip string) []*cniTypesCurr.Result {
+	return []*cniTypesCurr.Result{
 		{
 			IPs: []*cniTypesCurr.IPConfig{
 				{
@@ -92,6 +100,14 @@ func getResult(ip string) []*cniTypesCurr.Result {
 			},
 		},
 	}
+}
+
+// getResult will return a slice of IPConfigs
+func getResult(ips ...string) *cniTypesCurr.Result {
+	res := &cniTypesCurr.Result{}
+	for _, ip := range ips {
+		res.IPs = append(res.IPs, &cniTypesCurr.IPConfig{Address: *getCIDRNotationForAddress(ip)})
+	}
 	return res
 }
 
@@ -127,46 +143,44 @@ func TestAzureIPAMInvoker_Add(t *testing.T) {
 		fields  fields
 		args    args
 		want    *cniTypesCurr.Result
-		want1   *cniTypesCurr.Result
 		wantErr bool
 	}{
 		{
 			name: "happy add ipv4",
 			fields: fields{
 				plugin: &mockDelegatePlugin{
 					add: add{
-						resultsIPv4: getResult("10.0.0.1/24"),
+						resultsIPv4: getSingleResult(ipv4cidr),
 					},
 					del: del{},
 				},
-				nwInfo: getNwInfo("10.0.0.0/24", ""),
+				nwInfo: getNwInfo(v4NetCidr, ""),
 			},
 			args: args{
 				nwCfg:        &cni.NetworkConfig{},
-				subnetPrefix: getCIDRNotationForAddress("10.0.0.0/24"),
+				subnetPrefix: getCIDRNotationForAddress(v4NetCidr),
 			},
-			want:    getResult("10.0.0.1/24")[0],
+			want:    getResult(ipv4cidr),
 			wantErr: false,
 		},
 		{
 			name: "happy add ipv4+ipv6",
 			fields: fields{
 				plugin: &mockDelegatePlugin{
 					add: add{
-						resultsIPv4: getResult("10.0.0.1/24"),
-						resultsIPv6: getResult("2001:0db8:abcd:0015::0/64"),
+						resultsIPv4: getSingleResult(ipv4cidr),
+						resultsIPv6: getSingleResult(ipv6cidr),
 					},
 				},
-				nwInfo: getNwInfo("10.0.0.0/24", "2001:db8:abcd:0012::0/64"),
+				nwInfo: getNwInfo(v4NetCidr, v6NetCidr),
 			},
 			args: args{
 				nwCfg: &cni.NetworkConfig{
 					IPV6Mode: network.IPV6Nat,
 				},
-				subnetPrefix: getCIDRNotationForAddress("10.0.0.0/24"),
+				subnetPrefix: getCIDRNotationForAddress(v4NetCidr),
 			},
-			want:    getResult("10.0.0.1/24")[0],
-			want1:   getResult("2001:0db8:abcd:0015::0/64")[0],
+			want:    getResult(ipv4cidr, ipv6cidr),
 			wantErr: false,
 		},
 		{
@@ -177,34 +191,32 @@ func TestAzureIPAMInvoker_Add(t *testing.T) {
 						errv4: errors.New("test error"), //nolint:goerr113
 					},
 				},
-				nwInfo: getNwInfo("10.0.0.0/24", ""),
+				nwInfo: getNwInfo(v4NetCidr, ""),
 			},
 			args: args{
 				nwCfg: &cni.NetworkConfig{},
 			},
 			want:    nil,
-			want1:   nil,
 			wantErr: true,
 		},
 		{
 			name: "error on ipv4+ipv6",
 			fields: fields{
 				plugin: &mockDelegatePlugin{
 					add: add{
-						resultsIPv4: getResult("10.0.0.1/24"),
+						resultsIPv4: getSingleResult(ipv4cidr),
 						errv6:       errors.New("test v6 error"), //nolint:goerr113
 					},
 				},
-				nwInfo: getNwInfo("10.0.0.0/24", ""),
+				nwInfo: getNwInfo(v4NetCidr, ""),
 			},
 			args: args{
 				nwCfg: &cni.NetworkConfig{
 					IPV6Mode: network.IPV6Nat,
 				},
-				subnetPrefix: getCIDRNotationForAddress("10.0.0.0/24"),
+				subnetPrefix: getCIDRNotationForAddress(v4NetCidr),
 			},
-			want:    getResult("10.0.0.1/24")[0],
-			want1:   nil,
+			want:    getResult(ipv4cidr),
 			wantErr: true,
 		},
 	}
@@ -226,8 +238,8 @@ func TestAzureIPAMInvoker_Add(t *testing.T) {
 				require.Nil(err)
 			}
 
-			require.Exactly(tt.want, ipamAddResult.ipv4Result)
-			require.Exactly(tt.want1, ipamAddResult.ipv6Result)
+			fmt.Printf("want:%+v\nrest:%+v\n", tt.want, ipamAddResult.defaultInterfaceInfo.ipResult)
+			require.Exactly(tt.want, ipamAddResult.defaultInterfaceInfo.ipResult)
 		})
 	}
 }
@@ -256,10 +268,10 @@ func TestAzureIPAMInvoker_Delete(t *testing.T) {
 				plugin: &mockDelegatePlugin{
 					del: del{},
 				},
-				nwInfo: getNwInfo("10.0.0.0/24", ""),
+				nwInfo: getNwInfo(v4NetCidr, ""),
 			},
 			args: args{
-				address: getCIDRNotationForAddress("10.0.0.4/24"),
+				address: getCIDRNotationForAddress(ipv4cidr2),
 				nwCfg: &cni.NetworkConfig{
 					IPAM: cni.IPAM{
 						Address: "10.0.0.4",
@@ -273,7 +285,7 @@ func TestAzureIPAMInvoker_Delete(t *testing.T) {
 				plugin: &mockDelegatePlugin{
 					del: del{},
 				},
-				nwInfo: getNwInfo("10.0.0.0/24", "2001:db8:abcd:0012::0/64"),
+				nwInfo: getNwInfo(v4NetCidr, v6NetCidr),
 			},
 			args: args{
 				address: getCIDRNotationForAddress("2001:db8:abcd:0015::0/64"),
@@ -292,7 +304,7 @@ func TestAzureIPAMInvoker_Delete(t *testing.T) {
 						err: errors.New("error when address is nil"), //nolint:goerr113
 					},
 				},
-				nwInfo: getNwInfo("", "2001:db8:abcd:0012::0/64"),
+				nwInfo: getNwInfo("", v6NetCidr),
 			},
 			args: args{
 				address: nil,
@@ -312,13 +324,13 @@ func TestAzureIPAMInvoker_Delete(t *testing.T) {
 						err: errors.New("error on v4 delete"), //nolint:goerr113
 					},
 				},
-				nwInfo: getNwInfo("10.0.0.0/24", ""),
+				nwInfo: getNwInfo(v4NetCidr, ""),
 			},
 			args: args{
-				address: getCIDRNotationForAddress("10.0.0.4/24"),
+				address: getCIDRNotationForAddress(ipv4cidr2),
 				nwCfg: &cni.NetworkConfig{
 					IPAM: cni.IPAM{
-						Address: "10.0.0.4/24",
+						Address: ipv4cidr2,
 					},
 				},
 			},
@@ -332,13 +344,13 @@ func TestAzureIPAMInvoker_Delete(t *testing.T) {
 						err: errors.New("error on v6 delete"), //nolint:goerr113
 					},
 				},
-				nwInfo: getNwInfo("10.0.0.0/24", "2001:db8:abcd:0012::0/64"),
+				nwInfo: getNwInfo(v4NetCidr, v6NetCidr),
 			},
 			args: args{
 				address: getCIDRNotationForAddress("2001:db8:abcd:0015::0/64"),
 				nwCfg: &cni.NetworkConfig{
 					IPAM: cni.IPAM{
-						Address: "10.0.0.4/24",
+						Address: ipv4cidr2,
 					},
 				},
 			},
@@ -393,17 +405,17 @@ func TestRemoveIpamState_Add(t *testing.T) {
 			fields: fields{
 				plugin: &mockDelegatePlugin{
 					add: add{
-						resultsIPv4: getResult("10.0.0.1/24"),
+						resultsIPv4: getSingleResult(ipv4cidr),
 						errv4:       ipam.ErrNoAvailableAddressPools,
 					},
 				},
-				nwInfo: getNwInfo("10.0.0.0/24", ""),
+				nwInfo: getNwInfo(v4NetCidr, ""),
 			},
 			args: args{
 				nwCfg:        &cni.NetworkConfig{},
-				subnetPrefix: getCIDRNotationForAddress("10.0.0.0/24"),
+				subnetPrefix: getCIDRNotationForAddress(v4NetCidr),
 			},
-			want:       getResult("10.0.0.1/24")[0],
+			want:       getResult(ipv4cidr),
 			wantErrMsg: ipam.ErrNoAvailableAddressPools.Error(),
 			wantErr:    true,
 		},