avoid project name collision by using planetlab conventions for project names

diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index e4b95b0..d42c714 100644 (file)
--- a/sfa/openstack/nova_driver.py
+++ b/sfa/openstack/nova_driver.py
@@ -9,6 +9,7 @@ from sfa.util.sfalogging import logger
 from sfa.util.defaultdict import defaultdict
 from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch
 from sfa.util.xrn import Xrn, hrn_to_urn, get_leaf, urn_to_sliver_id
 from sfa.util.defaultdict import defaultdict
 from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch
 from sfa.util.xrn import Xrn, hrn_to_urn, get_leaf, urn_to_sliver_id

+from sfa.util.plxrn import PlXrn, hrn_to_pl_slicename

 from sfa.util.cache import Cache
 from sfa.trust.credential import Credential
 # used to be used in get_ticket
 from sfa.util.cache import Cache
 from sfa.trust.credential import Credential
 # used to be used in get_ticket


@@ -73,7 +74,7 @@ class NovaDriver (Driver):
            
         if type == 'slice':
             # add slice description, name, researchers, PI 
            
         if type == 'slice':
             # add slice description, name, researchers, PI 

-            name = Xrn(hrn).get_leaf()
+            name = hrn_to_pl_slicename(hrn)

             researchers = sfa_record.get('researchers', [])
             pis = sfa_record.get('pis', [])
             project_manager = None
             researchers = sfa_record.get('researchers', [])
             pis = sfa_record.get('pis', [])
             project_manager = None


@@ -122,7 +123,7 @@ class NovaDriver (Driver):
 
         elif type == "slice":
             # can update project manager and description
 
         elif type == "slice":
             # can update project manager and description

-            name = Xrn(hrn).get_leaf()
+            name = hrn_to_pl_slicename(hrn)

             researchers = sfa_record.get('researchers', [])
             pis = sfa_record.get('pis', [])
             project_manager = None
             researchers = sfa_record.get('researchers', [])
             pis = sfa_record.get('pis', [])
             project_manager = None


@@ -143,11 +144,12 @@ class NovaDriver (Driver):
     ##########
     def remove (self, sfa_record):
         type=sfa_record['type']
     ##########
     def remove (self, sfa_record):
         type=sfa_record['type']

-        name = Xrn(sfa_record['hrn']).get_leaf()     

         if type == 'user':
         if type == 'user':

+            name = Xrn(sfa_record['hrn']).get_leaf()     

             if self.shell.auth_manager.get_user(name):
                 self.shell.auth_manager.delete_user(name)
         elif type == 'slice':
             if self.shell.auth_manager.get_user(name):
                 self.shell.auth_manager.delete_user(name)
         elif type == 'slice':

+            name = hrn_to_pl_slicename(sfa_record['hrn'])     

             if self.shell.auth_manager.get_project(name):
                 self.shell.auth_manager.delete_project(name)
         return True
             if self.shell.auth_manager.get_project(name):
                 self.shell.auth_manager.delete_project(name)
         return True


@@ -163,9 +165,9 @@ class NovaDriver (Driver):
             records = [records]
 
         for record in records:
             records = [records]
 
         for record in records:

-            name = Xrn(record['hrn']).get_leaf()

             os_record = None
             if record['type'] == 'user':
             os_record = None
             if record['type'] == 'user':

+                name = Xrn(record['hrn']).get_leaf()

                 os_record = self.shell.auth_manager.get_user(name)
                 projects = self.shell.db.project_get_by_user(name)
                 record['slices'] = [self.hrn + "." + proj.name for \
                 os_record = self.shell.auth_manager.get_user(name)
                 projects = self.shell.db.project_get_by_user(name)
                 record['slices'] = [self.hrn + "." + proj.name for \


@@ -173,7 +175,8 @@ class NovaDriver (Driver):
                 record['roles'] = self.shell.db.user_get_roles(name)
                 keys = self.shell.db.key_pair_get_all_by_user(name)
                 record['keys'] = [key.public_key for key in keys]     
                 record['roles'] = self.shell.db.user_get_roles(name)
                 keys = self.shell.db.key_pair_get_all_by_user(name)
                 record['keys'] = [key.public_key for key in keys]     

-            elif record['type'] == 'slice': 
+            elif record['type'] == 'slice':
+                name = hrn_to_pl_slicename(record['hrn']) 

                 os_record = self.shell.auth_manager.get_project(name)
                 record['description'] = os_record.description
                 record['PI'] = [self.hrn + "." + os_record.project_manager.name]
                 os_record = self.shell.auth_manager.get_project(name)
                 record['description'] = os_record.description
                 record['PI'] = [self.hrn + "." + os_record.project_manager.name]


@@ -289,7 +292,7 @@ class NovaDriver (Driver):
     
     def sliver_status (self, slice_urn, slice_hrn):
         # find out where this slice is currently running
     
     def sliver_status (self, slice_urn, slice_hrn):
         # find out where this slice is currently running

-        project_name = Xrn(slice_urn).get_leaf()
+        project_name = hrn_to_pl_slicename(slice_hrn)

         project = self.shell.auth_manager.get_project(project_name)
         instances = self.shell.db.instance_get_all_by_project(project_name)
         if len(instances) == 0:
         project = self.shell.auth_manager.get_project(project_name)
         instances = self.shell.db.instance_get_all_by_project(project_name)
         if len(instances) == 0:


@@ -328,7 +331,7 @@ class NovaDriver (Driver):
 
     def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, users, options):
 
 
     def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, users, options):
 

-        project_name = get_leaf(slice_hrn)
+        project_name = hrn_to_pl_slicename(slice_hrn)

         aggregate = OSAggregate(self)
         # parse rspec
         rspec = RSpec(rspec_string)
         aggregate = OSAggregate(self)
         # parse rspec
         rspec = RSpec(rspec_string)


@@ -358,14 +361,13 @@ class NovaDriver (Driver):
 
     def delete_sliver (self, slice_urn, slice_hrn, creds, options):
         # we need to do this using the context of one of the slice users
 
     def delete_sliver (self, slice_urn, slice_hrn, creds, options):
         # we need to do this using the context of one of the slice users

-        project_name = Xrn(slice_urn).get_leaf()
+        project_name = hrn_to_pl_slicename(slice_hrn)

         self.euca_shell.init_context(project_name) 
         self.euca_shell.init_context(project_name) 

-        name = OSXrn(xrn=slice_urn).name

         aggregate = OSAggregate(self)
         aggregate = OSAggregate(self)

-        return aggregate.delete_instances(name)   
+        return aggregate.delete_instances(project_name)   

 
     def update_sliver(self, slice_urn, slice_hrn, rspec, creds, options):
 
     def update_sliver(self, slice_urn, slice_hrn, rspec, creds, options):

-        name = OSXrn(xrn=slice_urn).name
+        name = hrn_to_pl_slicename(slice_hrn)

         aggregate = OSAggregate(self)
         return aggregate.update_instances(name)
     
         aggregate = OSAggregate(self)
         return aggregate.update_instances(name)
     

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index b98d427..def366f 100644 (file)
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -17,7 +17,7 @@ from sfa.rspecs.elements.disk_image import DiskImage
 from sfa.rspecs.elements.services import Services
 from sfa.rspecs.elements.interface import Interface
 from sfa.util.xrn import Xrn
 from sfa.rspecs.elements.services import Services
 from sfa.rspecs.elements.interface import Interface
 from sfa.util.xrn import Xrn

-from sfa.util.plxrn import PlXrn
+from sfa.util.plxrn import PlXrn, hrn_to_pl_slicename

 from sfa.util.osxrn import OSXrn
 from sfa.rspecs.version_manager import VersionManager
 from sfa.openstack.image import ImageManager
 from sfa.util.osxrn import OSXrn
 from sfa.rspecs.version_manager import VersionManager
 from sfa.openstack.image import ImageManager


@@ -93,7 +93,7 @@ class OSAggregate:
         image_manager = ImageManager(self.driver)
 
         zones = self.get_availability_zones()
         image_manager = ImageManager(self.driver)
 
         zones = self.get_availability_zones()

-        name = OSXrn(xrn = slice_xrn).name
+        name = hrn_to_pl_slicename(slice_xrn)

         instances = self.driver.shell.db.instance_get_all_by_project(name)
         rspec_nodes = []
         for instance in instances:
         instances = self.driver.shell.db.instance_get_all_by_project(name)
         rspec_nodes = []
         for instance in instances:


@@ -121,8 +121,15 @@ class OSAggregate:
             rspec_node['slivers'] = [sliver]
             rspec_node['interfaces'] = interfaces
             # slivers always provide the ssh service
             rspec_node['slivers'] = [sliver]
             rspec_node['interfaces'] = interfaces
             # slivers always provide the ssh service

+            hostname = None
+            for interface in interfaces:
+                if 'ips' in interface and interface['ips'] and \
+                isinstance(interface['ips'], list):
+                    if interface['ips'][0].get('address'):
+                        hostname = interface['ips'][0].get('address')
+                        break 

             login = Login({'authentication': 'ssh-keys', 
             login = Login({'authentication': 'ssh-keys', 

-                           'hostname': interfaces[0]['ips'][0]['address'], 
+                           'hostname': hostname, 

                            'port':'22', 'username': 'root'})
             service = Services({'login': login})
             rspec_node['services'] = [service] 
                            'port':'22', 'username': 'root'})
             service = Services({'login': login})
             rspec_node['services'] = [service]