from sfa.util.record import SfaRecord
from sfa.util.policy import Policy
from sfa.util.prefixTree import prefixTree
-from sfa.util.debug import log
MAXINT = 2L**31-1
def verify_site(self, registry, credential, slice_hrn, peer, sfa_peer, reg_objects=None):
authority = get_authority(slice_hrn)
authority_urn = hrn_to_urn(authority, 'authority')
-
+ login_base = None
if reg_objects:
site = reg_objects['site']
+ login_base = site['login_base']
else:
site_records = registry.Resolve(authority_urn, [credential])
site = {}
raise RecordNotFound(authority)
remote_site_id = site.pop('site_id')
-
- login_base = get_leaf(authority)
+
+ if login_base is None:
+ login_base = get_leaf(authority)
sites = self.api.plshell.GetSites(self.api.plauth, login_base)
if not sites:
for key in slice_keys:
if key in slice_record and slice_record[key]:
slice_fields[key] = slice_record[key]
-
- # add the slice
+ # add the slice
slice_id = self.api.plshell.AddSlice(self.api.plauth, slice_fields)
slice = slice_fields
slice['slice_id'] = slice_id
self.api.plshell.AddPersonToSlice(self.api.plauth, person_dict['email'], slicename)
self.api.plshell.AddPersonToSite(self.api.plauth, person_dict['email'], site_id)
finally:
- if peer and not local_person:
- self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_dict['pointer'])
if peer:
- self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', site_id, peer, remote_site_id)
+ try: self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', site_id, peer, remote_site_id)
+ except: pass
+ if peer and not local_person:
+ try: self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_dict['pointer'])
+ except: pass
self.verify_keys(registry, credential, person_dict, key_ids, person_id, peer, local_person)