Merge branch 'master' of github.com:sharmasushant/azure-container-networking into fork-master

Author: sharmasushant

cni/network/network_windows.go

@@ -1,6 +1,7 @@
 package network
 
 import (
+	"fmt"
 	"net"
 
 	"github.com/Azure/azure-container-networking/cni"
@@ -19,7 +20,7 @@ import (
  * Issue link: https://github.com/kubernetes/kubernetes/issues/57253
  */
 func handleConsecutiveAdd(containerId, endpointId string, nwInfo *network.NetworkInfo, nwCfg *cni.NetworkConfig) (*cniTypesCurr.Result, error) {
-	hnsEndpoint, _ := hcsshim.GetHNSEndpointByName(endpointId)
+	hnsEndpoint, err := hcsshim.GetHNSEndpointByName(endpointId)
 	if hnsEndpoint != nil {
 		log.Printf("[net] Found existing endpoint through hcsshim: %+v", hnsEndpoint)
 		log.Printf("[net] Attaching ep %v to container %v", hnsEndpoint.Id, containerId)
@@ -55,7 +56,8 @@ func handleConsecutiveAdd(containerId, endpointId string, nwInfo *network.Networ
 		return result, nil
 	}
 
-	return nil, nil
+	err = fmt.Errorf("GetHNSEndpointByName for %v returned nil with err %v", endpointId, err)
+	return nil, err
 }
 
 func addDefaultRoute(gwIPString string, epInfo *network.EndpointInfo, result *cniTypesCurr.Result) {

cns/NetworkContainerContract.go

@@ -16,11 +16,13 @@ const (
 const (
 	AzureContainerInstance = "AzureContainerInstance"
 	WebApps                = "WebApps"
+	ClearContainer         = "ClearContainer"
 )
 
 // Orchestrator Types
 const (
-	Kubernetes = "Kubernetes"
+	Kubernetes    = "Kubernetes"
+	ServiceFabric = "ServiceFabric"
 )
 
 // Encap Types

cns/restserver/restserver.go

@@ -820,14 +820,9 @@ func (service *httpRestService) setOrchestratorType(w http.ResponseWriter, r *ht
 	service.lock.Lock()
 
 	switch req.OrchestratorType {
-	case cns.Kubernetes:
-		service.state.OrchestratorType = cns.Kubernetes
+	case cns.ServiceFabric, cns.Kubernetes, cns.WebApps:
+		service.state.OrchestratorType = req.OrchestratorType
 		service.saveState()
-		break
-	case cns.WebApps:
-		service.state.OrchestratorType = cns.WebApps
-		service.saveState()
-		break
 	default:
 		returnMessage = fmt.Sprintf("Invalid Orchestrator type %v", req.OrchestratorType)
 		returnCode = UnsupportedOrchestratorType
@@ -866,13 +861,14 @@ func (service *httpRestService) saveNetworkContainerGoalState(req cns.CreateNetw
 			CreateNetworkContainerRequest: req,
 			HostVersion:                   hostVersion}
 
-	if req.NetworkContainerType == cns.AzureContainerInstance {
+	if req.NetworkContainerType == cns.AzureContainerInstance ||
+		req.NetworkContainerType == cns.ClearContainer {
 		switch service.state.OrchestratorType {
-		case cns.Kubernetes:
+		case cns.Kubernetes, cns.ServiceFabric:
 			var podInfo cns.KubernetesPodInfo
 			err := json.Unmarshal(req.OrchestratorContext, &podInfo)
 			if err != nil {
-				errBuf := fmt.Sprintf("Unmarshalling AzureContainerInstanceInfo failed with error %v", err)
+				errBuf := fmt.Sprintf("Unmarshalling %s failed with error %v", req.NetworkContainerType, err)
 				return UnexpectedError, errBuf
 			}
 
@@ -980,7 +976,7 @@ func (service *httpRestService) getNetworkContainerResponse(req cns.GetNetworkCo
 	defer service.lock.Unlock()
 
 	switch service.state.OrchestratorType {
-	case cns.Kubernetes:
+	case cns.Kubernetes, cns.ServiceFabric:
 		var podInfo cns.KubernetesPodInfo
 		err := json.Unmarshal(req.OrchestratorContext, &podInfo)
 		if err != nil {

network/endpoint_windows.go

@@ -47,6 +47,7 @@ func ConstructEndpointID(containerID string, netNsPath string, ifName string) (s
 // newEndpointImpl creates a new endpoint in the network.
 func (nw *network) newEndpointImpl(epInfo *EndpointInfo) (*endpoint, error) {
 	// Get Infrastructure containerID. Handle ADD calls for workload container.
+	var err error
 	infraEpName, _ := ConstructEndpointID(epInfo.ContainerID, epInfo.NetNsPath, epInfo.IfName)
 
 	hnsEndpoint := &hcsshim.HNSEndpoint{
@@ -79,11 +80,20 @@ func (nw *network) newEndpointImpl(epInfo *EndpointInfo) (*endpoint, error) {
 		return nil, err
 	}
 
+	defer func() {
+		if err != nil {
+			log.Printf("[net] HNSEndpointRequest DELETE id:%v", hnsResponse.Id)
+			hnsResponse, err := hcsshim.HNSEndpointRequest("DELETE", hnsResponse.Id, "")
+			log.Printf("[net] HNSEndpointRequest DELETE response:%+v err:%v.", hnsResponse, err)
+		}
+	}()
+
 	// Attach the endpoint.
 	log.Printf("[net] Attaching endpoint %v to container %v.", hnsResponse.Id, epInfo.ContainerID)
 	err = hcsshim.HotAttachEndpoint(epInfo.ContainerID, hnsResponse.Id)
 	if err != nil {
 		log.Printf("[net] Failed to attach endpoint: %v.", err)
+		return nil, err
 	}
 
 	// Create the endpoint object.