prefer IPv6 but fall back to IPv4

Author: TuxPowered42

igvm/drbd.py

@@ -185,7 +185,7 @@ def get_host_config(self):
             '    }}'
             .format(
                 host=self.hv.dataset_obj['hostname'],
-                addr=self.hv.dataset_obj['ipv6'],
+                addr=self.hv.ip_address,
                 port=self.get_device_port(),
                 dm_minor=self.get_device_minor(),
                 lv_name=self.lv_name,

igvm/host.py

@@ -184,3 +184,10 @@ def set_block_size(self, device, bs_kib):
             .format(bs_kib, device)
         )
         self.run('sync')
+
+    @property
+    def ip_address(self):
+        ipaddr = self.dataset_obj.get('ipv6') or self.dataset_obj.get('ipv4')
+        if not ipaddr:
+            raise ValueError('This host has no IP address!')
+        return ipaddr

igvm/hypervisor.py

@@ -212,7 +212,7 @@ def check_vm(self, vm, offline):
             )
 
         # Proper VLAN?
-        if not self.get_vlan_network(vm.dataset_obj['ipv6']):
+        if not self.get_vlan_network(vm.ip_address):
             raise HypervisorError(
                 'Hypervisor "{}" does not support route_network "{}".'
                 .format(self.fqdn, vm.route_network)

igvm/kvm.py

@@ -388,9 +388,7 @@ def generate_domain_xml(hypervisor, vm):
     #       VM, instead the VM is updated to the latest settings.
     #       Every KVM setting should be configurable via Serveradmin anyway.
     props = DomainProperties(hypervisor, vm)
-    vlan_network = hypervisor.get_vlan_network(
-        vm.dataset_obj.get('ipv6') or vm.dataset_obj.get('ipv4')
-    )
+    vlan_network = hypervisor.get_vlan_network(vm.ip_address)
 
     config = {
         'name': vm.uid_name,

igvm/vm.py

@@ -363,7 +363,7 @@ def start(self, force_stop_failed=True, transaction=None):
             raise VMError('VM did not come online in time')
 
         host_up = wait_until(
-            str(self.dataset_obj['ipv6']),
+            str(self.ip_address),
             waitmsg='Waiting for SSH to respond',
         )
         if not host_up and force_stop_failed:
@@ -408,7 +408,7 @@ def aws_start(self):
             raise VMError(e)
 
         host_up = wait_until(
-            str(self.dataset_obj['ipv6']),
+            str(self.ip_address),
             waitmsg='Waiting for SSH to respond',
         )
 
@@ -431,7 +431,7 @@ def aws_restart(self):
             raise VMError(e)
 
         host_up = wait_until(
-            str(self.dataset_obj['ipv6']),
+            str(self.ip_address),
             waitmsg='Waiting for SSH to respond',
             timeout=180
         )