Enable CNS swiftv2 path for SF/Standalone scenario to program secondary nics

cns/NetworkContainerContract.go

@@ -457,6 +457,7 @@ type PodIpInfo struct {
 	PodIPConfig                     IPSubnet
 	NetworkContainerPrimaryIPConfig IPConfiguration
 	HostPrimaryIPInfo               HostIPInfo
+	HostSecondaryIPInfo             HostIPInfo
 	// NICType defines whether NIC is InfraNIC or DelegatedVMNIC or BackendNIC
 	NICType       NICType
 	InterfaceName string
@@ -466,12 +467,15 @@ type PodIpInfo struct {
 	SkipDefaultRoutes bool
 	// Routes to configure on interface
 	Routes []Route
+	// AddInterfacesDataToPodInfo is set to true for SF SwiftV2 scenario
+	AddInterfacesDataToPodInfo bool
 }
 
 type HostIPInfo struct {
-	Gateway   string
-	PrimaryIP string
-	Subnet    string
+	Gateway     string
+	PrimaryIP   string
+	SecondaryIP string
+	Subnet      string
 }
 
 type IPConfigRequest struct {

cns/api.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net"
 	"time"
 
 	"github.com/Azure/azure-container-networking/cns/common"
@@ -364,3 +365,35 @@ type EndpointRequest struct {
 	HnsEndpointID string `json:"hnsEndpointID"`
 	HostVethName  string `json:"hostVethName"`
 }
+
+// GetEndpointResponse describes response from the The GetEndpoint API.
+type GetEndpointResponse struct {
+	Response     Response     `json:"response"`
+	EndpointInfo EndpointInfo `json:"endpointInfo"`
+}
+
+type EndpointInfo struct {
+	PodName       string
+	PodNamespace  string
+	IfnameToIPMap map[string]*IPInfo // key : interface name, value : IPInfo
+	HnsEndpointID string
+	HostVethName  string
+}
+type IPInfo struct {
+	IPv4 []net.IPNet
+	IPv6 []net.IPNet
+}
+
+type GetHTTPServiceDataResponse struct {
+	HTTPRestServiceData HTTPRestServiceData `json:"HTTPRestServiceData"`
+	Response            Response            `json:"response"`
+}
+
+// HTTPRestServiceData represents in-memory CNS data in the debug API paths.
+// PodInterfaceId is key and value is slice of Pod IP uuids in PodIPIDByPodInterfaceKey
+// secondaryipid(uuid) is key for PodIPConfigState
+type HTTPRestServiceData struct {
+	PodIPIDByPodInterfaceKey map[string][]string              `json:"podIPIDByPodInterfaceKey"`
+	PodIPConfigState         map[string]IPConfigurationStatus `json:"podIpConfigState"`
+	IPAMPoolMonitor          IpamPoolMonitorStateSnapshot     `json:"ipamPoolMonitor"`
+}

cns/client/client.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/Azure/azure-container-networking/cns"
-	"github.com/Azure/azure-container-networking/cns/restserver"
 	"github.com/Azure/azure-container-networking/cns/types"
 	"github.com/pkg/errors"
 )
@@ -563,7 +562,7 @@ func (c *Client) GetPodOrchestratorContext(ctx context.Context) (map[string][]st
 }
 
 // GetHTTPServiceData gets all public in-memory struct details for debugging purpose
-func (c *Client) GetHTTPServiceData(ctx context.Context) (*restserver.GetHTTPServiceDataResponse, error) {
+func (c *Client) GetHTTPServiceData(ctx context.Context) (*cns.GetHTTPServiceDataResponse, error) {
 	u := c.routes[cns.PathDebugRestData]
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
 	if err != nil {
@@ -583,7 +582,7 @@ func (c *Client) GetHTTPServiceData(ctx context.Context) (*restserver.GetHTTPSer
 	if res.StatusCode != http.StatusOK {
 		return nil, errors.Errorf("http response %d", res.StatusCode)
 	}
-	var resp restserver.GetHTTPServiceDataResponse
+	var resp cns.GetHTTPServiceDataResponse
 	err = json.NewDecoder(bytes.NewReader(b)).Decode(&resp)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to decode GetHTTPServiceDataResponse")
@@ -1024,7 +1023,7 @@ func (c *Client) GetHomeAz(ctx context.Context) (*cns.GetHomeAzResponse, error)
 }
 
 // GetEndpoint calls the EndpointHandlerAPI in CNS to retrieve the state of a given EndpointID
-func (c *Client) GetEndpoint(ctx context.Context, endpointID string) (*restserver.GetEndpointResponse, error) {
+func (c *Client) GetEndpoint(ctx context.Context, endpointID string) (*cns.GetEndpointResponse, error) {
 	// build the request
 	u := c.routes[cns.EndpointAPI]
 	uString := u.String() + endpointID
@@ -1044,7 +1043,7 @@ func (c *Client) GetEndpoint(ctx context.Context, endpointID string) (*restserve
 		return nil, errors.Errorf("http response %d", res.StatusCode)
 	}
 
-	var response restserver.GetEndpointResponse
+	var response cns.GetEndpointResponse
 	err = json.NewDecoder(res.Body).Decode(&response)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to decode GetEndpointResponse")