From 7c06401d559d71baeb3f638b5b0961414bd99c44 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 13 Jun 2012 14:01:34 -0400 Subject: [PATCH] use hrn_to_os_slicename() instead of hrn_to_pl_slicename() --- sfa/openstack/nova_driver.py | 19 ++++++++++--------- sfa/openstack/osaggregate.py | 6 +++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index d42c7143..48c0511d 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -9,7 +9,8 @@ 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.plxrn import PlXrn, hrn_to_pl_slicename +from sfa.planetlab.plxrn import PlXrn +from sfa.openstack.osxrn import hrn_to_os_slicename from sfa.util.cache import Cache from sfa.trust.credential import Credential # used to be used in get_ticket @@ -74,7 +75,7 @@ class NovaDriver (Driver): if type == 'slice': # add slice description, name, researchers, PI - name = hrn_to_pl_slicename(hrn) + name = hrn_to_os_slicename(hrn) researchers = sfa_record.get('researchers', []) pis = sfa_record.get('pis', []) project_manager = None @@ -123,7 +124,7 @@ class NovaDriver (Driver): elif type == "slice": # can update project manager and description - name = hrn_to_pl_slicename(hrn) + name = hrn_to_os_slicename(hrn) researchers = sfa_record.get('researchers', []) pis = sfa_record.get('pis', []) project_manager = None @@ -149,7 +150,7 @@ class NovaDriver (Driver): 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']) + name = hrn_to_os_slicename(sfa_record['hrn']) if self.shell.auth_manager.get_project(name): self.shell.auth_manager.delete_project(name) return True @@ -176,7 +177,7 @@ class NovaDriver (Driver): keys = self.shell.db.key_pair_get_all_by_user(name) record['keys'] = [key.public_key for key in keys] elif record['type'] == 'slice': - name = hrn_to_pl_slicename(record['hrn']) + name = hrn_to_os_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] @@ -292,7 +293,7 @@ class NovaDriver (Driver): def sliver_status (self, slice_urn, slice_hrn): # find out where this slice is currently running - project_name = hrn_to_pl_slicename(slice_hrn) + project_name = hrn_to_os_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: @@ -331,7 +332,7 @@ class NovaDriver (Driver): def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, users, options): - project_name = hrn_to_pl_slicename(slice_hrn) + project_name = hrn_to_os_slicename(slice_hrn) aggregate = OSAggregate(self) # parse rspec rspec = RSpec(rspec_string) @@ -361,13 +362,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 - project_name = hrn_to_pl_slicename(slice_hrn) + project_name = hrn_to_os_slicename(slice_hrn) self.euca_shell.init_context(project_name) aggregate = OSAggregate(self) return aggregate.delete_instances(project_name) def update_sliver(self, slice_urn, slice_hrn, rspec, creds, options): - name = hrn_to_pl_slicename(slice_hrn) + name = hrn_to_os_slicename(slice_hrn) aggregate = OSAggregate(self) return aggregate.update_instances(name) diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py index 7fa8ec46..00ba6bc8 100644 --- a/sfa/openstack/osaggregate.py +++ b/sfa/openstack/osaggregate.py @@ -17,8 +17,8 @@ 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.util.plxrn import PlXrn, hrn_to_pl_slicename -from sfa.util.osxrn import OSXrn +from sfa.util.plxrn import PlXrn +from sfa.util.osxrn import OSXrn, hrn_to_os_slicename from sfa.rspecs.version_manager import VersionManager from sfa.openstack.image import ImageManager from sfa.openstack.security_group import SecurityGroup @@ -94,7 +94,7 @@ class OSAggregate: image_manager = ImageManager(self.driver) zones = self.get_availability_zones() - name = hrn_to_pl_slicename(slice_xrn) + name = hrn_to_os_slicename(slice_xrn) instances = self.driver.shell.db.instance_get_all_by_project(name) rspec_nodes = [] for instance in instances: -- 2.45.2