Merge pull request #285 from innogames/ipv6_vms

Allow building VMs with only IPv6 address

Author: TuxPowered42

igvm/commands.py

@@ -13,7 +13,7 @@
 from typing import List, Optional
 
 from adminapi import parse
-from adminapi.dataset import Query
+from adminapi.dataset import Query, DatasetError
 from adminapi.filters import Any, BaseFilter, StartsWith, Contains
 from fabric.colors import green, red, white, yellow
 from fabric.network import disconnect_all
@@ -26,7 +26,7 @@
     HypervisorError,
     IGVMError,
     InconsistentAttributeError,
-    InvalidStateError,
+    InvalidStateError, NetworkError,
 )
 from igvm.host import with_fabric_settings
 from igvm.hypervisor import Hypervisor
@@ -268,14 +268,22 @@ def change_address(
             err = 'Current hypervisor does not support new subnet!'
             raise ConfigError(err)
 
-        new_network = Query(
-            {
-                'servertype': 'route_network',
-                'state': 'online',
-                'network_type': 'internal',
-                'intern_ip': Contains(new_address),
-            }
-        ).get()['hostname']
+        for attr in ('ipv4', 'ipv6'):
+            try:
+                new_network = Query(
+                    {
+                        'servertype': 'route_network',
+                        'state': 'online',
+                        'network_type': 'internal',
+                        attr: Contains(new_address),
+                    }
+                ).get()['hostname']
+                break
+            except DatasetError:
+                new_network = None
+
+        if new_network is None:
+            raise NetworkError(f'Can\'t find a route_network for IP address {new_address}')
 
         vm_was_running = vm.is_running()
 

igvm/hypervisor.py

@@ -155,7 +155,7 @@ def get_vlan_network(self, ip_addr):
         its IP address changed.
         """
         for vlan_network in self.dataset_obj['vlan_networks']:
-            if ip_addr in vlan_network['intern_ip']:
+            if ip_addr in vlan_network['ipv4'] or ip_addr in vlan_network['ipv6']:
                 return vlan_network
         return None
 

igvm/settings.py

@@ -137,7 +137,8 @@
     {
         'vlan_networks': [
             'hostname',
-            'intern_ip',
+            'ipv4',
+            'ipv6',
             'vlan_tag',
         ],
     },

igvm/utils.py

@@ -5,6 +5,7 @@
 
 from __future__ import division
 
+import ipaddress
 import logging
 import socket
 import time
@@ -49,7 +50,11 @@ def retry_wait_backoff(fn_check, fail_msg, max_wait=20):
 
 
 def ping_port(ip, port=22, timeout=1):
-    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    ip_type = ipaddress.ip_address(ip)
+    if ip_type.version == 4:
+        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    else:
+        s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
     s.settimeout(timeout)
     try:
         s.connect((ip, port))

tests/conftest.py

@@ -74,8 +74,9 @@ def clean_all(route_network, datacenter_type, vm_hostname=None):
     # logic to assign them and we want to avoid IP address conflicts.
     # Index 1 is usually used for the test's subject VM,
     # 2 might be used for testing IP change.
-    ips = [get_next_address(VM_NET, i) for i in [1, 2]]
-    clean_serveradmin({'intern_ip': Any(*ips)})
+    for ip_attr in ('ipv4', 'ipv6'):
+        ips = [get_next_address(VM_NET, i, ip_attr) for i in [1, 2]]
+        clean_serveradmin({ip_attr: Any(*ips)})
 
 
 def clean_hv(hv, pattern):
@@ -208,16 +209,16 @@ def _wait_for_state_reached(ec2_client, instance_id: str, state: str,
             raise
 
 
-def get_next_address(vm_net, index):
+def get_next_address(vm_net, index, ip_attr):
     non_vm_hosts = list(Query({
         'project_network': vm_net,
         'servertype': Not('vm'),
-    }, ['intern_ip']))
+    }, [ip_attr]))
     offset = 1 if len(non_vm_hosts) > 0 else 0
     subnet_levels = ceil(log(PYTEST_XDIST_WORKER_COUNT + offset, 2))
-    project_network = Query({'hostname': vm_net}, ['intern_ip']).get()
+    project_network = Query({'hostname': vm_net}, [ip_attr]).get()
     try:
-        subnets = list(project_network['intern_ip'].subnets(subnet_levels))
+        subnets = list(project_network[ip_attr].subnets(subnet_levels))
     except ValueError:
         raise IGVMTestError(
             'Can\'t split {} into enough subnets '

tests/test_integration.py

@@ -73,6 +73,8 @@ def teardown_module():
 
 
 class IGVMTest(TestCase):
+    ip_attr = 'ipv4'
+
     def setUp(self):
         """Initialize VM object before every test
 
@@ -112,7 +114,7 @@ def setUp(self):
         self.vm_obj['environment'] = 'testing'
         self.vm_obj['hostname'] = VM_HOSTNAME
         self.vm_obj['hypervisor'] = None
-        self.vm_obj['intern_ip'] = get_next_address(VM_NET, 1)
+        self.vm_obj['intern_ip'] = get_next_address(VM_NET, 1, self.ip_attr)
         self.vm_obj['memory'] = 2048
         self.vm_obj['no_monitoring'] = True
         self.vm_obj['num_cpu'] = 2
@@ -225,7 +227,7 @@ def test_kvm_hwmodel_to_cpumodel(self):
                 msg='Missing hardware_model in KVM_HWMODEL_TO_CPUMODEL')
 
 
-class BuildTest(IGVMTest):
+class _BuildTest(IGVMTest):
     """Test many possible VM building scenarios"""
 
     def test_vm_build(self):
@@ -291,6 +293,13 @@ def test_rebuild(self):
             vm.run('test ! -f /root/initial_canary')
 
 
+class BuildTestIPv4(_BuildTest):
+    ip_attr = 'ipv4'
+
+
+class BuildTestIPv6(_BuildTest):
+    ip_attr = 'ipv6'
+
 class CommandTest(IGVMTest):
     def setUp(self):
         super(CommandTest, self).setUp()
@@ -682,7 +691,7 @@ def test_new_address(self):
         # We don't have a way to ask for new IP address from Serveradmin
         # and lock it for us. The method below will usually work fine.
         # When it starts failing, we must develop retry method.
-        new_address = get_next_address(VM_NET, 2)
+        new_address = get_next_address(VM_NET, 2, 'ipv4')
 
         change_address(VM_HOSTNAME, new_address, offline=True)