agent: call send_networking_commands() in AddInterfaceOperation

circle/vm/operations.py

@@ -41,7 +41,7 @@ from .models import (
     Instance, InstanceActivity, InstanceTemplate, Interface, Node,
     Instance, InstanceActivity, InstanceTemplate, Interface, Node,
     NodeActivity, pwgen
     NodeActivity, pwgen
 )
 )
-from .tasks import agent_tasks
+from .tasks import agent_tasks, local_agent_tasks
 
 
 from dashboard.store_api import Store, NoStoreException
 from dashboard.store_api import Store, NoStoreException
 
 
@@ -153,6 +153,7 @@ class AddInterfaceOperation(InstanceOperation):
                     self.rollback(net, activity)
                     self.rollback(net, activity)
                 raise
                 raise
             net.deploy()
             net.deploy()
+            local_agent_tasks.send_networking_commands(self.instance, activity)
 
 
     def get_activity_name(self, kwargs):
     def get_activity_name(self, kwargs):
         return create_readable(ugettext_noop("add %(vlan)s interface"),
         return create_readable(ugettext_noop("add %(vlan)s interface"),

circle/vm/tasks/local_agent_tasks.py

@@ -33,7 +33,8 @@ from celery.result import TimeoutError
 from monitor.client import Client
 from monitor.client import Client
 
 
 
 
-def send_init_commands(instance, act, vm):
+def send_init_commands(instance, act):
+    vm = instance.vm_name
     queue = instance.get_remote_queue_name("agent")
     queue = instance.get_remote_queue_name("agent")
     with act.sub_activity('cleanup', readable_name=ugettext_noop('cleanup')):
     with act.sub_activity('cleanup', readable_name=ugettext_noop('cleanup')):
         cleanup.apply_async(queue=queue, args=(vm, ))
         cleanup.apply_async(queue=queue, args=(vm, ))
@@ -48,6 +49,17 @@ def send_init_commands(instance, act, vm):
             queue=queue, args=(vm, instance.primary_host.hostname))
             queue=queue, args=(vm, instance.primary_host.hostname))
 
 
 
 
+def send_networking_commands(instance, act):
+    queue = instance.get_remote_queue_name("agent")
+    with act.sub_activity('change_ip',
+                          readable_name=ugettext_noop('change ip')):
+        change_ip.apply_async(queue=queue, args=(
+            instance.vm_name, ) + get_network_configs(instance))
+    with act.sub_activity('restart_networking',
+                          readable_name=ugettext_noop('restart networking')):
+        restart_networking.apply_async(queue=queue, args=(instance.vm_name, ))
+
+
 def create_agent_tar():
 def create_agent_tar():
     def exclude(tarinfo):
     def exclude(tarinfo):
         if tarinfo.name.startswith('./.git'):
         if tarinfo.name.startswith('./.git'):
@@ -93,16 +105,9 @@ def agent_started(vm, version=None):
 
 
         if not initialized:
         if not initialized:
             measure_boot_time(instance)
             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, ))
+            send_init_commands(instance, act)
+
+        send_networking_commands(instance, act)
         with act.sub_activity(
         with act.sub_activity(
             'start_access_server',
             'start_access_server',
             readable_name=ugettext_noop('start access server')
             readable_name=ugettext_noop('start access server')