import sys
from types import StringTypes
-from sfa.util.xrn import get_leaf, get_authority, hrn_to_urn, urn_to_hrn
+from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn, urn_to_hrn
from sfa.util.plxrn import hrn_to_pl_slicename, hrn_to_pl_login_base
-from sfa.util.rspec import *
from sfa.util.specdict import *
from sfa.util.faults import *
from sfa.util.record import SfaRecord
from sfa.util.policy import Policy
from sfa.util.prefixTree import prefixTree
+from collections import defaultdict
MAXINT = 2L**31-1
return sfa_peer
- def verify_slice_records(self, hrn, slice_record, users, peer):
- """
- Creates required slice, site, person and key records in the Myplc db.
- """
- site = None
- slice = None
- persons = []
-
- sfa_peer = self.get_sfa_peer(hrn)
- site = self.verify_site(hrn, slice_record, peer, sfa_peer)
- slice = self.verify_slice(hrn, slice_record, peer, sfa_peer)
- persons = self.verify_persons(hrn, slice, users, peer, sfa_peer)
-
+ def verify_slice_nodes(self, slice, requested_slivers, peer):
+
+ nodes = self.api.plshell.GetNodes(self.api.plauth, slice['node_ids'], ['hostname'])
+ current_slivers = [node['hostname'] for node in nodes]
+
+ # remove nodes not in rspec
+ deleted_nodes = list(set(current_slivers).difference(requested_slivers))
+
+ # add nodes from rspec
+ added_nodes = list(set(requested_slivers).difference(current_slivers))
+
+ try:
+ if peer:
+ self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'slice', slice['slice_id'], peer['shortname'])
+ self.api.plshell.AddSliceToNodes(self.api.plauth, slice['name'], added_nodes)
+ self.api.plshell.DeleteSliceFromNodes(self.api.plauth, slice['name'], deleted_nodes)
+
+ except:
+ self.api.logger.log_exc('Failed to add/remove slice from nodes')
+
+ def handle_peer(self, site, slice, persons, peer):
if peer:
# bind site
try:
if site:
self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', \
- site['site_id'], peer['shortname'], slice_record['site_id'])
+ site['site_id'], peer['shortname'], slice['site_id'])
except Exception,e:
self.api.plshell.DeleteSite(self.api.plauth, site['site_id'])
raise e
try:
if slice:
self.api.plshell.BindObjectToPeer(self.api.plauth, 'slice', \
- slice['slice_id'], peer['shortname'], slice_record['slice_id'])
+ slice['slice_id'], peer['shortname'], slice['slice_id'])
except Exception,e:
- self.api.plshell.DeleteSlice(self.api.plauth,slice['slice_id'])
+ self.api.plshell.DeleteSlice(self.api.plauth, slice['slice_id'])
raise e
# bind persons
def verify_site(self, slice_xrn, slice_record={}, peer=None, sfa_peer=None):
(slice_hrn, type) = urn_to_hrn(slice_xrn)
site_hrn = get_authority(slice_hrn)
- login_base = get_leaf(site_hrn)
+ # login base can't be longer than 20 characters
+ slicename = hrn_to_pl_slicename(slice_hrn)
+ authority_name = slicename.split('_')[0]
+ login_base = authority_name[:20]
sites = self.api.plshell.GetSites(self.api.plauth, login_base)
if not sites:
# create new site record
- site = {'name': 'geni.%s' % login_base,
- 'abbreviated_name': login_base,
+ site = {'name': 'geni.%s' % authority_name,
+ 'abbreviated_name': authority_name,
'login_base': login_base,
'max_slices': 100,
'max_slivers': 1000,
self.api.plshell.UpdateSlice(self.api.plauth, slice['slice_id'],\
{'expires' : slice_record['expires']})
- return slice
+ return slice
- def verify_persons(self, slice_hrn, slice_record, users, peer, sfa_peer):
- slicename = hrn_to_pl_slicename(slice_hrn)
- login_base = hrn_to_pl_login_base(slice_hrn)
-
- # create a dict users keyed on the user's email
- users_dict = {}
+ #def get_existing_persons(self, users):
+ def verify_persons(self, slice_hrn, slice_record, users, peer, sfa_peer, append=True):
+ users_by_email = {}
+ users_by_site = defaultdict(list)
+
+ users_dict = {}
for user in users:
- if 'email' in user:
+ if 'append' in user and user['append'] == False:
+ append = False
+ if 'email' in user:
+ users_by_email[user['email']] = user
users_dict[user['email']] = user
- else:
- fake_email = hrn_to_pl_slicename(slice_hrn) + "@geni.net"
- user['email'] = fake_email
- users_dict[fake_email] = user
-
+ elif 'urn' in user:
+ hrn, type = urn_to_hrn(user['urn'])
+ username = get_leaf(hrn)
+ login_base = get_leaf(get_authority(user['urn']))
+ user['username'] = username
+ users_by_site[login_base].append(user)
+
+ existing_user_ids = []
+ if users_by_email:
+ # get existing users by email
+ existing_users = self.api.plshell.GetPersons(self.api.plauth, \
+ {'email': users_by_email.keys()}, ['person_id', 'key_ids', 'email'])
+ existing_user_ids.extend([user['email'] for user in existing_users])
+
+ if users_by_site:
+ # get a list of user sites (based on requeste user urns
+ site_list = self.api.plshell.GetSites(self.api.plauth, users_by_site.keys(), \
+ ['site_id', 'login_base', 'person_ids'])
+ sites = {}
+ site_user_ids = []
+
+ # get all existing users at these sites
+ for site in site_list:
+ sites[site['site_id']] = site
+ site_user_ids.extend(site['person_ids'])
+
+ existing_site_persons_list = self.api.plshell.GetPersons(self.api.plauth, \
+ site_user_ids, ['person_id', 'key_ids', 'email', 'site_ids'])
+
+ # all requested users are either existing users or new (added) users
+ for login_base in users_by_site:
+ requested_site_users = users_by_site[login_base]
+ for requested_user in requested_site_users:
+ user_found = False
+ for existing_user in existing_site_persons_list:
+ for site_id in existing_user['site_ids']:
+ site = sites[site_id]
+ if login_base == site['login_base'] and \
+ existing_user['email'].startswith(requested_user['username']):
+ existing_user_ids.append(existing_user['email'])
+ users_dict[existing_user['email']] = requested_user
+ user_found = True
+ break
+ if user_found:
+ break
+
+ if user_found == False:
+ fake_email = requested_user['username'] + '@geni.net'
+ users_dict[fake_email] = requested_user
+
+
# requested slice users
requested_user_ids = users_dict.keys()
-
- # existing users
- existing_users_filter = {'email': requested_user_ids}
- existing_users = self.api.plshell.GetPersons(self.api.plauth, \
- existing_users_filter, ['person_id', 'key_ids', 'email'])
- existing_user_ids = [user['email'] for user in existing_users]
-
# existing slice users
existing_slice_users_filter = {'person_id': slice_record.get('person_ids', [])}
existing_slice_users = self.api.plshell.GetPersons(self.api.plauth, \
removed_user_ids = set(existing_slice_user_ids).difference(requested_user_ids)
updated_user_ids = set(existing_slice_user_ids).intersection(requested_user_ids)
- # remove stale users
- for removed_user_id in removed_user_ids:
- self.api.plshell.DeletePersonFromSlice(self.api.plauth, removed_user_id, slicename)
-
+ # Remove stale users (only if we are not appending).
+ if append == False:
+ for removed_user_id in removed_user_ids:
+ self.api.plshell.DeletePersonFromSlice(self.api.plauth, removed_user_id, slice_record['name'])
# update_existing users
- updated_users_list = [user for user in users if user['email'] in updated_user_ids]
- self.verify_keys(existing_slice_users, updated_users_list, peer)
+ updated_users_list = [user for user in existing_slice_users if user['email'] in \
+ updated_user_ids]
+ self.verify_keys(existing_slice_users, updated_users_list, peer, append)
added_persons = []
# add new users
self.api.plshell.UpdatePerson(self.api.plauth, person['person_id'], {'enabled': True})
# add person to site
- self.api.plshell.AddPersonToSite(self.api.plauth, added_slice_user_id, login_base)
+ self.api.plshell.AddPersonToSite(self.api.plauth, added_user_id, login_base)
for key_string in added_user.get('keys', []):
key = {'key':key_string, 'key_type':'ssh'}
for added_slice_user_id in added_slice_user_ids.union(added_user_ids):
# add person to the slice
- self.api.plshell.AddPersonToSlice(self.api.plauth, added_slice_user_id, slicename)
-
-
+ self.api.plshell.AddPersonToSlice(self.api.plauth, added_slice_user_id, slice_record['name'])
# if this is a peer record then it should already be bound to a peer.
# no need to return worry about it getting bound later
return added_persons
- def verify_keys(self, persons, users, peer):
+ def verify_keys(self, persons, users, peer, append=True):
# existing keys
key_ids = []
for person in persons:
if peer:
self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person['person_id'], peer['shortname'], user['person_id'])
- # remove old keys
- removed_keys = set(existing_keys).difference(requested_keys)
- for existing_key_id in keydict:
- if keydict[existing_key_id] in removed_keys:
- try:
- if peer:
- self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'key', existing_key_id, peer['shortname'])
- self.api.plshell.DeleteKey(self.api.plauth, existing_key_id)
- except:
- pass
+ # remove old keys (only if we are not appending)
+ if append == False:
+ removed_keys = set(existing_keys).difference(requested_keys)
+ for existing_key_id in keydict:
+ if keydict[existing_key_id] in removed_keys:
+ try:
+ if peer:
+ self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'key', existing_key_id, peer['shortname'])
+ self.api.plshell.DeleteKey(self.api.plauth, existing_key_id)
+ except:
+ pass
+
+ def verify_slice_attributes(self, slice, requested_slice_attributes):
+ # get list of attributes users ar able to manage
+ slice_attributes = self.api.plshell.GetTagTypes(self.api.plauth, {'category': '*slice*', '|roles': ['user']})
+ valid_slice_attribute_names = [attribute['tagname'] for attribute in slice_attributes]
+
+ # get sliver attributes
+ added_slice_attributes = []
+ removed_slice_attributes = []
+ ignored_slice_attribute_names = []
+ existing_slice_attributes = self.api.plshell.GetSliceTags(self.api.plauth, {'slice_id': slice['slice_id']})
+
+ # get attributes that should be removed
+ for slice_tag in existing_slice_attributes:
+ if slice_tag['tagname'] in ignored_slice_attribute_names:
+ # If a slice already has a admin only role it was probably given to them by an
+ # admin, so we should ignore it.
+ ignored_slice_attribute_names.append(slice_tag['tagname'])
+ else:
+ # If an existing slice attribute was not found in the request it should
+ # be removed
+ attribute_found=False
+ for requested_attribute in requested_slice_attributes:
+ if requested_attribute['name'] == slice_tag['tagname'] and \
+ requested_attribute['value'] == slice_tag['value']:
+ attribute_found=True
+ break
+
+ if not attribute_found:
+ removed_slice_attributes.append(slice_tag)
+
+ # get attributes that should be added:
+ for requested_attribute in requested_slice_attributes:
+ # if the requested attribute wasn't found we should add it
+ if requested_attribute['name'] in valid_slice_attribute_names:
+ attribute_found = False
+ for existing_attribute in existing_slice_attributes:
+ if requested_attribute['name'] == existing_attribute['tagname'] and \
+ requested_attribute['value'] == existing_attribute['value']:
+ attribute_found=True
+ break
+ if not attribute_found:
+ added_slice_attributes.append(requested_attribute)
+
+
+ # remove stale attributes
+ for attribute in removed_slice_attributes:
+ try:
+ self.api.plshell.DeleteSliceTag(self.api.plauth, attribute['slice_tag_id'])
+ except Exception, e:
+ self.api.logger.warn('Failed to remove sliver attribute. name: %s, value: %s, node_id: %s\nCause:%s'\
+ % (name, value, node_id, str(e)))
+
+ # add requested_attributes
+ for attribute in added_slice_attributes:
+ try:
+ name, value, node_id = attribute['name'], attribute['value'], attribute.get('node_id', None)
+ self.api.plshell.AddSliceTag(self.api.plauth, slice['name'], name, value, node_id)
+ except Exception, e:
+ self.api.logger.warn('Failed to add sliver attribute. name: %s, value: %s, node_id: %s\nCause:%s'\
+ % (name, value, node_id, str(e)))
def create_slice_aggregate(self, xrn, rspec):
hrn, type = urn_to_hrn(xrn)
git://git.onelab.eu / sfa.git / blobdiff