networking, virt: carry over the requested IPs from the original VM

The requested IPs for the primary UDN attachment are not in the VMI
spec, but in an annotation in the VMI. Hence, we need to fetch that
particular annotation, and set it in the duplicate VMI.

This was implemented using the builder pattern, since I suspect in the
future we will need to further customize the VMI spec / metadata; this
will make it simpler to extend the framework in the future.

Signed-off-by: Miguel Duarte Barroso <[email protected]>

Author: maiqueb

test/extended/networking/kubevirt/client.go

@@ -134,7 +134,9 @@ func (c *Client) GetEventsForPod(podName string) ([]string, error) {
 	return messages, nil
 }
 
-func (c *Client) CreateVMIFromSpec(vmNamespace, vmName string, vmiSpec map[string]interface{}) error {
+type Option func(map[string]interface{})
+
+func (c *Client) CreateVMIFromSpec(vmNamespace, vmName string, vmiSpec map[string]interface{}, opts ...Option) error {
 	newVMI := map[string]interface{}{
 		"apiVersion": "kubevirt.io/v1",
 		"kind":       "VirtualMachineInstance",
@@ -145,6 +147,10 @@ func (c *Client) CreateVMIFromSpec(vmNamespace, vmName string, vmiSpec map[strin
 		"spec": vmiSpec,
 	}
 
+	for _, opt := range opts {
+		opt(newVMI)
+	}
+
 	newVMIYAML, err := yaml.Marshal(newVMI)
 	if err != nil {
 		return err
@@ -153,6 +159,17 @@ func (c *Client) CreateVMIFromSpec(vmNamespace, vmName string, vmiSpec map[strin
 	return c.Apply(string(newVMIYAML))
 }
 
+func WithAnnotations(annotations map[string]string) Option {
+	return func(cr map[string]interface{}) {
+		metadata, hasMetadata := cr["metadata"].(map[string]interface{})
+		if !hasMetadata {
+			metadata = make(map[string]interface{})
+			cr["metadata"] = metadata
+		}
+		metadata["annotations"] = annotations
+	}
+}
+
 func ensureVirtctl(oc *exutil.CLI, dir string) (string, error) {
 	filepath := filepath.Join(dir, "virtctl")
 	_, err := os.Stat(filepath)

test/extended/networking/livemigration.go

@@ -30,6 +30,8 @@ import (
 	"github.com/openshift/origin/test/extended/util/image"
 )
 
+const kvIPRequestsAnnot = "network.kubevirt.io/addresses"
+
 var _ = Describe("[sig-network][OCPFeatureGate:PersistentIPsForVirtualization][Feature:Layer2LiveMigration] Kubevirt Virtual Machines", func() {
 	// disable automatic namespace creation, we need to add the required UDN label
 	oc := exutil.NewCLIWithoutNamespace("network-segmentation-e2e")
@@ -561,7 +563,20 @@ func duplicateVM(cli *kubevirt.Client, vmNamespace, vmName string) {
 	var vmiSpec map[string]interface{}
 	Expect(json.Unmarshal([]byte(vmiSpecJSON), &vmiSpec)).To(Succeed())
 
-	Expect(cli.CreateVMIFromSpec(vmNamespace, duplicateVMName, vmiSpec)).To(Succeed())
+	originalVMIRawAnnotations, err := cli.GetJSONPath("vmi", vmName, "{.metadata.annotations}")
+	Expect(err).NotTo(HaveOccurred())
+
+	originalVMIAnnotations := map[string]string{}
+	Expect(json.Unmarshal([]byte(originalVMIRawAnnotations), &originalVMIAnnotations)).To(Succeed())
+
+	var vmiCreationOptions []kubevirt.Option
+	if requestedIPs, hasIPRequests := originalVMIAnnotations[kvIPRequestsAnnot]; hasIPRequests {
+		vmiCreationOptions = append(
+			vmiCreationOptions,
+			kubevirt.WithAnnotations(ipRequests(requestedIPs)),
+		)
+	}
+	Expect(cli.CreateVMIFromSpec(vmNamespace, duplicateVMName, vmiSpec, vmiCreationOptions...)).To(Succeed())
 	waitForVMPodEventWithMessage(cli, vmNamespace, duplicateVMName, "IP is already allocated", 2*time.Minute)
 }
 
@@ -792,3 +807,7 @@ func formatAddressesAnnotation(preconfiguredIPs []string) (string, error) {
 
 	return string(staticIPs), nil
 }
+
+func ipRequests(ips string) map[string]string {
+	return map[string]string{kvIPRequestsAnnot: ips}
+}