fix sliver_id in describe

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

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index fd4c750..8a16304 100644 (file)
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -18,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
@@ -35,19 +36,6 @@ def pubkeys_to_user_data(pubkeys):
         user_data += "\n"
     return user_data
 
-def instance_to_sliver(instance, xrn=None):
-    sliver_urn = None
-    if slice_xrn:
-        sliver_xrn = Xrn(xrn=slice_xrn, type='slice', id=instance.id).get_urn()
-
-    sliver = Sliver({'slice_id': sliver_urn,
-                     'name': instance.name,
-                     'type': instance.name,
-                     'cpus': str(instance.vcpus),
-                     'memory': str(instance.ram),
-                     'storage':  str(instance.disk)})
-    return sliver
-
 def image_to_rspec_disk_image(image):
     img = DiskImage()
     img['name'] = image['name']
@@ -86,7 +74,6 @@ class OSAggregate:
         instances = self.get_instances(urns)
         if len(instances) == 0:
             raise SliverDoesNotExist("You have not allocated any slivers here")
-
         geni_slivers = []
         rspec_nodes = []
         for instance in instances:
@@ -95,7 +82,7 @@ class OSAggregate:
         version_manager = VersionManager()
         version = version_manager.get_version(version)
         rspec_version = version_manager._get_version(version.type, version.version, 'manifest')
-        rspec = RSpec(version=version, user_options=options)
+        rspec = RSpec(version=rspec_version, user_options=options)
         rspec.version.add_nodes(rspec_nodes)
         result = {'geni_urn': Xrn(urns[0]).get_urn(),
                   'geni_rspec': rspec.toxml(), 
@@ -121,7 +108,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
 
@@ -140,15 +127,32 @@ class OSAggregate:
         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
@@ -166,8 +170,10 @@ class OSAggregate:
             if_xrn = PlXrn(auth=self.driver.hrn, 
                            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})
+                                   'client_id': if_client_id,
+                                   'sliver_id': if_sliver_id})
             interface['ips'] =  [{'address': private_ip['addr'],
                                  #'netmask': private_ip['network'],
                                  'type': private_ip['version']}]
@@ -204,10 +210,11 @@ class OSAggregate:
             op_status = 'geni_configuring'
         elif state == 'failed':
             op_status =' geni_failed'
-         
-        urn = OSXrn(name=instance.name, type='slice', id=instance.id).get_urn()
+        
+        sliver_hrn = '%s.%s' % (root_hrn, instance.id)
+        sliver_id = Xrn(sliver_hrn, type='sliver').urn 
         # required fields
-        geni_sliver = {'geni_sliver_urn': urn, 
+        geni_sliver = {'geni_sliver_urn': sliver_id, 
                        'geni_expires': None,
                        'geni_allocation_status': 'geni_provisioned',
                        'geni_operational_status': op_status,