fix syntax errors

[sfa.git] / sfa / openstack / osaggregate.py

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index d6b16b0..d4eba12 100644 (file)
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -3,7 +3,8 @@ import os
 import socket
 import base64
 import string
-import random    
+import random
+import time    
 from collections import defaultdict
 from nova.exception import ImageNotFound
 from nova.api.ec2.cloud import CloudController
@@ -17,6 +18,7 @@ from sfa.rspecs.elements.login import Login
 from sfa.rspecs.elements.disk_image import DiskImage
 from sfa.rspecs.elements.services import Services
 from sfa.rspecs.elements.interface import Interface
+from sfa.rspecs.elements.fw_rule import FWRule
 from sfa.util.xrn import Xrn
 from sfa.planetlab.plxrn import PlXrn 
 from sfa.openstack.osxrn import OSXrn, hrn_to_os_slicename
@@ -120,7 +122,7 @@ class OSAggregate:
 
         # filter on id
         if ids:
-            instances = [server in servers if server.id in ids]
+            instances = [server for server in servers if server.id in ids]
 
         return instances
 
@@ -136,15 +138,35 @@ class OSAggregate:
         rspec_node['component_id'] = node_xrn.urn
         rspec_node['component_name'] = node_xrn.name
         rspec_node['component_manager_id'] = Xrn(self.driver.hrn, 'authority+cm').get_urn()
+        rspec_node['sliver_id'] = OSXrn(name=instance.name, type='slice', id=instance.id).get_urn() 
+        if instance.metadata.get('client_id'):
+            rspec_node['client_id'] = instance.metadata.get('client_id')
+
+        # get sliver details
         flavor = self.driver.shell.nova_manager.flavors.find(id=instance.flavor['id'])
-        rspec_node['slivers'] = [self.instance_to_sliver(flavor)]
+        sliver = self.instance_to_sliver(flavor)
+        # get firewall rules
+        fw_rules = []
+        group_name = instance.metadata.get('security_groups')
+        if group_name:
+            group = self.driver.shell.nova_manager.security_groups.find(name=group_name)
+            for rule in group.rules:
+                port_range ="%s:%s" % (rule['from_port'], rule['to_port'])
+                fw_rule = FWRule({'protocol': rule['ip_protocol'],
+                                  'port_range': port_range,
+                                  'cidr_ip': rule['ip_range']['cidr']})
+                fw_rules.append(fw_rule)
+        sliver['fw_rules'] = fw_rules 
+        rspec_node['slivers'] = [sliver]
+
+        # get disk image
         image = self.driver.shell.image_manager.get_images(id=instance.image['id'])
         if isinstance(image, list) and len(image) > 0:
             image = image[0]
         disk_image = image_to_rspec_disk_image(image)
         sliver['disk_image'] = [disk_image]
 
-        # build interfaces            
+        # get interfaces            
         rspec_node['services'] = []
         rspec_node['interfaces'] = []
         addresses = instance.addresses
@@ -160,8 +182,12 @@ class OSAggregate:
         
         for private_ip in addresses.get('private', []):
             if_xrn = PlXrn(auth=self.driver.hrn, 
-                           interface='node%s:eth0' % (instance.hostId)) 
-            interface = Interface({'component_id': if_xrn.urn})
+                           interface='node%s' % (instance.hostId)) 
+            if_client_id = Xrn(if_xrn.urn, type='interface', id="eth%s" %if_index).urn
+            if_sliver_id = Xrn(rspec_node['sliver_id'], type='slice', id="eth%s" %if_index).urn
+            interface = Interface({'component_id': if_xrn.urn,
+                                   'client_id': if_client_id,
+                                   'sliver_id': if_sliver_id})
             interface['ips'] =  [{'address': private_ip['addr'],
                                  #'netmask': private_ip['network'],
                                  'type': private_ip['version']}]
@@ -339,6 +365,8 @@ class OSAggregate:
                     metadata['security_groups'] = group_name
                     if node.get('component_id'):
                         metadata['component_id'] = node['component_id']
+                    if node.get('client_id'):
+                        metadata['client_id'] = node['client_id'] 
                     self.driver.shell.nova_manager.servers.create(flavor=flavor_id,
                                                             image=image_id,
                                                             key_name = key_name,
@@ -352,6 +380,22 @@ class OSAggregate:
 
 
     def delete_instance(self, tenant_name, instance_name, id=None):
+    
+        def _delete_security_group(instance):
+            security_group = instance.metadata.get('security_groups', '')
+            if security_group:
+                manager = SecurityGroup(self.driver)
+                timeout = 10.0 # wait a maximum of 10 seconds before forcing the security group delete
+                start_time = time.time()
+                instance_deleted = False
+                while instance_deleted == False and (time.time() - start_time) < timeout:
+                    inst = self.driver.shell.nova_manager.servers.findall(id=instance.id)
+                    if not inst:
+                        instance_deleted = True
+                    time.sleep(.5)
+                manager.delete_security_group(security_group)
+
+        thread_manager = ThreadManager() 
         self.driver.shell.nova_manager.connect(tenant=tenant_name)
         args = {'name': instance_name}
         if id:
@@ -359,14 +403,10 @@ class OSAggregate:
         instances = self.driver.shell.nova_manager.servers.findall(**args)
         security_group_manager = SecurityGroup(self.driver)
         for instance in instances:
-            # deleate this instance's security groups
-            security_group = instance.metadata.get('security_groups', '')
-            if security_group:
-                # dont delete the default security group
-                if security_group != 'default': 
-                    security_group_manager.delete_security_group(security_group)
             # destroy instance
             self.driver.shell.nova_manager.servers.delete(instance)
+            # deleate this instance's security groups
+            thread_manager.run(_delete_security_group, instance)
         return 1
 
     def stop_instances(self, instance_name, tenant_name, id=None):