[e2e fix] Parse JoinIPs from the NAD spec instead of annotation.

Signed-off-by: Nadia Pinaeva <[email protected]>

Author: npinaeva

test/e2e/kubevirt.go

@@ -58,6 +58,7 @@ import (
 	ipamclaimsv1alpha1 "github.com/k8snetworkplumbingwg/ipamclaims/pkg/crd/ipamclaims/v1alpha1"
 	nadapi "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	nadv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
+	nadclient "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1"
 
 	iputils "github.com/containernetworking/plugins/pkg/ip"
 
@@ -111,6 +112,7 @@ var _ = Describe("Kubevirt Virtual Machines", feature.VirtualMachineSupport, fun
 		httpServerTestPods  = []*corev1.Pod{}
 		iperfServerTestPods = []*corev1.Pod{}
 		clientSet           kubernetes.Interface
+		nadClient           nadclient.K8sCniCncfIoV1Interface
 		providerCtx         infraapi.Context
 		// Systemd resolvd prevent resolving kube api service by fqdn, so
 		// we replace it here with NetworkManager
@@ -1329,6 +1331,15 @@ fi
 				return ra.Status.Status
 			}, 30*time.Second, time.Second).Should(Equal("Accepted"))
 		}
+
+		getJoinIPs = func(cudn *udnv1.ClusterUserDefinedNetwork) []string {
+			nad, err := nadClient.NetworkAttachmentDefinitions(namespace).Get(context.TODO(), cudn.Name, metav1.GetOptions{})
+			Expect(err).NotTo(HaveOccurred())
+			var result map[string]interface{}
+			err = json.Unmarshal([]byte(nad.Spec.Config), &result)
+			Expect(err).NotTo(HaveOccurred())
+			return strings.Split(result["joinSubnet"].(string), ",")
+		}
 	)
 	BeforeEach(func() {
 		// So we can use it at AfterEach, since fr.ClientSet is nil there
@@ -1341,6 +1352,9 @@ fi
 
 		virtClient, err = kubevirt.NewClient("/tmp")
 		Expect(err).NotTo(HaveOccurred())
+
+		nadClient, err = nadclient.NewForConfig(fr.ClientConfig())
+		Expect(err).NotTo(HaveOccurred())
 	})
 
 	Context("with default pod network", Ordered, func() {
@@ -1882,7 +1896,7 @@ ip route add %[3]s via %[4]s
 					nodeRunningVMI, err := fr.ClientSet.CoreV1().Nodes().Get(context.Background(), vmi.Status.NodeName, metav1.GetOptions{})
 					Expect(err).NotTo(HaveOccurred(), step)
 
-					expectedIPv6GatewayPath, err := kubevirt.GenerateGatewayIPv6RouterLLA(nodeRunningVMI, networkName)
+					expectedIPv6GatewayPath, err := kubevirt.GenerateGatewayIPv6RouterLLA(nodeRunningVMI, getJoinIPs(cudn))
 					Expect(err).NotTo(HaveOccurred())
 					Eventually(kubevirt.RetrieveIPv6Gateways).
 						WithArguments(virtClient, vmi).
@@ -1953,7 +1967,7 @@ ip route add %[3]s via %[4]s
 					targetNode, err := fr.ClientSet.CoreV1().Nodes().Get(context.Background(), vmi.Status.MigrationState.TargetNode, metav1.GetOptions{})
 					Expect(err).NotTo(HaveOccurred(), step)
 
-					expectedGatewayMAC, err := kubevirt.GenerateGatewayMAC(targetNode, networkName)
+					expectedGatewayMAC, err := kubevirt.GenerateGatewayMAC(targetNode, getJoinIPs(cudn))
 					Expect(err).NotTo(HaveOccurred(), step)
 
 					Expect(err).NotTo(HaveOccurred(), step)
@@ -1969,7 +1983,7 @@ ip route add %[3]s via %[4]s
 					targetNode, err := fr.ClientSet.CoreV1().Nodes().Get(context.Background(), vmi.Status.MigrationState.TargetNode, metav1.GetOptions{})
 					Expect(err).NotTo(HaveOccurred(), step)
 
-					targetNodeIPv6GatewayPath, err := kubevirt.GenerateGatewayIPv6RouterLLA(targetNode, networkName)
+					targetNodeIPv6GatewayPath, err := kubevirt.GenerateGatewayIPv6RouterLLA(targetNode, getJoinIPs(cudn))
 					Expect(err).NotTo(HaveOccurred())
 					Eventually(kubevirt.RetrieveIPv6Gateways).
 						WithArguments(virtClient, vmi).

test/e2e/kubevirt/net.go

@@ -7,6 +7,8 @@ import (
 	"strings"
 	"time"
 
+	iputils "github.com/containernetworking/plugins/pkg/ip"
+
 	corev1 "k8s.io/api/core/v1"
 
 	kubevirtv1 "kubevirt.io/api/core/v1"
@@ -65,37 +67,62 @@ func RetrieveIPv6Gateways(cli *Client, vmi *v1.VirtualMachineInstance) ([]string
 	return paths, nil
 }
 
-func GenerateGatewayMAC(node *corev1.Node, networkName string) (string, error) {
+func GenerateGatewayMAC(node *corev1.Node, joinSubnets []string) (string, error) {
 	config.IPv4Mode = true
-	lrpJoinAddress, err := util.ParseNodeGatewayRouterJoinNetwork(node, networkName)
+	lrpJoinAddress, err := GetDefaultUDNGWRouterIPs(node, joinSubnets)
 	if err != nil {
 		return "", err
 	}
 
-	lrpJoinIPString := lrpJoinAddress.IPv4
-	if lrpJoinIPString == "" {
-		lrpJoinIPString = lrpJoinAddress.IPv6
+	if len(lrpJoinAddress) == 0 {
+		return "", fmt.Errorf("missing lrp join ip at node %q", node.Name)
 	}
 
-	if lrpJoinIPString == "" {
-		return "", fmt.Errorf("missing lrp join ip at node %q with network %q", node.Name)
-	}
+	return util.IPAddrToHWAddr(*lrpJoinAddress[0]).String(), nil
+}
 
-	lrpJoinIP, _, err := net.ParseCIDR(lrpJoinIPString)
+func GenerateGatewayIPv6RouterLLA(node *corev1.Node, joinSubnets []string) (string, error) {
+	config.IPv4Mode = true
+	joinAddresses, err := GetDefaultUDNGWRouterIPs(node, joinSubnets)
 	if err != nil {
 		return "", err
 	}
-
-	return util.IPAddrToHWAddr(lrpJoinIP).String(), nil
+	if len(joinAddresses) == 0 {
+		return "", fmt.Errorf("missing join addresses at node %q", node.Name)
+	}
+	return util.HWAddrToIPv6LLA(util.IPAddrToHWAddr(*joinAddresses[0])).String(), nil
 }
 
-func GenerateGatewayIPv6RouterLLA(node *corev1.Node, networkName string) (string, error) {
-	joinAddresses, err := util.ParseNodeGatewayRouterJoinAddrs(node, networkName)
+func GetDefaultUDNGWRouterIPs(node *corev1.Node, joinSubnets []string) ([]*net.IP, error) {
+	nodeID, err := util.GetNodeID(node)
 	if err != nil {
-		return "", err
+		// Don't consider this node as cluster-manager has not allocated node id yet.
+		return nil, err
 	}
-	if len(joinAddresses) == 0 {
-		return "", fmt.Errorf("missing join addresses at node %q for network %q", node.Name, networkName)
+	var udnJoinNetv4, udnJoinNetv6 net.IP
+	for _, subnet := range joinSubnets {
+		ip, _, err := net.ParseCIDR(subnet)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse CIDR %q: %v", subnet, err)
+		}
+		if ip.To4() != nil {
+			udnJoinNetv4 = ip
+		} else {
+			udnJoinNetv6 = ip
+		}
+	}
+	res := []*net.IP{}
+	if config.IPv4Mode {
+		for range nodeID {
+			udnJoinNetv4 = iputils.NextIP(udnJoinNetv4)
+		}
+		res = append(res, &udnJoinNetv4)
+	}
+	if config.IPv6Mode {
+		for range nodeID {
+			udnJoinNetv6 = iputils.NextIP(udnJoinNetv6)
+		}
+		res = append(res, &udnJoinNetv6)
 	}
-	return util.HWAddrToIPv6LLA(util.IPAddrToHWAddr(joinAddresses[0].IP)).String(), nil
+	return res, nil
 }