from sfa.util.faults import *
from sfa.util.record import SfaRecord
from sfa.rspecs.rspec_converter import RSpecConverter
+from sfa.client.client_helper import sfa_to_pg_users_arg
from sfa.rspecs.version_manager import VersionManager
from sfa.rspecs.rspec import RSpec
from sfa.util.policy import Policy
# OTOH it's not clear if we're only dealing with XMLRPCServerProxy instances
def get_serverproxy_url (server):
try:
- return server.url
+ return server.get_url()
except:
logger.warning("GetVersion, falling back to xmlrpclib.ServerProxy internals")
return server._ServerProxy__host + server._ServerProxy__handler
ad_rspec_versions = []
request_rspec_versions = []
for rspec_version in version_manager.versions:
- if rspec_version in ['*', 'ad']:
+ if rspec_version.content_type in ['*', 'ad']:
+ ad_rspec_versions.append(rspec_version.to_dict())
+ if rspec_version.content_type in ['*', 'request']:
request_rspec_versions.append(rspec_version.to_dict())
- if rspec_version in ['*', 'request']:
- request_rspec_version.append(rspec_version.to_dict())
default_rspec_version = version_manager.get_version("sfa 1").to_dict()
- xrn=Xrn(api.hrn)
+ xrn=Xrn(api.hrn, 'authority+sa')
version_more = {'interface':'slicemgr',
'hrn' : xrn.get_hrn(),
'urn' : xrn.get_urn(),
caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn()
# attempt to use delegated credential first
- credential = api.getDelegatedCredential(creds)
- if not credential:
- credential = api.getCredential()
- credentials = [credential]
+ cred = api.getDelegatedCredential(creds)
+ if not cred:
+ cred = api.getCredential()
threads = ThreadManager()
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
continue
# get the rspec from the aggregate
- server = api.aggregates[aggregate]
- threads.run(_ListResources, aggregate, server, credentials, options, call_id)
+ interface = api.aggregates[aggregate]
+ server = api.get_server(interface, cred)
+ threads.run(_ListResources, aggregate, server, [cred], options, call_id)
+
results = threads.get_results()
rspec_version = version_manager.get_version(options.get('rspec_version'))
# sfa aggregtes support both sfa and pg rspecs, no need to convert
# if aggregate supports sfa rspecs. otherwise convert to pg rspec
rspec = RSpec(RSpecConverter.to_pg_rspec(rspec, 'request'))
- filter = {'component_manager_id': hrn_to_urn(xrn, 'authority+cm')}
+ filter = {'component_manager_id': server_version['urn']}
rspec.filter(filter)
- requested_users = sfa_to_pg_users(users)
+ rspec = rspec.toxml()
+ requested_users = sfa_to_pg_users_arg(users)
args = [xrn, credential, rspec, requested_users]
if _call_id_supported(api, server):
args.append(call_id)
drop_slicemgr_stats(rspec)
# attempt to use delegated credential first
- credential = api.getDelegatedCredential(creds)
- if not credential:
- credential = api.getCredential()
+ cred = api.getDelegatedCredential(creds)
+ if not cred:
+ cred = api.getCredential()
# get the callers hrn
hrn, type = urn_to_hrn(xrn)
# unless the caller is the aggregate's SM
if caller_hrn == aggregate and aggregate != api.hrn:
continue
- server = api.aggregates[aggregate]
+ interface = api.aggregates[aggregate]
+ server = api.get_server(interface, cred)
# Just send entire RSpec to each aggregate
- threads.run(_CreateSliver, aggregate, server, xrn, credential, rspec.toxml(), users, call_id)
+ threads.run(_CreateSliver, aggregate, server, xrn, [cred], rspec.toxml(), users, call_id)
results = threads.get_results()
manifest_version = version_manager._get_version(rspec.version.type, rspec.version.version, 'manifest')
caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn()
# attempt to use delegated credential first
- credential = api.getDelegatedCredential(creds)
- if not credential:
- credential = api.getCredential()
+ cred = api.getDelegatedCredential(creds)
+ if not cred:
+ cred = api.getCredential()
threads = ThreadManager()
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
if caller_hrn == aggregate and aggregate != api.hrn:
continue
- server = api.aggregates[aggregate]
- threads.run(_RenewSliver, server, xrn, [credential], expiration_time, call_id)
+ interface = api.aggregates[aggregate]
+ server = api.get_server(interface, cred)
+ threads.run(_RenewSliver, server, xrn, [cred], expiration_time, call_id)
# 'and' the results
return reduce (lambda x,y: x and y, threads.get_results() , True)
caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn()
# attempt to use delegated credential first
- credential = api.getDelegatedCredential(creds)
- if not credential:
- credential = api.getCredential()
+ cred = api.getDelegatedCredential(creds)
+ if not cred:
+ cred = api.getCredential()
threads = ThreadManager()
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
if caller_hrn == aggregate and aggregate != api.hrn:
continue
- server = api.aggregates[aggregate]
- threads.run(_DeleteSliver, server, xrn, credential, call_id)
+ interface = api.aggregates[aggregate]
+ server = api.get_server(interface, cred)
+ threads.run(_DeleteSliver, server, xrn, [cred], call_id)
threads.get_results()
return 1
if Callids().already_handled(call_id): return {}
# attempt to use delegated credential first
- credential = api.getDelegatedCredential(creds)
- if not credential:
- credential = api.getCredential()
+ cred = api.getDelegatedCredential(creds)
+ if not cred:
+ cred = api.getCredential()
threads = ThreadManager()
for aggregate in api.aggregates:
- server = api.aggregates[aggregate]
- threads.run (_SliverStatus, server, slice_xrn, credential, call_id)
+ interface = api.aggregates[aggregate]
+ server = api.get_server(interface, cred)
+ threads.run (_SliverStatus, server, slice_xrn, [cred], call_id)
results = threads.get_results()
# get rid of any void result - e.g. when call_id was hit where by convention we return {}
caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn()
# attempt to use delegated credential first
- credential = api.getDelegatedCredential(creds)
- if not credential:
- credential = api.getCredential()
+ cred= api.getDelegatedCredential(creds)
+ if not cred:
+ cred = api.getCredential()
threads = ThreadManager()
# fetch from aggregates
for aggregate in api.aggregates:
# unless the caller is the aggregate's SM
if caller_hrn == aggregate and aggregate != api.hrn:
continue
- server = api.aggregates[aggregate]
- threads.run(_ListSlices, server, credential, call_id)
+ interface = api.aggregates[aggregate]
+ server = api.get_server(interface, cred)
+ threads.run(_ListSlices, server, [cred], call_id)
# combime results
results = threads.get_results()
caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn()
# attempt to use delegated credential first
- credential = api.getDelegatedCredential(creds)
- if not credential:
- credential = api.getCredential()
+ cred = api.getDelegatedCredential(creds)
+ if not cred:
+ cred = api.getCredential()
threads = ThreadManager()
for (aggregate, aggregate_rspec) in aggregate_rspecs.iteritems():
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
if caller_hrn == aggregate and aggregate != api.hrn:
continue
- server = None
- if aggregate in api.aggregates:
- server = api.aggregates[aggregate]
- else:
- net_urn = hrn_to_urn(aggregate, 'authority')
- # we may have a peer that knows about this aggregate
- for agg in api.aggregates:
- target_aggs = api.aggregates[agg].get_aggregates(credential, net_urn)
- if not target_aggs or not 'hrn' in target_aggs[0]:
- continue
- # send the request to this address
- url = target_aggs[0]['url']
- server = xmlrpcprotocol.get_server(url, api.key_file, api.cert_file, timeout=30)
- # aggregate found, no need to keep looping
- break
- if server is None:
- continue
- threads.run(server.GetTicket, xrn, credential, aggregate_rspec, users)
+
+ interface = api.aggregates[aggregate]
+ server = api.get_server(interface, cred)
+ threads.run(server.GetTicket, xrn, [cred], aggregate_rspec, users)
results = threads.get_results()
caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn()
# attempt to use delegated credential first
- credential = api.getDelegatedCredential(creds)
- if not credential:
- credential = api.getCredential()
+ cred = api.getDelegatedCredential(creds)
+ if not cred:
+ cred = api.getCredential()
threads = ThreadManager()
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
if caller_hrn == aggregate and aggregate != api.hrn:
continue
- server = api.aggregates[aggregate]
- threads.run(server.Start, xrn, credential)
+ interface = api.aggregates[aggregate]
+ server = api.get_server(interface, cred)
+ threads.run(server.Start, xrn, cred)
threads.get_results()
return 1
caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn()
# attempt to use delegated credential first
- credential = api.getDelegatedCredential(creds)
- if not credential:
- credential = api.getCredential()
+ cred = api.getDelegatedCredential(creds)
+ if not cred:
+ cred = api.getCredential()
threads = ThreadManager()
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
if caller_hrn == aggregate and aggregate != api.hrn:
continue
- server = api.aggregates[aggregate]
- threads.run(server.Stop, xrn, credential)
+ interface = api.aggregates[aggregate]
+ server = api.get_server(interface, cred)
+ threads.run(server.Stop, xrn, cred)
threads.get_results()
return 1