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
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
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
##########
def remove (self, sfa_record):
type=sfa_record['type']
- name = Xrn(sfa_record['hrn']).get_leaf()
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':
+ 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
records = [records]
for record in records:
- name = Xrn(record['hrn']).get_leaf()
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 \
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]
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:
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)
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)
- name = OSXrn(xrn=slice_urn).name
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):
- name = OSXrn(xrn=slice_urn).name
+ name = hrn_to_pl_slicename(slice_hrn)
aggregate = OSAggregate(self)
return aggregate.update_instances(name)
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
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:
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',
- 'hostname': interfaces[0]['ips'][0]['address'],
+ 'hostname': hostname,
'port':'22', 'username': 'root'})
service = Services({'login': login})
rspec_node['services'] = [service]