Use MAC as dhcp-identifier for restored VMs

Signed-off-by: Albin Sun <[email protected]>

Author: albinsun

harvester_e2e_tests/fixtures/images.py

@@ -23,7 +23,7 @@ def image_opensuse(request, api_client):
         *_, image_name = url.path.rsplit("/", 1)
         url = urlparse(urljoin(f"{image_server}/", image_name))
 
-    return ImageInfo(url, image_checksum, name="opensuse", ssh_user="opensuse")
+    return ImageInfo(url, image_checksum, name="opensuse", ssh_user="opensuse", first_nic="eth0")
 
 
 @pytest.fixture(scope="session")
@@ -38,7 +38,7 @@ def image_ubuntu(request):
         *_, image_name = url.path.rsplit("/", 1)
         url = urlparse(urljoin(f"{image_server}/", image_name))
 
-    return ImageInfo(url, image_checksum, name="ubuntu", ssh_user="ubuntu")
+    return ImageInfo(url, image_checksum, name="ubuntu", ssh_user="ubuntu", first_nic="enp1s0")
 
 
 @pytest.fixture(scope="session")
@@ -51,14 +51,15 @@ def image_k3s(request):
 
 
 class ImageInfo:
-    def __init__(self, url_result, image_checksum=None, name="", ssh_user=None):
+    def __init__(self, url_result, image_checksum=None, name="", ssh_user=None, first_nic=None):
         self.url_result = url_result
         if name:
             self.name = name
         else:
             self.name = self.url.rsplit("/", 1)[-1]
         self.ssh_user = ssh_user
         self.image_checksum = image_checksum
+        self.first_nic = first_nic
 
     def __repr__(self):
         return f"{__class__.__name__}({self.url_result})"

harvester_e2e_tests/integrations/test_upgrade.py

@@ -638,13 +638,24 @@ def test_preq_setup_vms(
         old_sc, new_sc = config_storageclass
         unique_vm_name = f"ug-vm-{unique_name}"
 
-        cpu, mem, size = 1, 2, 5
+        cpu, mem, size = 1, 2, 10
         vm_spec = api_client.vms.Spec(cpu, mem, mgmt_network=False)
         vm_spec.add_image('disk-0', image['id'], size=size)
         vm_spec.add_network('nic-1', f"{vm_network['namespace']}/{vm_network['name']}")
         userdata = yaml.safe_load(vm_spec.user_data)
         userdata['ssh_authorized_keys'] = [pub_key]
         vm_spec.user_data = yaml.dump(userdata)
+        # Ref. https://docs.harvesterhci.io/v1.7/vm/backup-restore#create-a-vm-backup
+        vm_spec.network_data = yaml.dump({
+            "version": 2,
+            "ethernets": {
+                image["first_nic"]: {
+                    "dhcp4": True,
+                    "dhcp6": True,
+                    "dhcp-identifier": "mac"
+                }
+            }
+        })
 
         code, data = api_client.vms.create(unique_vm_name, vm_spec)
         assert 201 == code, (code, data)