vm: add change_ip task

circle/firewall/models.py

@@ -600,6 +600,23 @@ class Host(models.Model):
                        description='created by host.save()',
                        type='AAAA').save()
 
+    def get_network_config(self):
+        interface = {'addresses': []}
+
+        if self.ipv4 and self.vlan.network4:
+            ipv4 = IPNetwork(self.ipv4)
+            ipv4.prefixlen = self.vlan.network4.prefixlen
+            interface['addresses'].append(str(ipv4))
+            interface['gw4'] = str(self.vlan.network4.ip)
+
+        if self.ipv6 and self.vlan.network6:
+            ipv6 = IPNetwork(self.ipv6)
+            ipv6.prefixlen = self.vlan.network6.prefixlen
+            interface['addresses'].append(str(ipv6))
+            interface['gw6'] = str(self.vlan.network6.ip)
+
+        return interface
+
     def enable_net(self):
         for i in settings.get('default_host_groups', []):
             self.groups.add(Group.objects.get(name=i))

circle/vm/tasks/agent_tasks.py

@@ -76,3 +76,8 @@ def get_keys(vm):
 @celery.task(name='agent.send_expiration')
 def send_expiration(vm, url):
     pass
+
+
+@celery.task(name='agent.change_ip')
+def change_ip(vm, interfaces, dns):
+    pass

circle/vm/tasks/local_agent_tasks.py

@@ -19,7 +19,9 @@ from common.models import create_readable
 from manager.mancelery import celery
 from vm.tasks.agent_tasks import (restart_networking, change_password,
                                   set_time, set_hostname, start_access_server,
-                                  cleanup, update)
+                                  cleanup, update, change_ip)
+from firewall.models import Host
+
 import time
 from base64 import encodestring
 from StringIO import StringIO
@@ -35,9 +37,6 @@ def send_init_commands(instance, act, vm):
     queue = instance.get_remote_queue_name("agent")
     with act.sub_activity('cleanup', readable_name=ugettext_noop('cleanup')):
         cleanup.apply_async(queue=queue, args=(vm, ))
-    with act.sub_activity('restart_networking',
-                          readable_name=ugettext_noop('restart networking')):
-        restart_networking.apply_async(queue=queue, args=(vm, ))
     with act.sub_activity('change_password',
                           readable_name=ugettext_noop('change password')):
         change_password.apply_async(queue=queue, args=(vm, instance.pw))
@@ -96,6 +95,14 @@ def agent_started(vm, version=None):
             measure_boot_time(instance)
             send_init_commands(instance, act, vm)
 
+        with act.sub_activity('change_ip',
+                              readable_name=ugettext_noop('change ip')):
+            change_ip.apply_async(queue=queue, args=(
+                vm, ) + get_network_configs(instance))
+        with act.sub_activity('restart_networking',
+                              readable_name=ugettext_noop(
+                                  'restart networking')):
+            restart_networking.apply_async(queue=queue, args=(vm, ))
         with act.sub_activity(
             'start_access_server',
             readable_name=ugettext_noop('start access server')
@@ -134,6 +141,13 @@ def agent_stopped(vm):
         pass
 
 
+def get_network_configs(instance):
+    interfaces = {}
+    for host in Host.objects.filter(interface__instance=instance):
+        interfaces[str(host.mac)] = host.get_network_config()
+    return (interfaces, settings.FIREWALL_SETTINGS['rdns_ip'])
+
+
 def update_agent(instance, act=None):
     if act:
         act = act.sub_activity(