pxe.arp_addresses_for: use ARP_SERVER not PXE_CONFIG_SERVER

In some network we might not even have a PXE server, or no ssh access to
it.

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

Author: ydirson

data.py-dist

@@ -49,6 +49,9 @@ NETWORKS = {
 # PXE config server for automated XCP-ng installation
 PXE_CONFIG_SERVER = 'pxe'
 
+# server on MGMT network, where ARP tables can reveal the MACs
+ARP_SERVER = PXE_CONFIG_SERVER
+
 # Default VM images location
 DEF_VM_URL = 'http://pxe/images/'
 

lib/pxe.py

@@ -1,5 +1,5 @@
 from lib.commands import ssh, scp
-from data import PXE_CONFIG_SERVER
+from data import ARP_SERVER, PXE_CONFIG_SERVER
 
 PXE_CONFIG_DIR = "/pxe/configs/custom"
 
@@ -35,7 +35,7 @@ def server_remove_bootconf(mac_address):
 
 def arp_addresses_for(mac_address):
     output = ssh(
-        PXE_CONFIG_SERVER,
+        ARP_SERVER,
         ['arp', '-n', '|', 'grep', mac_address, '|', 'awk', '\'{ print $1 }\'']
     )
     candidate_ips = output.splitlines()

tests/install/conftest.py

@@ -11,7 +11,7 @@
 from lib.commands import local_cmd
 
 from data import (ISO_IMAGES, ISO_IMAGES_BASE, ISO_IMAGES_CACHE,
-                  PXE_CONFIG_SERVER, TEST_SSH_PUBKEY, TOOLS)
+                  ARP_SERVER, TEST_SSH_PUBKEY, TOOLS)
 
 # Return true if the version of the ISO doesn't support the source type.
 # Note: this is a quick-win hack, to avoid explicit enumeration of supported
@@ -197,7 +197,7 @@ def remastered_iso(installer_iso, answerfile):
 After=network-online.target
 [Service]
 Type=oneshot
-ExecStart=/bin/sh -c 'while ! /usr/local/sbin/test-pingpxe.sh "{PXE_CONFIG_SERVER}"; do sleep 1 ; done'
+ExecStart=/bin/sh -c 'while ! /usr/local/sbin/test-pingpxe.sh "{ARP_SERVER}"; do sleep 1 ; done'
 [Install]
 WantedBy=default.target
 EOF
@@ -208,7 +208,7 @@ def remastered_iso(installer_iso, answerfile):
 #!/bin/sh
 case "$1" in
   start)
-    sh -c 'while ! /usr/local/sbin/test-pingpxe.sh "{PXE_CONFIG_SERVER}"; do sleep 1 ; done' & ;;
+    sh -c 'while ! /usr/local/sbin/test-pingpxe.sh "{ARP_SERVER}"; do sleep 1 ; done' & ;;
   stop) ;;
 esac
 EOF