Make sure host appears in PXE ARP tables

Detection of host IP till now relies on the fact we download the
answerfile from PXE server.  Once we generate it this network traffic
won't happen so we need some other mechanism to fill the server's ARP
tables.  Similarly, once installed the host needs the same mechanism
so the test can find it.

test-pingpxe.service is installed in install.img by iso-remaster, and
copied to host using an installer hook.

Since it is difficult to wait until the IP has been assigned before
launching the service, make it ping continuously until we can reach
the PXE server.

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

conftest.py

@@ -403,35 +403,7 @@ def create_vms(request, host):
         vdis = []
         vbds = []
         for vm_def in marker.args:
-            vm_name = vm_def["name"]
-            vm_template = vm_def["template"]
-
-            logging.info(">> Install VM %r from template %r", vm_name, vm_template)
-
-            vm = host.vm_from_template(vm_name, vm_template)
-
-            # VM is now created, make sure we clean it up on any subsequent failure
-            vms.append(vm)
-
-            if "vdis" in marker:
-                for vdi_def in marker["vdis"]:
-                    sr = SR(host.main_sr_uuid(), host.pool)
-                    vdi = sr.create_vdi(vdi_def["name"], vdi_def["size"])
-                    vdis.append(vdi)
-                    # connect to VM
-                    vbd = vm.create_vbd(vdi_def["device"], vdi.uuid)
-                    vbds.append(vbd)
-                    vbd.param_set(param_name="userdevice", value=vdi_def["userdevice"])
-
-            if "vifs" in marker:
-                for vif_def in marker["vifs"]:
-                    vm.create_vif(vif_def["index"], vif_def["network_uuid"])
-
-            if "params" in marker:
-                for param_def in marker["params"]:
-                    logging.info("Setting param %s", param_def)
-                    vm.param_set(**param_def)
-
+            _create_vm(vm_def, host, vms, vdis, vbds)
         yield vms
 
     except Exception:
@@ -449,6 +421,36 @@ def create_vms(request, host):
             logging.info("<< Destroy VM %s", vm.uuid)
             vm.destroy(verify=True)
 
+def _create_vm(marker, host, vms, vdis, vbds):
+    vm_name = marker["name"]
+    vm_template = marker["template"]
+
+    logging.info(">> Install VM %r from template %r", vm_name, vm_template)
+
+    vm = host.vm_from_template(vm_name, vm_template)
+
+    # VM is now created, make sure we clean it up on any subsequent failure
+    vms.append(vm)
+
+    if "vdis" in marker:
+        for vdi_def in marker["vdis"]:
+            sr = SR(host.main_sr_uuid(), host.pool)
+            vdi = sr.create_vdi(vdi_def["name"], vdi_def["size"])
+            vdis.append(vdi)
+            # connect to VM
+            vbd = vm.create_vbd(vdi_def["device"], vdi.uuid)
+            vbds.append(vbd)
+            vbd.param_set(param_name="userdevice", value=vdi_def["userdevice"])
+
+    if "vifs" in marker:
+        for vif_def in marker["vifs"]:
+            vm.create_vif(vif_def["index"], vif_def["network_uuid"])
+
+    if "params" in marker:
+        for param_def in marker["params"]:
+            logging.info("Setting param %s", param_def)
+            vm.param_set(**param_def)
+
 @pytest.fixture(scope="module")
 def running_vm(imported_vm):
     vm = imported_vm

tests/install/conftest.py

@@ -48,7 +48,7 @@ def iso_remaster(request, answerfile):
     assert marker is not None, "iso_remaster fixture requires 'installer_iso' marker"
     iso_key = marker.args[0]
 
-    from data import ISO_IMAGES, ISOSR_SRV, ISOSR_PATH, TEST_SSH_PUBKEY, TOOLS
+    from data import ISO_IMAGES, ISOSR_SRV, ISOSR_PATH, PXE_CONFIG_SERVER, TEST_SSH_PUBKEY, TOOLS
     assert "iso-remaster" in TOOLS
     iso_remaster = TOOLS["iso-remaster"]
     assert os.access(iso_remaster, os.X_OK)
@@ -64,6 +64,10 @@ def iso_remaster(request, answerfile):
 
         if answerfile:
             logging.info("generating answerfile %s", answerfile_xml)
+            import xml.etree.ElementTree as ET
+            ET.SubElement(answerfile.getroot(), "script",
+                          stage="filesystem-populated",
+                          type="url").text = "file:///root/postinstall.sh"
             answerfile.write(answerfile_xml)
         else:
             logging.info("no answerfile")
@@ -81,6 +85,32 @@ def iso_remaster(request, answerfile):
 
 test ! -e "{answerfile_xml}" ||
     cp "{answerfile_xml}" "$INSTALLIMG/root/answerfile.xml"
+
+cat > "$INSTALLIMG/etc/systemd/system/test-pingpxe.service" <<EOF
+[Unit]
+Description=Ping pxe server to populate its ARP table
+After=network-online.target
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c 'while ! ping -c1 {PXE_CONFIG_SERVER}; do sleep 1 ; done'
+[Install]
+WantedBy=default.target
+EOF
+
+systemctl --root="$INSTALLIMG" enable test-pingpxe.service
+
+cat > "$INSTALLIMG/root/postinstall.sh" <<EOF
+#!/bin/sh
+set -ex
+
+ROOT="\\$1"
+
+cp /etc/systemd/system/test-pingpxe.service "\\$ROOT/etc/systemd/system/test-pingpxe.service"
+systemctl --root="\\$ROOT" enable test-pingpxe.service
+
+mkdir -p "\\$ROOT/root/.ssh"
+echo "{TEST_SSH_PUBKEY}" >> "\\$ROOT/root/.ssh/authorized_keys"
+EOF
 """,
                   file=patcher_fd)
             os.chmod(patcher_fd.fileno(), 0o755)