run Windows UT's

.pipelines/pipeline.yaml

@@ -74,26 +74,24 @@ stages:
             name: "Test"
             displayName: "Run Tests"
 
-          - bash: |
-              build/tools/bin/gocov convert coverage.out > coverage.json
-              build/tools/bin/gocov-xml < coverage.json > coverage.xml
-            name: "Coverage"
-            displayName: "Generate Coverage Reports"
-            condition: always()
-
-          - task: PublishTestResults@2
-            inputs:
-              testRunner: JUnit
-              testResultsFiles: report.xml
-            displayName: "Publish Test Results"
-            condition: always()
-
-          - task: PublishCodeCoverageResults@1
-            inputs:
-              codeCoverageTool: Cobertura
-              summaryFileLocation: coverage.xml
-            displayName: "Publish Code Coverage Results"
-            condition: always()
+  - stage: test_windows
+    displayName: Test ACN Windows
+    dependsOn:
+      - setup
+    jobs:
+      - job: test
+        displayName: Run Tests
+        variables:
+          STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
+        pool:
+          name: "$(BUILD_POOL_NAME_DEFAULT_WINDOWS_ALT)"
+        steps:
+          - script: |
+              cd npm/
+              go test ./...
+            retryCountOnTaskFailure: 3
+            name: "TestWindows"
+            displayName: "Run Windows Tests"
 
   - stage: binaries
     displayName: Build Binaries
@@ -109,7 +107,7 @@ stages:
           name: "$(BUILD_POOL_NAME_DEFAULT)"
         steps:
           - script: |
-              make all-binaries-platforms 
+              make all-binaries-platforms
             name: "BuildAllPlatformBinaries"
             displayName: "Build all platform binaries"
 
@@ -255,7 +253,7 @@ stages:
         strategy:
           matrix:
             acncli:
-              name: acncli 
+              name: acncli
               platforms: linux/amd64 linux/arm64
             cni_dropgz:
               name: cni-dropgz
@@ -274,6 +272,8 @@ stages:
             parameters:
               name: $(name)
               platforms: $(platforms)
+              tag: $(TAG)
+
 
   - template: singletenancy/cilium/cilium-e2e-job-template.yaml
     parameters:

Makefile

@@ -696,8 +696,7 @@ COVER_PKG ?= .
 test-all: ## run all unit tests.
 	@$(eval COVER_FILTER=`go list --tags ignore_uncovered,ignore_autogenerated $(COVER_PKG)/... | tr '\n' ','`)
 	@echo Test coverpkg: $(COVER_FILTER)
-	go test -mod=readonly -buildvcs=false -tags "unit" -coverpkg=$(COVER_FILTER) -race -covermode atomic -failfast -coverprofile=coverage.out $(COVER_PKG)/...
-
+	go test -mod=readonly -buildvcs=false -tags "unit" -coverpkg=$(COVER_FILTER) -race -covermode atomic -coverprofile=coverage.out $(COVER_PKG)/...
 
 test-integration: ## run all integration tests.
 	CNI_DROPGZ_VERSION=$(CNI_DROPGZ_VERSION) \

common/ioshim_windows.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/Azure/azure-container-networking/network/hnswrapper"
 	testutils "github.com/Azure/azure-container-networking/test/utils"
+	"github.com/Microsoft/hcsshim/hcn"
 	utilexec "k8s.io/utils/exec"
 )
 
@@ -21,9 +22,18 @@ func NewIOShim() *IOShim {
 }
 
 func NewMockIOShim(calls []testutils.TestCmd) *IOShim {
+	hns := hnswrapper.NewHnsv2wrapperFake()
+	network := &hcn.HostComputeNetwork{
+		Id:   "1234",
+		Name: "azure",
+	}
+
+	// CreateNetwork will never return an error
+	_, _ = hns.CreateNetwork(network)
+
 	return &IOShim{
 		Exec: testutils.GetFakeExecWithScripts(calls),
-		Hns:  hnswrapper.NewHnsv2wrapperFake(),
+		Hns:  hns,
 	}
 }
 

network/hnswrapper/hnsv2wrapperfake.go

@@ -46,6 +46,7 @@ func delayHnsCall(delay time.Duration) {
 	time.Sleep(delay)
 }
 
+// NewMockIOShim is dependent on this function never returning an error
 func (f Hnsv2wrapperFake) CreateNetwork(network *hcn.HostComputeNetwork) (*hcn.HostComputeNetwork, error) {
 	f.Lock()
 	defer f.Unlock()
@@ -86,11 +87,14 @@ func (f Hnsv2wrapperFake) ModifyNetworkSettings(network *hcn.HostComputeNetwork,
 				}
 				if setpol.PolicyType != hcn.SetPolicyTypeIpSet {
 					// Check Nested SetPolicy members
-					members := strings.Split(setpol.Values, ",")
-					for _, memberID := range members {
-						_, ok := networkCache.Policies[memberID]
-						if !ok {
-							return newErrorFakeHNS(fmt.Sprintf("Member Policy %s not found", memberID))
+					// checking for the case of no members in nested policy. iMgrCfg.AddEmptySetToLists is set to false in some tests so it creates a nested policy with no members
+					if setpol.Values != "" {
+						members := strings.Split(setpol.Values, ",")
+						for _, memberID := range members {
+							_, ok := networkCache.Policies[memberID]
+							if !ok {
+								return newErrorFakeHNS(fmt.Sprintf("Member Policy %s not found", memberID))
+							}
 						}
 					}
 				}
@@ -401,11 +405,28 @@ func NewFakeHostComputeEndpoint(endpoint *hcn.HostComputeEndpoint) *FakeHostComp
 }
 
 func (fEndpoint *FakeHostComputeEndpoint) GetHCNObj() *hcn.HostComputeEndpoint {
-	return &hcn.HostComputeEndpoint{
+	// NOTE: not including other policy types like perhaps SetPolicies
+	hcnEndpoint := &hcn.HostComputeEndpoint{
 		Id:                 fEndpoint.ID,
 		Name:               fEndpoint.Name,
 		HostComputeNetwork: fEndpoint.HostComputeNetwork,
+		Policies:           make([]hcn.EndpointPolicy, 0),
 	}
+
+	for _, fakeEndpointPol := range fEndpoint.Policies {
+		rawJSON, err := json.Marshal(fakeEndpointPol)
+		if err != nil {
+			fmt.Printf("FAILURE marshalling fake endpoint policy: %s\n", err.Error())
+		} else {
+			hcnPolicy := hcn.EndpointPolicy{
+				Type:     hcn.ACL,
+				Settings: rawJSON,
+			}
+			hcnEndpoint.Policies = append(hcnEndpoint.Policies, hcnPolicy)
+		}
+	}
+
+	return hcnEndpoint
 }
 
 func (fEndpoint *FakeHostComputeEndpoint) RemovePolicy(toRemovePol *FakeEndpointPolicy) error {