hardcoding interface for routes

Author: rjdenney

azure-ipam/ipam.go

@@ -81,7 +81,7 @@ func (p *IPAMPlugin) CmdAdd(args *cniSkel.CmdArgs) error {
 	p.logger.Debug("Making request to CNS")
 	// if this fails, the caller plugin should execute again with cmdDel before returning error.
 	// https://www.cni.dev/docs/spec/#delegated-plugin-execution-procedure
-	resp, err := p.cnsClient.RequestIPs(context.TODO(), req)
+	resp, err := p.cnsClient.RequestIPs(context.TODO(), req) // need to add interfaces to this response
 	if err != nil {
 		if cnscli.IsUnsupportedAPI(err) {
 			p.logger.Error("Failed to request IPs using RequestIPs from CNS, going to try RequestIPAddress", zap.Error(err), zap.Any("request", req))
@@ -115,12 +115,12 @@ func (p *IPAMPlugin) CmdAdd(args *cniSkel.CmdArgs) error {
 	p.logger.Debug("Received CNS IP config response", zap.Any("response", resp))
 
 	// Get Pod IP and gateway IP from ip config response
-	podIPNet, err := ipconfig.ProcessIPConfigsResp(resp)
+	podIPNet, err := ipconfig.ProcessIPConfigsResp(resp) // need to get interfaces out of the response and add it here
 	if err != nil {
 		p.logger.Error("Failed to interpret CNS IPConfigResponse", zap.Error(err), zap.Any("response", resp))
 		return cniTypes.NewError(ErrProcessIPConfigResponse, err.Error(), "failed to interpret CNS IPConfigResponse")
 	}
-	cniResult := &types100.Result{}
+	cniResult := &types100.Result{} // need toi add interfaces to this response
 	cniResult.IPs = make([]*types100.IPConfig, len(*podIPNet))
 	for i, ipNet := range *podIPNet {
 		p.logger.Debug("Parsed pod IP", zap.String("podIPNet", ipNet.String()))
@@ -130,15 +130,21 @@ func (p *IPAMPlugin) CmdAdd(args *cniSkel.CmdArgs) error {
 				IP:   net.ParseIP(ipNet.Addr().String()),
 				Mask: net.CIDRMask(ipNet.Bits(), 32), // nolint
 			}
+			var interf int = 1
+			ipConfig.Interface = &interf
 		} else {
 			ipConfig.Address = net.IPNet{
 				IP:   net.ParseIP(ipNet.Addr().String()),
 				Mask: net.CIDRMask(ipNet.Bits(), 128), // nolint
 			}
+			var interf int = 1
+			ipConfig.Interface = &interf
 		}
 		cniResult.IPs[i] = ipConfig
 	}
 
+	p.logger.Info("Created CNIResult:", zap.Any("result", cniResult))
+
 	// Get versioned result
 	versionedCniResult, err := cniResult.GetAsVersion(nwCfg.CNIVersion)
 	if err != nil {

cns/restserver/util.go

@@ -846,7 +846,8 @@ func (service *HTTPRestService) populateIPConfigInfoUntransacted(ipConfigStatus
 	podIPInfo.HostPrimaryIPInfo.Subnet = primaryHostInterface.Subnet
 	podIPInfo.HostPrimaryIPInfo.Gateway = primaryHostInterface.Gateway
 	podIPInfo.NICType = cns.InfraNIC
-
+	podIPInfo.InterfaceName = service.wscli.GetInterfaces()
+	fmt.Printf("podIPInfo after adding interface: %+v", podIPInfo)
 	return nil
 }