Merge branch 'master' into ankaggar/update_go_v1_22

Azure · Aug 22, 2024 · 48e0630 · 48e0630
2 parents a14d312 + de7bb5e
commit 48e0630
Show file tree

Hide file tree

Showing 18 changed files with 715 additions and 289 deletions.
diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
@@ -49,98 +49,10 @@ stages:
             name: "EnvironmentalVariables"
             displayName: "Set environmental variables"
             condition: always()
-  - ${{ if contains(variables['Build.SourceBranch'], 'refs/pull') }}:
-    - stage: test
-      displayName: Test ACN
-      dependsOn:
-        - setup
-      jobs:
-        - job: test
-          displayName: Run Tests
-          variables:
-            STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
-          pool:
-            name: "$(BUILD_POOL_NAME_DEFAULT)"
-          steps:
-            - script: |
-                make tools
-                # run test, echo exit status code to fd 3, pipe output from test to tee, which splits output to stdout and go-junit-report (which converts test output to report.xml), stdout from tee is redirected to fd 4. Take output written to fd 3 (which is the exit code of test), redirect to stdout, pipe to read from stdout then exit with that status code. Read all output from fd 4 (output from tee) and write to top stdout
-                { { { {
-                      sudo -E env "PATH=$PATH" make test-all;
-                      echo $? >&3;
-                      } | tee >(build/tools/bin/go-junit-report > report.xml) >&4;
-                    } 3>&1;
-                  } | { read xs; exit $xs; }
-                } 4>&1
-              retryCountOnTaskFailure: 3
-              name: "Test"
-              displayName: "Run Tests"
-
-    - 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"
 
-  - ${{ else }}:
-    - stage: test
-      displayName: Test ACN
-      dependsOn:
-        - setup
-      jobs:
-        - job: test
-          displayName: Run Tests
-          variables:
-            STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
-          pool:
-            name: "$(BUILD_POOL_NAME_DEFAULT)"
-          steps:
-            - script: |
-                make tools
-                # run test, echo exit status code to fd 3, pipe output from test to tee, which splits output to stdout and go-junit-report (which converts test output to report.xml), stdout from tee is redirected to fd 4. Take output written to fd 3 (which is the exit code of test), redirect to stdout, pipe to read from stdout then exit with that status code. Read all output from fd 4 (output from tee) and write to top stdout
-                { { { {
-                      sudo -E env "PATH=$PATH" make test-all;
-                      echo $? >&3;
-                      } | tee >(build/tools/bin/go-junit-report > report.xml) >&4;
-                    } 3>&1;
-                  } | { read xs; exit $xs; }
-                } 4>&1
-              retryCountOnTaskFailure: 3
-              name: "Test"
-              displayName: "Run Tests"
-
-    - 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"
+  - template: templates/run-unit-tests.yaml
 
+  - ${{ if not(contains(variables['Build.SourceBranch'], 'refs/pull')) }}:
     - stage: binaries
       displayName: Build Binaries
       dependsOn:

diff --git a/.pipelines/templates/run-unit-tests.yaml b/.pipelines/templates/run-unit-tests.yaml
@@ -0,0 +1,49 @@
+stages:
+  - stage: test
+    displayName: Test ACN
+    dependsOn:
+      - setup
+    jobs:
+      - job: test
+        displayName: Run Tests
+        variables:
+          STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
+        pool:
+          name: "$(BUILD_POOL_NAME_DEFAULT)"
+        steps:
+          - script: |
+              make tools
+              # run test, echo exit status code to fd 3, pipe output from test to tee, which splits output to stdout and go-junit-report (which converts test output to report.xml), stdout from tee is redirected to fd 4. Take output written to fd 3 (which is the exit code of test), redirect to stdout, pipe to read from stdout then exit with that status code. Read all output from fd 4 (output from tee) and write to top stdout
+              { { { {
+                    sudo -E env "PATH=$PATH" make test-all;
+                    echo $? >&3;
+                    } | tee >(build/tools/bin/go-junit-report > report.xml) >&4;
+                  } 3>&1;
+                } | { read xs; exit $xs; }
+              } 4>&1
+            retryCountOnTaskFailure: 3
+            name: "Test"
+            displayName: "Run Tests"
+
+  - 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 ./...
+              cd ../cni/
+              go test ./...
+              cd ../platform/
+              go test ./...
+            retryCountOnTaskFailure: 3
+            name: "TestWindows"
+            displayName: "Run Windows Tests"
diff --git a/cni/network/multitenancy_mock.go b/cni/network/multitenancy_mock.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"net"
-	"runtime"
 	"strconv"
 
 	"github.com/Azure/azure-container-networking/cni"
@@ -14,7 +13,8 @@ import (
 )
 
 type MockMultitenancy struct {
-	fail bool
+	fail         bool
+	cnsResponses []*cns.GetNetworkContainerResponse
 }
 
 const (
@@ -26,9 +26,10 @@ const (
 
 var errMockMulAdd = errors.New("multitenancy fail")
 
-func NewMockMultitenancy(fail bool) *MockMultitenancy {
+func NewMockMultitenancy(fail bool, cnsResponses []*cns.GetNetworkContainerResponse) *MockMultitenancy {
 	return &MockMultitenancy{
-		fail: fail,
+		fail:         fail,
+		cnsResponses: cnsResponses,
 	}
 }
 
@@ -56,31 +57,9 @@ func (m *MockMultitenancy) GetNetworkContainer(
 		return nil, net.IPNet{}, errMockMulAdd
 	}
 
-	cnsResponse := &cns.GetNetworkContainerResponse{
-		IPConfiguration: cns.IPConfiguration{
-			IPSubnet: cns.IPSubnet{
-				IPAddress:    "192.168.0.4",
-				PrefixLength: ipPrefixLen,
-			},
-			GatewayIPAddress: "192.168.0.1",
-		},
-		LocalIPConfiguration: cns.IPConfiguration{
-			IPSubnet: cns.IPSubnet{
-				IPAddress:    "169.254.0.4",
-				PrefixLength: localIPPrefixLen,
-			},
-			GatewayIPAddress: "169.254.0.1",
-		},
-
-		PrimaryInterfaceIdentifier: "10.240.0.4/24",
-		MultiTenancyInfo: cns.MultiTenancyInfo{
-			EncapType: cns.Vlan,
-			ID:        1,
-		},
-	}
-	_, ipnet, _ := net.ParseCIDR(cnsResponse.PrimaryInterfaceIdentifier)
+	_, ipnet, _ := net.ParseCIDR(m.cnsResponses[0].PrimaryInterfaceIdentifier)
 
-	return cnsResponse, *ipnet, nil
+	return m.cnsResponses[0], *ipnet, nil
 }
 
 func (m *MockMultitenancy) GetAllNetworkContainers(
@@ -97,64 +76,13 @@ func (m *MockMultitenancy) GetAllNetworkContainers(
 	var cnsResponses []cns.GetNetworkContainerResponse
 	var ipNets []net.IPNet
 
-	cnsResponseOne := &cns.GetNetworkContainerResponse{
-		IPConfiguration: cns.IPConfiguration{
-			IPSubnet: cns.IPSubnet{
-				IPAddress:    "20.0.0.10",
-				PrefixLength: ipPrefixLen,
-			},
-			GatewayIPAddress: "20.0.0.1",
-		},
-		LocalIPConfiguration: cns.IPConfiguration{
-			IPSubnet: cns.IPSubnet{
-				IPAddress:    "168.254.0.4",
-				PrefixLength: localIPPrefixLen,
-			},
-			GatewayIPAddress: "168.254.0.1",
-		},
-
-		PrimaryInterfaceIdentifier: "20.240.0.4/24",
-		MultiTenancyInfo: cns.MultiTenancyInfo{
-			EncapType: cns.Vlan,
-			ID:        multiTenancyVlan1,
-		},
-	}
-
-	// TODO: add dual nic test cases for windows
-	if runtime.GOOS == "windows" {
-		cnsResponseTwo := &cns.GetNetworkContainerResponse{
-			IPConfiguration: cns.IPConfiguration{
-				IPSubnet: cns.IPSubnet{
-					IPAddress:    "10.0.0.10",
-					PrefixLength: ipPrefixLen,
-				},
-				GatewayIPAddress: "10.0.0.1",
-			},
-			LocalIPConfiguration: cns.IPConfiguration{
-				IPSubnet: cns.IPSubnet{
-					IPAddress:    "169.254.0.4",
-					PrefixLength: localIPPrefixLen,
-				},
-				GatewayIPAddress: "169.254.0.1",
-			},
-
-			PrimaryInterfaceIdentifier: "10.240.0.4/24",
-			MultiTenancyInfo: cns.MultiTenancyInfo{
-				EncapType: cns.Vlan,
-				ID:        multiTenancyVlan2,
-			},
-		}
+	for _, cnsResp := range m.cnsResponses {
+		_, ipNet, _ := net.ParseCIDR(cnsResp.PrimaryInterfaceIdentifier)
 
-		_, secondIPnet, _ := net.ParseCIDR(cnsResponseTwo.PrimaryInterfaceIdentifier)
-		ipNets = append(ipNets, *secondIPnet)
-		cnsResponses = append(cnsResponses, *cnsResponseTwo)
+		ipNets = append(ipNets, *ipNet)
+		cnsResponses = append(cnsResponses, *cnsResp)
 	}
 
-	_, firstIPnet, _ := net.ParseCIDR(cnsResponseOne.PrimaryInterfaceIdentifier)
-
-	ipNets = append(ipNets, *firstIPnet)
-	cnsResponses = append(cnsResponses, *cnsResponseOne)
-
 	ipamResult := IPAMAddResult{}
 	ipamResult.interfaceInfo = make(map[string]network.InterfaceInfo)