initial implementation of add interface operation

circle/dashboard/forms.py

@@ -997,8 +997,8 @@ class VmAddInterfaceForm(OperationForm):
         choices = kwargs.pop('choices')
         choices = kwargs.pop('choices')
         super(VmAddInterfaceForm, self).__init__(*args, **kwargs)
         super(VmAddInterfaceForm, self).__init__(*args, **kwargs)
 
 
-        field = forms.ModelChoiceField(
-            queryset=choices, required=False,
+        field = forms.ChoiceField(
+            choices=choices, required=False,
             label=self.label)
             label=self.label)
         if not choices:
         if not choices:
             field.widget.attrs['disabled'] = 'disabled'
             field.widget.attrs['disabled'] = 'disabled'

circle/dashboard/views/vm.py

@@ -350,13 +350,13 @@ class VmAddInterfaceView(FormOperationMixin, VmOperationView):
     with_reload = True
     with_reload = True
 
 
     def get_form_kwargs(self):
     def get_form_kwargs(self):
-        inst = self.get_op().instance
-        choices = Vlan.get_objects_with_level(
-            "user", self.request.user).exclude(
-            vm_interface__instance__in=[inst])
-        val = super(VmAddInterfaceView, self).get_form_kwargs()
-        val.update({'choices': choices})
-        return val
+        context = super(VmAddInterfaceView, self).get_form_kwargs()
+        networks = openstack_api.neutron.network_list_for_tenant(self.request, self.request.user.tenant_id)
+        choices = ((n.id, n.name) for n in networks)
+        context.update({
+            'choices': choices
+        })
+        return context
 
 
 #
 #
 # class VmDiskModifyView(FormOperationMixin, VmOperationView):
 # class VmDiskModifyView(FormOperationMixin, VmOperationView):

circle/openstack_api/nova.py

@@ -159,6 +159,9 @@ class Server(base.APIResourceWrapper):
     def host_server(self):
     def host_server(self):
         return getattr(self, 'OS-EXT-SRV-ATTR:host', '')
         return getattr(self, 'OS-EXT-SRV-ATTR:host', '')
 
 
+    def __repr__(self):
+        return self.name
+
 
 
 class Hypervisor(base.APIDictWrapper):
 class Hypervisor(base.APIDictWrapper):
     """Simple wrapper around novaclient.hypervisors.Hypervisor."""
     """Simple wrapper around novaclient.hypervisors.Hypervisor."""

circle/vm/operations.py

@@ -186,9 +186,8 @@ class AddInterfaceOperation(InstanceOperation):
     accept_states = ('SHUTOFF', 'ACTIVE') #TODO: try other states
     accept_states = ('SHUTOFF', 'ACTIVE') #TODO: try other states
     os_policy_actions = (("compute", "compute:attach_interface"),)
     os_policy_actions = (("compute", "compute:attach_interface"),)
 
 
-    def _operation(self, activity, user, system, vlan, managed=None):
-        print("Adding interface")
-
+    def _operation(self, request, user, system, vlan, managed=None):
+        openstack_api.nova.interface_attach(request, self.instance, net_id=vlan)
 
 
 @register_operation
 @register_operation
 class CreateDiskOperation(InstanceOperation):
 class CreateDiskOperation(InstanceOperation):