#
from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \
RecordNotFound, SfaNotImplemented, SliverDoesNotExist, SearchFailed, \
- UnsupportedOperation, Forbidden
+ UnsupportedOperation, Forbidden
from sfa.util.sfalogging import logger
from sfa.util.defaultdict import defaultdict
from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch
convert a list of dictionaries into a dictionary keyed on the
specified dictionary key
"""
- return { rec[key] : rec for rec in recs }
+ return {rec[key]: rec for rec in recs}
#
# PlShell is just an xmlrpc serverproxy where methods
# can be sent as-is; it takes care of authentication
# from the global config
-#
+#
+
+
class PlDriver (Driver):
- # the cache instance is a class member so it survives across incoming requests
+ # the cache instance is a class member so it survives across incoming
+ # requests
cache = None
- def __init__ (self, api):
- Driver.__init__ (self, api)
+ def __init__(self, api):
+ Driver.__init__(self, api)
config = api.config
- self.shell = PlShell (config)
+ self.shell = PlShell(config)
self.cache = None
if config.SFA_AGGREGATE_CACHING:
if PlDriver.cache is None:
try:
filter['slice_id'] = int(sliver_id_parts[0])
except ValueError:
- filter['name'] = sliver_id_parts[0]
+ filter['name'] = sliver_id_parts[0]
slices = self.shell.GetSlices(filter, ['hrn'])
if not slices:
- raise Forbidden("Unable to locate slice record for sliver: {}".format(xrn))
+ raise Forbidden(
+ "Unable to locate slice record for sliver: {}".format(xrn))
slice = slices[0]
slice_xrn = slice['hrn']
- return slice_xrn
-
+ return slice_xrn
+
def check_sliver_credentials(self, creds, urns):
# build list of cred object hrns
slice_cred_names = []
for cred in creds:
- slice_cred_hrn = Credential(cred=cred).get_gid_object().get_hrn()
+ slice_cred_hrn = Credential(cred=cred).get_gid_object().get_hrn()
top_auth_hrn = top_auth(slice_cred_hrn)
site_hrn = '.'.join(slice_cred_hrn.split('.')[:-1])
slice_part = slice_cred_hrn.split('.')[-1]
else:
login_base = hash_loginbase(site_hrn)
- slicename = '_'.join([login_base, slice_part])
- slice_cred_names.append(slicename)
+ slicename = '_'.join([login_base, slice_part])
+ slice_cred_names.append(slicename)
# look up slice name of slivers listed in urns arg
slice_ids = []
sliver_id_parts = Xrn(xrn=urn).get_sliver_id_parts()
try:
slice_ids.append(int(sliver_id_parts[0]))
- except ValueError:
+ except ValueError:
pass
if not slice_ids:
- raise Forbidden("sliver urn not provided")
+ raise Forbidden("sliver urn not provided")
slices = self.shell.GetSlices(slice_ids)
sliver_names = [slice['name'] for slice in slices]
# make sure we have a credential for every specified sliver ierd
for sliver_name in sliver_names:
if sliver_name not in slice_cred_names:
- msg = "Valid credential not found for target: {}".format(sliver_name)
+ msg = "Valid credential not found for target: {}".format(
+ sliver_name)
raise Forbidden(msg)
########################################
- ########## registry oriented
+ # registry oriented
########################################
- def augment_records_with_testbed_info (self, sfa_records):
- return self.fill_record_info (sfa_records)
+ def augment_records_with_testbed_info(self, sfa_records):
+ return self.fill_record_info(sfa_records)
- ##########
- def register (self, sfa_record, hrn, pub_key):
+ ##########
+ def register(self, sfa_record, hrn, pub_key):
type = sfa_record['type']
pl_record = self.sfa_fields_to_pl_fields(type, hrn, sfa_record)
if type == 'authority':
- sites = self.shell.GetSites({'peer_id': None, 'login_base': pl_record['login_base']})
+ sites = self.shell.GetSites(
+ {'peer_id': None, 'login_base': pl_record['login_base']})
if not sites:
- # xxx when a site gets registered through SFA we need to set its max_slices
+ # xxx when a site gets registered through SFA we need to set
+ # its max_slices
if 'max_slices' not in pl_record:
pl_record['max_slices'] = 2
pointer = self.shell.AddSite(pl_record)
for key in pl_record.keys():
if key not in acceptable_fields:
pl_record.pop(key)
- slices = self.shell.GetSlices({'peer_id': None, 'name': pl_record['name']})
+ slices = self.shell.GetSlices(
+ {'peer_id': None, 'name': pl_record['name']})
if not slices:
- if not pl_record.get('url', None) or not pl_record.get('description', None):
- pl_record['url'] = hrn
- pl_record['description'] = hrn
+ if not pl_record.get('url', None) or not pl_record.get('description', None):
+ pl_record['url'] = hrn
+ pl_record['description'] = hrn
- pointer = self.shell.AddSlice(pl_record)
- self.shell.SetSliceHrn(int(pointer), hrn)
+ pointer = self.shell.AddSlice(pl_record)
+ self.shell.SetSliceHrn(int(pointer), hrn)
else:
- pointer = slices[0]['slice_id']
+ pointer = slices[0]['slice_id']
elif type == 'user':
- persons = self.shell.GetPersons({'peer_id': None, 'email': sfa_record['email']})
+ persons = self.shell.GetPersons(
+ {'peer_id': None, 'email': sfa_record['email']})
if not persons:
- for key in ['first_name','last_name']:
+ for key in ['first_name', 'last_name']:
if key not in sfa_record:
sfa_record[key] = '*from*sfa*'
# AddPerson does not allow everything to be set
- can_add = ['first_name', 'last_name', 'title','email', 'password', 'phone', 'url', 'bio']
- add_person_dict = { k : sfa_record[k] for k in sfa_record if k in can_add }
+ can_add = ['first_name', 'last_name', 'title',
+ 'email', 'password', 'phone', 'url', 'bio']
+ add_person_dict = {k: sfa_record[k]
+ for k in sfa_record if k in can_add}
pointer = self.shell.AddPerson(add_person_dict)
self.shell.SetPersonHrn(int(pointer), hrn)
else:
pointer = persons[0]['person_id']
-
+
# enable the person's account
self.shell.UpdatePerson(pointer, {'enabled': True})
# add this person to the site
login_base = get_leaf(sfa_record['authority'])
self.shell.AddPersonToSite(pointer, login_base)
-
+
# What roles should this user have?
roles = []
- if 'roles' in sfa_record:
+ if 'roles' in sfa_record:
# if specified in xml, but only low-level roles
- roles = [ role for role in sfa_record['roles'] if role in ['user','tech'] ]
+ roles = [role for role in sfa_record[
+ 'roles'] if role in ['user', 'tech']]
# at least user if no other cluse could be found
if not roles:
roles = ['user']
self.shell.AddRoleToPerson(role, pointer)
# Add the user's key
if pub_key:
- self.shell.AddPersonKey(pointer, {'key_type' : 'ssh', 'key' : pub_key})
+ self.shell.AddPersonKey(
+ pointer, {'key_type': 'ssh', 'key': pub_key})
elif type == 'node':
- login_base = PlXrn(xrn=sfa_record['authority'], type='authority').pl_login_base()
- nodes = self.shell.GetNodes({'peer_id': None, 'hostname': pl_record['hostname']})
+ login_base = PlXrn(
+ xrn=sfa_record['authority'], type='authority').pl_login_base()
+ nodes = self.shell.GetNodes(
+ {'peer_id': None, 'hostname': pl_record['hostname']})
if not nodes:
pointer = self.shell.AddNode(login_base, pl_record)
self.shell.SetNodeHrn(int(pointer), hrn)
else:
pointer = nodes[0]['node_id']
-
+
return pointer
-
+
##########
- # xxx actually old_sfa_record comes filled with plc stuff as well in the original code
- def update (self, old_sfa_record, new_sfa_record, hrn, new_key):
+ # xxx actually old_sfa_record comes filled with plc stuff as well in the
+ # original code
+ def update(self, old_sfa_record, new_sfa_record, hrn, new_key):
pointer = old_sfa_record['pointer']
type = old_sfa_record['type']
new_key_pointer = None
# new_key implemented for users only
- if new_key and type not in [ 'user' ]:
+ if new_key and type not in ['user']:
raise UnknownSfaType(type)
if (type == "authority"):
- logger.debug("pldriver.update: calling UpdateSite with {}".format(new_sfa_record))
+ logger.debug(
+ "pldriver.update: calling UpdateSite with {}".format(new_sfa_record))
self.shell.UpdateSite(pointer, new_sfa_record)
self.shell.SetSiteHrn(pointer, hrn)
-
+
elif type == "slice":
pl_record = self.sfa_fields_to_pl_fields(type, hrn, new_sfa_record)
if 'name' in pl_record:
pl_record.pop('name')
self.shell.UpdateSlice(pointer, pl_record)
self.shell.SetSliceHrn(pointer, hrn)
-
+
elif type == "user":
# SMBAKER: UpdatePerson only allows a limited set of fields to be
# updated. Ideally we should have a more generic way of doing
'enabled']:
update_fields[key] = all_fields[key]
# when updating a user, we always get a 'email' field at this point
- # this is because 'email' is a native field in the RegUser object...
+ # this is because 'email' is a native field in the RegUser
+ # object...
if 'email' in update_fields and not update_fields['email']:
del update_fields['email']
self.shell.UpdatePerson(pointer, update_fields)
self.shell.SetPersonHrn(pointer, hrn)
-
+
if new_key:
# must check this key against the previous one if it exists
- persons = self.shell.GetPersons({'peer_id': None, 'person_id': pointer}, ['key_ids'])
+ persons = self.shell.GetPersons(
+ {'peer_id': None, 'person_id': pointer}, ['key_ids'])
person = persons[0]
keys = person['key_ids']
keys = self.shell.GetKeys(person['key_ids'])
-
+
key_exists = False
for key in keys:
if new_key == key['key']:
new_key_pointer = key['key_id']
break
if not key_exists:
- new_key_pointer = self.shell.AddPersonKey(pointer, {'key_type': 'ssh', 'key': new_key})
-
+ new_key_pointer = self.shell.AddPersonKey(
+ pointer, {'key_type': 'ssh', 'key': new_key})
+
elif type == "node":
self.shell.UpdateNode(pointer, new_sfa_record)
return (pointer, new_key_pointer)
-
##########
- def remove (self, sfa_record):
+ def remove(self, sfa_record):
type = sfa_record['type']
pointer = sfa_record['pointer']
if type == 'user':
- persons = self.shell.GetPersons({'peer_id': None, 'person_id': pointer})
+ persons = self.shell.GetPersons(
+ {'peer_id': None, 'person_id': pointer})
# only delete this person if he has site ids. if he doesnt, it probably means
# he was just removed from a site, not actually deleted
if persons and persons[0]['site_ids']:
return True
-
##
# Convert SFA fields to PLC fields for use when registering or updating
# registry record in the PLC database
def sfa_fields_to_pl_fields(self, type, hrn, sfa_record):
pl_record = {}
-
+
if type == "slice":
pl_record["name"] = hrn_to_pl_slicename(hrn)
if "instantiation" in sfa_record:
pl_record['instantiation'] = sfa_record['instantiation']
else:
pl_record["instantiation"] = "plc-instantiated"
- if "url" in sfa_record:
- pl_record["url"] = sfa_record["url"]
- if "description" in sfa_record:
- pl_record["description"] = sfa_record["description"]
+ if "url" in sfa_record:
+ pl_record["url"] = sfa_record["url"]
+ if "description" in sfa_record:
+ pl_record["description"] = sfa_record["description"]
if "expires" in sfa_record:
date = utcparse(sfa_record['expires'])
expires = datetime_to_epoch(date)
if "hostname" not in sfa_record:
raise MissingSfaInfo("hostname")
pl_record["hostname"] = sfa_record["hostname"]
- if "model" in sfa_record:
+ if "model" in sfa_record:
pl_record["model"] = sfa_record["model"]
else:
pl_record["model"] = "geni"
elif type == "authority":
- pl_record["login_base"] = PlXrn(xrn=hrn,type='authority').pl_login_base()
+ pl_record["login_base"] = PlXrn(
+ xrn=hrn, type='authority').pl_login_base()
if "name" not in sfa_record or not sfa_record['name']:
pl_record["name"] = hrn
if "abbreviated_name" not in sfa_record:
Fill in the planetlab specific fields of a SFA record. This
involves calling the appropriate PLC method to retrieve the
database record for the object.
-
+
@param record: record to fill in field (in/out param)
"""
# get ids by type
- node_ids, site_ids, slice_ids = [], [], []
+ node_ids, site_ids, slice_ids = [], [], []
person_ids, key_ids = [], []
type_map = {'node': node_ids, 'authority': site_ids,
'slice': slice_ids, 'user': person_ids}
-
+
for record in records:
for type in type_map:
if type == record['type']:
# get pl records
nodes, sites, slices, persons, keys = {}, {}, {}, {}, {}
if node_ids:
- node_list = self.shell.GetNodes({'peer_id': None, 'node_id': node_ids})
+ node_list = self.shell.GetNodes(
+ {'peer_id': None, 'node_id': node_ids})
nodes = list_to_dict(node_list, 'node_id')
if site_ids:
- site_list = self.shell.GetSites({'peer_id': None, 'site_id': site_ids})
+ site_list = self.shell.GetSites(
+ {'peer_id': None, 'site_id': site_ids})
sites = list_to_dict(site_list, 'site_id')
if slice_ids:
- slice_list = self.shell.GetSlices({'peer_id': None, 'slice_id': slice_ids})
+ slice_list = self.shell.GetSlices(
+ {'peer_id': None, 'slice_id': slice_ids})
slices = list_to_dict(slice_list, 'slice_id')
if person_ids:
- person_list = self.shell.GetPersons({'peer_id': None, 'person_id': person_ids})
+ person_list = self.shell.GetPersons(
+ {'peer_id': None, 'person_id': person_ids})
persons = list_to_dict(person_list, 'person_id')
for person in persons:
key_ids.extend(persons[person]['key_ids'])
# authorities, but not PL "sites"
if record['pointer'] == -1:
continue
-
+
for type in pl_records:
if record['type'] == type:
if record['pointer'] in pl_records[type]:
# fill in key info
if record['type'] == 'user':
if 'key_ids' not in record:
- logger.info("user record has no 'key_ids' - need to import from myplc ?")
+ logger.info(
+ "user record has no 'key_ids' - need to import from myplc ?")
else:
- pubkeys = [keys[key_id]['key'] for key_id in record['key_ids'] if key_id in keys]
+ pubkeys = [keys[key_id]['key']
+ for key_id in record['key_ids'] if key_id in keys]
record['keys'] = pubkeys
return records
# get pl records
slices, persons, sites, nodes = {}, {}, {}, {}
if site_ids:
- site_list = self.shell.GetSites({'peer_id': None, 'site_id': site_ids}, ['site_id', 'login_base'])
+ site_list = self.shell.GetSites({'peer_id': None, 'site_id': site_ids}, [
+ 'site_id', 'login_base'])
sites = list_to_dict(site_list, 'site_id')
if person_ids:
- person_list = self.shell.GetPersons({'peer_id': None, 'person_id': person_ids}, ['person_id', 'email'])
+ person_list = self.shell.GetPersons(
+ {'peer_id': None, 'person_id': person_ids}, ['person_id', 'email'])
persons = list_to_dict(person_list, 'person_id')
if slice_ids:
- slice_list = self.shell.GetSlices({'peer_id': None, 'slice_id': slice_ids}, ['slice_id', 'name'])
- slices = list_to_dict(slice_list, 'slice_id')
+ slice_list = self.shell.GetSlices(
+ {'peer_id': None, 'slice_id': slice_ids}, ['slice_id', 'name'])
+ slices = list_to_dict(slice_list, 'slice_id')
if node_ids:
- node_list = self.shell.GetNodes({'peer_id': None, 'node_id': node_ids}, ['node_id', 'hostname'])
+ node_list = self.shell.GetNodes(
+ {'peer_id': None, 'node_id': node_ids}, ['node_id', 'hostname'])
nodes = list_to_dict(node_list, 'node_id')
-
+
# convert ids to hrns
for record in records:
# get all relevant data
login_base = site['login_base']
record['site'] = ".".join([auth_hrn, login_base])
if 'person_ids' in record:
- emails = [persons[person_id]['email'] for person_id in record['person_ids'] \
- if person_id in persons]
+ emails = [persons[person_id]['email'] for person_id in record['person_ids']
+ if person_id in persons]
usernames = [email.split('@')[0] for email in emails]
- person_hrns = [".".join([auth_hrn, login_base, username]) for username in usernames]
- record['persons'] = person_hrns
+ person_hrns = [".".join([auth_hrn, login_base, username])
+ for username in usernames]
+ record['persons'] = person_hrns
if 'slice_ids' in record:
- slicenames = [slices[slice_id]['name'] for slice_id in record['slice_ids'] \
+ slicenames = [slices[slice_id]['name'] for slice_id in record['slice_ids']
if slice_id in slices]
- slice_hrns = [slicename_to_hrn(auth_hrn, slicename) for slicename in slicenames]
+ slice_hrns = [slicename_to_hrn(
+ auth_hrn, slicename) for slicename in slicenames]
record['slices'] = slice_hrns
if 'node_ids' in record:
- hostnames = [nodes[node_id]['hostname'] for node_id in record['node_ids'] \
+ hostnames = [nodes[node_id]['hostname'] for node_id in record['node_ids']
if node_id in nodes]
- node_hrns = [hostname_to_hrn(auth_hrn, login_base, hostname) for hostname in hostnames]
+ node_hrns = [hostname_to_hrn(
+ auth_hrn, login_base, hostname) for hostname in hostnames]
record['nodes'] = node_hrns
if 'site_ids' in record:
- login_bases = [sites[site_id]['login_base'] for site_id in record['site_ids'] \
+ login_bases = [sites[site_id]['login_base'] for site_id in record['site_ids']
if site_id in sites]
- site_hrns = [".".join([auth_hrn, lbase]) for lbase in login_bases]
+ site_hrns = [".".join([auth_hrn, lbase])
+ for lbase in login_bases]
record['sites'] = site_hrns
if 'expires' in record:
date = utcparse(record['expires'])
datestring = datetime_to_string(date)
- record['expires'] = datestring
-
- return records
+ record['expires'] = datestring
+
+ return records
def fill_record_sfa_info(self, records):
site_ids = []
for record in records:
person_ids.extend(record.get("person_ids", []))
- site_ids.extend(record.get("site_ids", []))
+ site_ids.extend(record.get("site_ids", []))
if 'site_id' in record:
- site_ids.append(record['site_id'])
-
+ site_ids.append(record['site_id'])
+
# get all pis from the sites we've encountered
- # and store them in a dictionary keyed on site_id
+ # and store them in a dictionary keyed on site_id
site_pis = {}
if site_ids:
- pi_filter = {'peer_id': None, '|roles': ['pi'], '|site_ids': site_ids}
- pi_list = self.shell.GetPersons(pi_filter, ['person_id', 'site_ids'])
+ pi_filter = {'peer_id': None, '|roles': [
+ 'pi'], '|site_ids': site_ids}
+ pi_list = self.shell.GetPersons(
+ pi_filter, ['person_id', 'site_ids'])
for pi in pi_list:
# we will need the pi's hrns also
person_ids.append(pi['person_id'])
-
+
# we also need to keep track of the sites these pis
# belong to
for site_id in pi['site_ids']:
site_pis[site_id].append(pi)
else:
site_pis[site_id] = [pi]
-
- # get sfa records for all records associated with these records.
+
+ # get sfa records for all records associated with these records.
# we'll replace pl ids (person_ids) with hrns from the sfa records
# we obtain
-
+
# get the registry records
person_list, persons = [], {}
- person_list = self.api.dbsession().query (RegRecord).filter(RegRecord.pointer.in_(person_ids))
+ person_list = self.api.dbsession().query(
+ RegRecord).filter(RegRecord.pointer.in_(person_ids))
# create a hrns keyed on the sfa record's pointer.
# Its possible for multiple records to have the same pointer so
# the dict's value will be a list of hrns.
# get the pl records
pl_person_list, pl_persons = [], {}
- pl_person_list = self.shell.GetPersons(person_ids, ['person_id', 'roles'])
+ pl_person_list = self.shell.GetPersons(
+ person_ids, ['person_id', 'roles'])
pl_persons = list_to_dict(pl_person_list, 'person_id')
# fill sfa info
for record in records:
# skip records with no pl info (top level authorities)
- #if record['pointer'] == -1:
- # continue
+ # if record['pointer'] == -1:
+ # continue
sfa_info = {}
type = record['type']
- logger.info("fill_record_sfa_info - incoming record typed {}".format(type))
+ logger.info(
+ "fill_record_sfa_info - incoming record typed {}".format(type))
if (type == "slice"):
# all slice users are researchers
record['geni_urn'] = hrn_to_urn(record['hrn'], 'slice')
record['researcher'] = []
for person_id in record.get('person_ids', []):
hrns = [person.hrn for person in persons[person_id]]
- record['researcher'].extend(hrns)
+ record['researcher'].extend(hrns)
# pis at the slice's site
if 'site_id' in record and record['site_id'] in site_pis:
for person_id in pi_ids:
hrns = [person.hrn for person in persons[person_id]]
record['PI'].extend(hrns)
- record['geni_creator'] = record['PI']
-
+ record['geni_creator'] = record['PI']
+
elif (type.startswith("authority")):
record['url'] = None
logger.info("fill_record_sfa_info - authority xherex")
record['owner'] = []
for pointer in record.get('person_ids', []):
if pointer not in persons or pointer not in pl_persons:
- # this means there is not sfa or pl record for this user
- continue
- hrns = [person.hrn for person in persons[pointer]]
- roles = pl_persons[pointer]['roles']
+ # this means there is not sfa or pl record for this
+ # user
+ continue
+ hrns = [person.hrn for person in persons[pointer]]
+ roles = pl_persons[pointer]['roles']
if 'pi' in roles:
record['PI'].extend(hrns)
if 'tech' in roles:
elif (type == "node"):
sfa_info['dns'] = record.get("hostname", "")
# xxx TODO: URI, LatLong, IP, DNS
-
+
elif (type == "user"):
logger.info('setting user.email')
sfa_info['email'] = record.get("email", "")
sfa_info['geni_urn'] = hrn_to_urn(record['hrn'], 'user')
- sfa_info['geni_certificate'] = record['gid']
+ sfa_info['geni_certificate'] = record['gid']
# xxx TODO: PostalAddress, Phone
record.update(sfa_info)
-
####################
# plcapi works by changes, compute what needs to be added/deleted
- def update_relation (self, subject_type, target_type, relation_name, subject_id, target_ids):
+ def update_relation(self, subject_type, target_type, relation_name, subject_id, target_ids):
# hard-wire the code for slice/user for now, could be smarter if needed
if subject_type == 'slice' and target_type == 'user' and relation_name == 'researcher':
- subject = self.shell.GetSlices (subject_id)[0]
+ subject = self.shell.GetSlices(subject_id)[0]
current_target_ids = subject['person_ids']
- add_target_ids = list ( set (target_ids).difference(current_target_ids))
- del_target_ids = list ( set (current_target_ids).difference(target_ids))
- logger.debug ("subject_id = {} (type={})".format(subject_id, type(subject_id)))
+ add_target_ids = list(
+ set(target_ids).difference(current_target_ids))
+ del_target_ids = list(
+ set(current_target_ids).difference(target_ids))
+ logger.debug("subject_id = {} (type={})".format(
+ subject_id, type(subject_id)))
for target_id in add_target_ids:
- self.shell.AddPersonToSlice (target_id,subject_id)
- logger.debug ("add_target_id = {} (type={})".format(target_id, type(target_id)))
+ self.shell.AddPersonToSlice(target_id, subject_id)
+ logger.debug("add_target_id = {} (type={})".format(
+ target_id, type(target_id)))
for target_id in del_target_ids:
- logger.debug ("del_target_id = {} (type={})".format(target_id, type(target_id)))
- self.shell.DeletePersonFromSlice (target_id, subject_id)
+ logger.debug("del_target_id = {} (type={})".format(
+ target_id, type(target_id)))
+ self.shell.DeletePersonFromSlice(target_id, subject_id)
elif subject_type == 'authority' and target_type == 'user' and relation_name == 'pi':
# due to the plcapi limitations this means essentially adding pi role to all people in the list
- # it's tricky to remove any pi role here, although it might be desirable
- persons = self.shell.GetPersons ({'peer_id': None, 'person_id': target_ids})
- for person in persons:
+ # it's tricky to remove any pi role here, although it might be
+ # desirable
+ persons = self.shell.GetPersons(
+ {'peer_id': None, 'person_id': target_ids})
+ for person in persons:
if 'pi' not in person['roles']:
- self.shell.AddRoleToPerson('pi',person['person_id'])
+ self.shell.AddRoleToPerson('pi', person['person_id'])
else:
- logger.info('unexpected relation {} to maintain, {} -> {}'\
+ logger.info('unexpected relation {} to maintain, {} -> {}'
.format(relation_name, subject_type, target_type))
-
########################################
- ########## aggregate oriented
+ # aggregate oriented
########################################
- def testbed_name (self): return "myplc"
+ def testbed_name(self): return "myplc"
- def aggregate_version (self):
+ def aggregate_version(self):
return {}
# first 2 args are None in case of resource discovery
- def list_resources (self, version=None, options=None):
- if options is None: options={}
+ def list_resources(self, version=None, options=None):
+ if options is None:
+ options = {}
aggregate = PlAggregate(self)
- rspec = aggregate.list_resources(version=version, options=options)
+ rspec = aggregate.list_resources(version=version, options=options)
return rspec
def describe(self, urns, version, options=None):
- if options is None: options={}
+ if options is None:
+ options = {}
aggregate = PlAggregate(self)
return aggregate.describe(urns, version=version, options=options)
-
- def status (self, urns, options=None):
- if options is None: options={}
+
+ def status(self, urns, options=None):
+ if options is None:
+ options = {}
aggregate = PlAggregate(self)
- desc = aggregate.describe(urns, version='GENI 3')
+ desc = aggregate.describe(urns, version='GENI 3')
status = {'geni_urn': desc['geni_urn'],
'geni_slivers': desc['geni_slivers']}
return status
- def allocate (self, urn, rspec_string, expiration, options=None):
+ def allocate(self, urn, rspec_string, expiration, options=None):
"""
Allocate a PL slice
the exact set of tags at the end of the call, meaning pre-existing tags
are deleted if not repeated in the incoming request
"""
- if options is None: options={}
+ if options is None:
+ options = {}
xrn = Xrn(urn)
aggregate = PlAggregate(self)
slices = PlSlices(self)
sfa_peer = slices.get_sfa_peer(xrn.get_hrn())
- slice_record = None
+ slice_record = None
users = options.get('geni_users', [])
if users:
slice_record = users[0].get('slice_record', {})
-
+
# parse rspec
rspec = RSpec(rspec_string)
requested_attributes = rspec.version.get_slice_attributes()
-
+
# ensure site record exists
- site = slices.verify_site(xrn.hrn, slice_record, sfa_peer, options=options)
+ site = slices.verify_site(
+ xrn.hrn, slice_record, sfa_peer, options=options)
# ensure slice record exists
- slice = slices.verify_slice(xrn.hrn, slice_record, sfa_peer, expiration=expiration, options=options)
+ slice = slices.verify_slice(
+ xrn.hrn, slice_record, sfa_peer, expiration=expiration, options=options)
# ensure person records exists
- persons = slices.verify_persons(xrn.hrn, slice, users, sfa_peer, options=options)
+ persons = slices.verify_persons(
+ xrn.hrn, slice, users, sfa_peer, options=options)
# ensure slice attributes exists
slices.verify_slice_tags(slice, requested_attributes, options=options)
-
+
# add/remove slice from nodes
request_nodes = rspec.version.get_nodes_with_slivers()
nodes = slices.verify_slice_nodes(urn, slice, request_nodes)
-
- # add/remove links links
- slices.verify_slice_links(slice, rspec.version.get_link_requests(), nodes)
+
+ # add/remove links links
+ slices.verify_slice_links(
+ slice, rspec.version.get_link_requests(), nodes)
# add/remove leases
rspec_requested_leases = rspec.version.get_leases()
return aggregate.describe([xrn.get_urn()], version=rspec.version)
def provision(self, urns, options=None):
- if options is None: options={}
+ if options is None:
+ options = {}
# update users
slices = PlSlices(self)
aggregate = PlAggregate(self)
slivers = aggregate.get_slivers(urns)
if not slivers:
sliver_id_parts = Xrn(urns[0]).get_sliver_id_parts()
- # allow to be called with an empty rspec, meaning flush reservations
+ # allow to be called with an empty rspec, meaning flush
+ # reservations
if sliver_id_parts:
filter = {}
try:
filter['slice_id'] = int(sliver_id_parts[0])
except ValueError:
filter['name'] = sliver_id_parts[0]
- slices = self.shell.GetSlices(filter,['hrn'])
+ slices = self.shell.GetSlices(filter, ['hrn'])
if not slices:
- raise Forbidden("Unable to locate slice record for sliver: {}".format(xrn))
+ raise Forbidden(
+ "Unable to locate slice record for sliver: {}".format(xrn))
slice = slices[0]
slice_urn = hrn_to_urn(slice['hrn'], type='slice')
- urns = [slice_urn]
- else:
+ urns = [slice_urn]
+ else:
slice_id = slivers[0]['slice_id']
slice_hrn = self.shell.GetSliceHrn(slice_id)
slice = self.shell.GetSlices({'slice_id': slice_id})[0]
slice['hrn'] = slice_hrn
sfa_peer = slices.get_sfa_peer(slice['hrn'])
users = options.get('geni_users', [])
- persons = slices.verify_persons(slice['hrn'], slice, users, sfa_peer, options=options)
+ persons = slices.verify_persons(
+ slice['hrn'], slice, users, sfa_peer, options=options)
# update sliver allocation states and set them to geni_provisioned
sliver_ids = [sliver['sliver_id'] for sliver in slivers]
dbsession = self.api.dbsession()
- SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned',dbsession)
+ SliverAllocation.set_allocations(
+ sliver_ids, 'geni_provisioned', dbsession)
version_manager = VersionManager()
- rspec_version = version_manager.get_version(options['geni_rspec_version'])
+ rspec_version = version_manager.get_version(
+ options['geni_rspec_version'])
return self.describe(urns, rspec_version, options=options)
def delete(self, urns, options=None):
- if options is None: options={}
+ if options is None:
+ options = {}
# collect sliver ids so we can update sliver allocation states after
# we remove the slivers.
aggregate = PlAggregate(self)
slivers = aggregate.get_slivers(urns)
if slivers:
- slice_id = slivers[0]['slice_id']
+ slice_id = slivers[0]['slice_id']
slice_name = slivers[0]['name']
node_ids = []
sliver_ids = []
for sliver in slivers:
node_ids.append(sliver['node_id'])
- sliver_ids.append(sliver['sliver_id'])
+ sliver_ids.append(sliver['sliver_id'])
# leases
- leases = self.shell.GetLeases({'name': slice_name, 'node_id': node_ids})
- leases_ids = [lease['lease_id'] for lease in leases ]
+ leases = self.shell.GetLeases(
+ {'name': slice_name, 'node_id': node_ids})
+ leases_ids = [lease['lease_id'] for lease in leases]
slice_hrn = self.shell.GetSliceHrn(int(slice_id))
try:
self.shell.DeleteSliceFromNodes(slice_id, node_ids)
if len(leases_ids) > 0:
self.shell.DeleteLeases(leases_ids)
-
+
# delete sliver allocation states
dbsession = self.api.dbsession()
SliverAllocation.delete_allocations(sliver_ids, dbsession)
geni_slivers.append(
{'geni_sliver_urn': sliver['sliver_id'],
'geni_allocation_status': 'geni_unallocated',
- 'geni_expires': datetime_to_string(utcparse(sliver['expires']))})
+ 'geni_expires': datetime_to_string(utcparse(sliver['expires']))})
return geni_slivers
- def renew (self, urns, expiration_time, options=None):
- if options is None: options={}
+ def renew(self, urns, expiration_time, options=None):
+ if options is None:
+ options = {}
aggregate = PlAggregate(self)
slivers = aggregate.get_slivers(urns)
if not slivers:
self.shell.UpdateSlice(slice['slice_id'], record)
description = self.describe(urns, 'GENI 3', options)
return description['geni_slivers']
-
- def perform_operational_action (self, urns, action, options=None):
- if options is None: options={}
+ def perform_operational_action(self, urns, action, options=None):
+ if options is None:
+ options = {}
# MyPLC doesn't support operational actions. Lets pretend like it
# supports start, but reject everything else.
action = action.lower()
if action not in ['geni_start']:
raise UnsupportedOperation(action)
- # fault if sliver is not full allocated (operational status is geni_pending_allocation)
+ # fault if sliver is not full allocated (operational status is
+ # geni_pending_allocation)
description = self.describe(urns, 'GENI 3', options)
for sliver in description['geni_slivers']:
if sliver['geni_operational_status'] == 'geni_pending_allocation':
return geni_slivers
# set the 'enabled' tag to 0
- def shutdown (self, xrn, options=None):
- if options is None: options={}
+ def shutdown(self, xrn, options=None):
+ if options is None:
+ options = {}
hrn, _ = urn_to_hrn(xrn)
top_auth_hrn = top_auth(hrn)
site_hrn = '.'.join(hrn.split('.')[:-1])
slicename = '_'.join([login_base, slice_part])
- slices = self.shell.GetSlices({'peer_id': None, 'name': slicename}, ['slice_id'])
+ slices = self.shell.GetSlices(
+ {'peer_id': None, 'name': slicename}, ['slice_id'])
if not slices:
raise RecordNotFound(slice_hrn)
slice_id = slices[0]['slice_id']
- slice_tags = self.shell.GetSliceTags({'slice_id': slice_id, 'tagname': 'enabled'})
+ slice_tags = self.shell.GetSliceTags(
+ {'slice_id': slice_id, 'tagname': 'enabled'})
if not slice_tags:
self.shell.AddSliceTag(slice_id, 'enabled', '0')
elif slice_tags[0]['value'] != "0":
git://git.onelab.eu / sfa.git / blobdiff