import traceback
import sys
+from types import StringTypes
from sfa.util.misc import *
from sfa.util.rspec import *
from sfa.util.specdict import *
class Slices(SimpleStorage):
- def __init__(self, api, ttl = .5):
+ def __init__(self, api, ttl = .5, caller_cred=None):
self.api = api
self.ttl = ttl
self.threshold = None
SimpleStorage.__init__(self, self.slices_file)
self.policy = Policy(self.api)
self.load()
+ self.caller_cred=caller_cred
+ def get_peer(self, hrn):
+ # Becaues of myplc federation, we first need to determine if this
+ # slice belongs to out local plc or a myplc peer. We will assume it
+ # is a local site, unless we find out otherwise
+ peer = None
+
+ # get this slice's authority (site)
+ slice_authority = get_authority(hrn)
+
+ # get this site's authority (sfa root authority or sub authority)
+ site_authority = get_authority(slice_authority).lower()
+
+ # check if we are already peered with this site_authority, if so
+ peers = self.api.plshell.GetPeers(self.api.plauth, {}, ['peer_id', 'peername', 'shortname', 'hrn_root'])
+ for peer_record in peers:
+ names = [name.lower() for name in peer_record.values() if isinstance(name, StringTypes)]
+ if site_authority in names:
+ peer = peer_record['shortname']
+
+ return peer
+
def refresh(self):
"""
Update the cached list of slices
self.delete_slice_smgr(hrn)
def delete_slice_aggregate(self, hrn):
+
slicename = hrn_to_pl_slicename(hrn)
- slices = self.api.plshell.GetSlices(self.api.plauth, {'peer_id': None, 'name': slicename})
+ slices = self.api.plshell.GetSlices(self.api.plauth, {'name': slicename})
if not slices:
return 1
slice = slices[0]
+ # determine if this is a peer slice
+ peer = self.get_peer(hrn)
+ if peer:
+ self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'slice', slice['slice_id'], peer)
self.api.plshell.DeleteSliceFromNodes(self.api.plauth, slicename, slice['node_ids'])
+ if peer:
+ self.api.plshell.BindObjectToPeer(self.api.plauth, 'slice', slice['slice_id'], peer, slice['peer_slice_id'])
return 1
def delete_slice_smgr(self, hrn):
aggregates = Aggregates(self.api)
for aggregate in aggregates:
try:
- aggregates[aggregate].delete_slice(credential, hrn)
+ aggregates[aggregate].delete_slice(credential, hrn, caller_cred=self.caller_cred)
except:
print >> log, "Error calling list nodes at aggregate %s" % aggregate
traceback.print_exc(log)
self.create_slice_smgr(hrn, rspec)
def create_slice_aggregate(self, hrn, rspec):
- # Becaues of myplc federation, we first need to determine if this
- # slice belongs to out local plc or a myplc peer. We will assume it
- # is a local site, unless we find out otherwise
- peer = None
-
- # get this slice's authority (site)
- slice_authority = get_authority(hrn)
-
- # get this site's authority (sfa root authority or sub authority)
- site_authority = get_authority(slice_authority)
-
- # check if we are already peered with this site_authority, if so
- peers = self.api.plshell.GetPeers(self.api.plauth, {}, ['peer_id', 'peername', 'shortname', 'hrn_root'])
- for peer_record in peers:
- if site_authority in peer_record.values():
- peer = peer_record['shortname']
+
+ # Determine if this is a peer slice
+ peer = self.get_peer(hrn)
spec = Rspec(rspec)
# Get the slice record from geni
# Make sure slice exists at plc, if it doesnt add it
slicename = hrn_to_pl_slicename(hrn)
- slices = self.api.plshell.GetSlices(self.api.plauth, [slicename], ['slice_id', 'node_ids'])
+ slices = self.api.plshell.GetSlices(self.api.plauth, [slicename], ['slice_id', 'node_ids', 'site_id'] )
+ parts = slicename.split("_")
+ login_base = parts[0]
+ # if site doesnt exist add it
+ sites = self.api.plshell.GetSites(self.api.plauth, [login_base])
if not slices:
- parts = slicename.split("_")
- login_base = parts[0]
- # if site doesnt exist add it
- sites = self.api.plshell.GetSites(self.api.plauth, [login_base])
if not sites:
authority = get_authority(hrn)
site_records = registry.resolve(credential, authority)
self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', site_id, peer, remote_site_id)
else:
site = sites[0]
+ site_id = site['site_id']
+ remote_site_id = site['peer_site_id']
# create slice object
slice_fields = {}
slice['node_ids'] = []
else:
slice = slices[0]
- slice_id = slice['slice_id']
+ slice_id = slice['slice_id']
+ site_id = slice['site_id']
+ remote_site_id = sites[0]['peer_site_id']
# get the list of valid slice users from the registry and make
# they are added to the slice
researchers = record.get('researcher', [])
# an error
if peer:
self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'person', person_id, peer)
- self.api.plshell.AddPersonToSlice(self.api.plauth, person_dict['email'], slicename)
+ self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'site', site_id, peer)
+
+ self.api.plshell.AddPersonToSlice(self.api.plauth, person_dict['email'], slicename)
+ self.api.plshell.AddPersonToSite(self.api.plauth, person_dict['email'], site_id)
if peer:
- self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_record['pointer'])
+ self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_record['pointer'])
+ self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', site_id, peer, remote_site_id)
# Get this users local keys
keylist = self.api.plshell.GetKeys(self.api.plauth, key_ids, ['key'])
keys = [key['key'] for key in keylist]
# add keys that arent already there
+ key_ids=person_record['key_ids']
for personkey in person_dict['keys']:
if personkey not in keys:
key = {'key_type': 'ssh', 'key': personkey}
if peer:
- self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_record['pointer'])
- self.api.plshell.AddPersonKey(self.api.plauth, person_dict['email'], key)
+ self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'person', person_id, peer)
+ key_id=self.api.plshell.AddPersonKey(self.api.plauth, person_dict['email'], key)
if peer:
- self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_record['pointer'])
+ self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_record['pointer'])
+ self.api.plshell.BindObjectToPeer(self.api.plauth, 'key', key_id, peer, key_ids.pop(0))
# find out where this slice is currently running
nodelist = self.api.plshell.GetNodes(self.api.plauth, slice['node_ids'], ['hostname'])
try:
# send the whloe rspec to the local aggregate
if aggregate in [self.api.hrn]:
- aggregates[aggregate].create_slice(credential, hrn, rspec)
+ aggregates[aggregate].create_slice(credential, hrn, rspec, caller_cred=self.caller_cred)
else:
- aggregates[aggregate].create_slice(credential, hrn, rspecs[aggregate])
+ aggregates[aggregate].create_slice(credential, hrn, rspecs[aggregate], caller_cred=self.caller_cred)
except:
print >> log, "Error creating slice %(hrn)s at aggregate %(aggregate)s" % locals()
+ traceback.print_exc()
return 1
git://git.onelab.eu / sfa.git / blobdiff