vm: fix InterfaceTemplate.create

circle/vm/models/instance.py

@@ -307,13 +307,8 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
         inst.disks.add(*[disk.get_exclusive() for disk in disks])
         inst.disks.add(*[disk.get_exclusive() for disk in disks])
 
 
         for net in networks:
         for net in networks:
-            i = Interface.create(instance=inst, vlan=net.vlan,
+            Interface.create(instance=inst, vlan=net.vlan,
                              owner=inst.owner, managed=net.managed)
                              owner=inst.owner, managed=net.managed)
-            if i.host:
-                i.host.enable_net()
-                port, proto = ACCESS_PROTOCOLS[i.instance.access_method][1:3]
-                # TODO fix this port fw
-                i.host.add_port(proto, private=port)
 
 
         inst.req_traits.add(*req_traits)
         inst.req_traits.add(*req_traits)
         inst.tags.add(*tags)
         inst.tags.add(*tags)

circle/vm/models/network.py

@@ -121,6 +121,10 @@ class Interface(Model):
                 host.pub_ipv4 = vlan.snat_ip
                 host.pub_ipv4 = vlan.snat_ip
             host.full_clean()
             host.full_clean()
             host.save()
             host.save()
+            host.enable_net()
+            from .instance import ACCESS_PROTOCOLS
+            port, proto = ACCESS_PROTOCOLS[instance.access_method][1:3]
+            host.add_port(proto, private=port)
         else:
         else:
             host = None
             host = None