WIP: inject fake multusclient

Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>

Author: maiqueb

.github/workflows/e2e-container.yaml

@@ -31,6 +31,9 @@ jobs:
       - name: Test - provisioning the examples
         run: e2e/test-provisioning-examples.sh
 
+      - name: Test - execute golang based e2e tests
+        run: make e2e/test
+
       - name: Cleanup cluster
         run: |
           kind delete cluster           # gracefully remove the cluster

Makefile

@@ -24,4 +24,7 @@ manifests:
 	IMAGE_REGISTRY=${IMAGE_REGISTRY} CRI_SOCKET_PATH=${CRI_SOCKET_PATH} hack/generate_manifests.sh
 
 test:
-	$(GO) test -v ./...
+	$(GO) test -v ./pkg/...
+
+e2e/test:
+	$(GO) test -v -count=1 ./e2e/...

cmd/dynamic-networks-controller/networks-controller.go

@@ -25,6 +25,7 @@ import (
 	"github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri"
 	"github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri/containerd"
 	"github.com/maiqueb/multus-dynamic-networks-controller/pkg/logging"
+	"github.com/maiqueb/multus-dynamic-networks-controller/pkg/multuscni"
 )
 
 const (
@@ -96,10 +97,10 @@ func newController(stopChannel chan struct{}, configuration *config.Multus) (*co
 		nadInformerFactory,
 		eventBroadcaster,
 		newEventRecorder(eventBroadcaster),
-		configuration.MultusSocketPath,
 		k8sClient,
 		nadClientSet,
 		containerRuntime,
+		multuscni.NewClient(configuration.MultusSocketPath),
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create the pod networks controller: %v", err)

e2e/e2e_test.go

@@ -89,43 +89,80 @@ var _ = Describe("Multus dynamic networks controller", func() {
 
 				Expect(clients.addNetworkToPod(pod, networkName, namespace, ifaceToAdd)).To(Succeed())
 
-				Eventually(func() []nettypes.NetworkStatus {
-					pods, err := clients.ListPods(namespace, fmt.Sprintf("app=%s", podName))
-					if err != nil {
-						return nil
-					}
-					if len(pods.Items) != 1 {
-						return nil
-					}
-					return podsDynamicNetworks(&pods.Items[0])
-				}).Should(
-					ConsistOf(
-						nettypes.NetworkStatus{
-							Name:      networkName,
-							Interface: ifaceToAdd,
-							Mac:       "",
-						}))
+				Eventually(
+					func() []nettypes.NetworkStatus {
+						return filterPods(clients, namespace, podName, func(networkStatus nettypes.NetworkStatus) bool {
+							return !networkStatus.Default
+						})
+					},
+				).Should(
+					WithTransform(
+						cleanMACAddressesFromStatus(),
+						ConsistOf(
+							nettypes.NetworkStatus{
+								Name:      fmt.Sprintf("%s/%s", namespace, networkName),
+								Interface: ifaceToAdd,
+							},
+							nettypes.NetworkStatus{
+								Name:      fmt.Sprintf("%s/%s", namespace, networkName),
+								Interface: initialPodIfaceName,
+							})))
 			})
 
 			It("manages to remove an interface from a running pod", func() {
 				const ifaceToRemove = initialPodIfaceName
-
+				Expect(
+					filterPods(clients, namespace, podName, func(networkStatus nettypes.NetworkStatus) bool {
+						return !networkStatus.Default
+					})).Should(
+					WithTransform(
+						cleanMACAddressesFromStatus(),
+						ConsistOf(nettypes.NetworkStatus{
+							Name:      fmt.Sprintf("%s/%s", namespace, networkName),
+							Interface: initialPodIfaceName,
+						}),
+					))
 				Expect(clients.removeNetworkFromPod(pod, networkName, namespace, ifaceToRemove)).To(Succeed())
 
-				Eventually(func() []nettypes.NetworkStatus {
-					pods, err := clients.ListPods(namespace, fmt.Sprintf("app=%s", podName))
-					if err != nil {
-						return nil
-					}
-					return podsDynamicNetworks(&pods.Items[0])
-				}).Should(BeEmpty())
+				Eventually(
+					func() []nettypes.NetworkStatus {
+						return filterPods(clients, namespace, podName, func(networkStatus nettypes.NetworkStatus) bool {
+							return !networkStatus.Default
+						})
+					},
+				).Should(BeEmpty())
 			})
 		})
 	})
 })
 
+func cleanMACAddressesFromStatus() func(status []nettypes.NetworkStatus) []nettypes.NetworkStatus {
+	return func(status []nettypes.NetworkStatus) []nettypes.NetworkStatus {
+		for i := range status {
+			status[i].Mac = ""
+		}
+		return status
+	}
+}
+
+type NetworkStatusPredicate func(networkStatus nettypes.NetworkStatus) bool
+
+func filterPods(clients *Clients, namespace, podName string, p NetworkStatusPredicate) []nettypes.NetworkStatus {
+	pods, err := clients.ListPods(namespace, fmt.Sprintf("app=%s", podName))
+	if err != nil {
+		return nil
+	}
+	var podNetworkStatus []nettypes.NetworkStatus
+	for _, netStatus := range podsDynamicNetworks(&pods.Items[0]) {
+		if p(netStatus) {
+			podNetworkStatus = append(podNetworkStatus, netStatus)
+		}
+	}
+	return podNetworkStatus
+}
+
 func podsDynamicNetworks(pod *corev1.Pod) []nettypes.NetworkStatus {
-	newNetsAnnotations, wasFound := pod.Annotations[annotations.DynamicNetworksAnnotation]
+	newNetsAnnotations, wasFound := pod.Annotations[nettypes.NetworkStatusAnnot]
 	if !wasFound {
 		return nil
 	}
@@ -473,12 +510,17 @@ func removeFromDynamicNetworksAnnotation(pod *corev1.Pod, networkName string, ne
 		updatedNetworkSelectionElements = append(updatedNetworkSelectionElements, *currentNetworkSelectionElements[i])
 	}
 
-	newSelectionElements, err := json.Marshal(updatedNetworkSelectionElements)
-	if err != nil {
-		return ""
+	var newSelectionElements string
+	if len(updatedNetworkSelectionElements) > 0 {
+		newSelectionElementsBytes, err := json.Marshal(updatedNetworkSelectionElements)
+		if err != nil {
+			return ""
+		}
+		newSelectionElements = string(newSelectionElementsBytes)
+	} else {
+		newSelectionElements = "[]"
 	}
-
-	return string(newSelectionElements)
+	return newSelectionElements
 }
 
 type dynamicNetworkInfo struct {

go.mod

@@ -4,12 +4,14 @@ go 1.18
 
 require (
 	github.com/containerd/containerd v1.6.8
-	github.com/containernetworking/cni v1.1.1
+	github.com/containernetworking/cni v1.1.2
 	github.com/gogo/protobuf v1.3.2
 	github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.3.0
 	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/ginkgo/v2 v2.1.3
 	github.com/onsi/gomega v1.17.0
 	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
+	gopkg.in/k8snetworkplumbingwg/multus-cni.v3 v3.9.1
 	k8s.io/api v0.24.4
 	k8s.io/apimachinery v0.24.4
 	k8s.io/client-go v0.24.4
@@ -31,7 +33,7 @@ require (
 	github.com/emicklei/go-restful v2.10.0+incompatible // indirect
 	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/go-logr/logr v1.2.2 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.19.5 // indirect
 	github.com/go-openapi/swag v0.19.14 // indirect
@@ -62,24 +64,56 @@ require (
 	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
+	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
 	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
+	golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
+	google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
 	google.golang.org/grpc v1.43.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
+	k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
 	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
-	sigs.k8s.io/yaml v1.2.0 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )
+
+replace (
+	k8s.io/api => k8s.io/api v0.24.4
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.24.4
+	k8s.io/apiserver => k8s.io/apiserver v0.24.4
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.4
+	k8s.io/client-go => k8s.io/client-go v0.24.4
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.4
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.4
+	k8s.io/code-generator => k8s.io/code-generator v0.24.4
+	k8s.io/component-base => k8s.io/component-base v0.24.4
+	k8s.io/component-helpers => k8s.io/component-helpers v0.24.4
+	k8s.io/controller-manager => k8s.io/controller-manager v0.24.4
+	k8s.io/cri-api => k8s.io/cri-api v0.24.4
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.4
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.4
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.4
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.4
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.4
+	k8s.io/kubectl => k8s.io/kubectl v0.24.4
+	k8s.io/kubelet => k8s.io/kubelet v0.24.4
+	k8s.io/kubernetes => k8s.io/kubernetes v1.22.8
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.4
+	k8s.io/metrics => k8s.io/metrics v0.24.4
+	k8s.io/mount-utils => k8s.io/mount-utils v0.24.4
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.4
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.4
+)
+
+replace gopkg.in/k8snetworkplumbingwg/multus-cni.v3 => github.com/k8snetworkplumbingwg/multus-cni v0.0.0-20220926142625-1aac2431b86a