from sfa.util.cache import Cache
# one would think the driver should not need to mess with the SFA db, but..
-from sfa.storage.alchemy import dbsession
from sfa.storage.model import RegRecord, SliverAllocation
from sfa.trust.credential import Credential
import sfa.planetlab.peers as peers
from sfa.planetlab.plaggregate import PlAggregate
from sfa.planetlab.plslices import PlSlices
-from sfa.planetlab.plxrn import PlXrn, slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename, xrn_to_hostname
+from sfa.planetlab.plxrn import PlXrn, slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename, xrn_to_hostname, top_auth, hash_loginbase
def list_to_dict(recs, key):
# the cache instance is a class member so it survives across incoming requests
cache = None
- def __init__ (self, config):
- Driver.__init__ (self, config)
+ def __init__ (self, api):
+ Driver.__init__ (self, api)
+ config=api.config
self.shell = PlShell (config)
self.cache=None
if config.SFA_AGGREGATE_CACHING:
pl_record = self.sfa_fields_to_pl_fields(type, hrn, sfa_record)
if type == 'authority':
- sites = self.shell.GetSites([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
if 'max_slices' not in pl_record:
pl_record['max_slices']=2
pointer = self.shell.AddSite(pl_record)
+ self.shell.SetSiteHrn(int(pointer), hrn)
else:
pointer = sites[0]['site_id']
for key in pl_record.keys():
if key not in acceptable_fields:
pl_record.pop(key)
- slices = self.shell.GetSlices([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
+
pointer = self.shell.AddSlice(pl_record)
+ self.shell.SetSliceHrn(int(pointer), hrn)
else:
pointer = slices[0]['slice_id']
elif type == 'user':
- persons = self.shell.GetPersons({'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']:
if key not in sfa_record: sfa_record[key]='*from*sfa*'
can_add = ['first_name', 'last_name', 'title','email', 'password', 'phone', 'url', 'bio']
add_person_dict=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']
if 'enabled' in sfa_record and sfa_record['enabled']:
self.shell.UpdatePerson(pointer, {'enabled': sfa_record['enabled']})
- # add this person to the site only if she is being added for the first
- # time by sfa and doesont already exist in plc
- if not persons or not persons[0]['site_ids']:
- login_base = get_leaf(sfa_record['authority'])
- self.shell.AddPersonToSite(pointer, login_base)
+ # 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=[]
elif type == 'node':
login_base = PlXrn(xrn=sfa_record['authority'],type='authority').pl_login_base()
- nodes = self.shell.GetNodes([pl_record['hostname']])
+ 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']
if (type == "authority"):
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
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([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'])
type=sfa_record['type']
pointer=sfa_record['pointer']
if type == 'user':
- persons = self.shell.GetPersons(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']:
self.shell.DeletePerson(pointer)
elif type == 'slice':
- if self.shell.GetSlices(pointer):
+ if self.shell.GetSlices({'peer_id': None, 'slice_id': pointer}):
self.shell.DeleteSlice(pointer)
elif type == 'node':
- if self.shell.GetNodes(pointer):
+ if self.shell.GetNodes({'peer_id': None, 'node_id': pointer}):
self.shell.DeleteNode(pointer)
elif type == 'authority':
- if self.shell.GetSites(pointer):
+ if self.shell.GetSites({'peer_id': None, 'site_id': pointer}):
self.shell.DeleteSite(pointer)
return True
# get pl records
nodes, sites, slices, persons, keys = {}, {}, {}, {}, {}
if node_ids:
- node_list = self.shell.GetNodes(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(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(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(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'])
# get pl records
slices, persons, sites, nodes = {}, {}, {}, {}
if site_ids:
- site_list = self.shell.GetSites(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(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(slice_ids, ['slice_id', 'name'])
+ 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(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
# and store them in a dictionary keyed on site_id
site_pis = {}
if site_ids:
- pi_filter = {'|roles': ['pi'], '|site_ids': 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
# get the registry records
person_list, persons = [], {}
- person_list = 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.
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 (target_ids)
+ 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'])
# ensure slice record exists
slice = slices.verify_slice(xrn.hrn, slice_record, peer, sfa_peer, expiration=expiration, options=options)
# ensure person records exists
- #persons = slices.verify_persons(xrn.hrn, slice, users, peer, sfa_peer, options=options)
+ persons = slices.verify_persons(xrn.hrn, slice, users, peer, sfa_peer, options=options)
# ensure slice attributes exists
slices.verify_slice_attributes(slice, requested_attributes, options=options)
peer = slices.get_peer(slice['hrn'])
sfa_peer = slices.get_sfa_peer(slice['hrn'])
users = options.get('geni_users', [])
- persons = slices.verify_persons(None, slice, users, peer, sfa_peer, options=options)
+ persons = slices.verify_persons(slice['hrn'], slice, users, peer, sfa_peer, options=options)
slices.handle_peer(None, None, persons, peer)
# update sliver allocation states and set them to geni_provisioned
sliver_ids = [sliver['sliver_id'] for sliver in slivers]
- SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned')
+ dbsession=self.api.dbsession()
+ SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned',dbsession)
version_manager = VersionManager()
rspec_version = version_manager.get_version(options['geni_rspec_version'])
return self.describe(urns, rspec_version, options=options)
slivers = aggregate.get_slivers(urns)
if slivers:
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'])
+ # leases
+ leases = self.shell.GetLeases({'name': slice_name})
+ leases_ids = [lease['lease_id'] for lease in leases ]
+
# determine if this is a peer slice
# xxx I wonder if this would not need to use PlSlices.get_peer instead
# in which case plc.peers could be deprecated as this here
# is the only/last call to this last method in plc.peers
- slice_hrn = PlXrn(auth=self.hrn, slicename=slivers[0]['name']).get_hrn()
+ #slice_hrn = PlXrn(auth=self.hrn, slice_name).get_hrn()
+ slice_hrn = self.shell.GetSliceHrn(int(slice_id))
peer = peers.get_peer(self, slice_hrn)
try:
if peer:
self.shell.UnBindObjectFromPeer('slice', slice_id, peer)
self.shell.DeleteSliceFromNodes(slice_id, node_ids)
+ if len(leases_ids) > 0:
+ self.shell.DeleteLeases(leases_ids)
# delete sliver allocation states
- SliverAllocation.delete_allocations(sliver_ids)
+ dbsession=self.api.dbsession()
+ SliverAllocation.delete_allocations(sliver_ids,dbsession)
finally:
if peer:
self.shell.BindObjectToPeer('slice', slice_id, peer, slice['peer_slice_id'])
# set the 'enabled' tag to 0
def shutdown (self, xrn, options={}):
- xrn = PlXrn(xrn=xrn, type='slice')
- slicename = xrn.pl_slicename()
- slices = self.shell.GetSlices({'name': slicename}, ['slice_id'])
+ hrn, _ = urn_to_hrn(xrn)
+ top_auth_hrn = top_auth(hrn)
+ site_hrn = '.'.join(hrn.split('.')[:-1])
+ slice_part = hrn.split('.')[-1]
+ if top_auth_hrn == self.driver.hrn:
+ login_base = slice_hrn.split('.')[-2][:12]
+ else:
+ login_base = hash_loginbase(site_hrn)
+
+ slicename = '_'.join([login_base, slice_part])
+
+ slices = self.shell.GetSlices({'peer_id': None, 'name': slicename}, ['slice_id'])
if not slices:
raise RecordNotFound(slice_hrn)
slice_id = slices[0]['slice_id']
git://git.onelab.eu / sfa.git / blobdiff