import sys
import time
import traceback
-from StringIO import StringIO
from copy import copy
from lxml import etree
from sfa.util.callids import Callids
from sfa.util.cache import Cache
-from sfa.server.threadmanager import ThreadManager
+from sfa.client.multiclient import MultiClient
from sfa.rspecs.rspec_converter import RSpecConverter
from sfa.rspecs.version_manager import VersionManager
stats_elements = rspec.xml.xpath('//statistics')
for node in stats_elements:
node.getparent().remove(node)
- except Exception, e:
+ except Exception as e:
logger.warn("drop_slicemgr_stats failed: %s " % (str(e)))
def add_slicemgr_stat(self, rspec, callname, aggname, elapsed, status, exc_info=None):
exc_frame = exc_tag.add_element("tb_frame", filename=str(item[0]),
line=str(item[1]), func=str(item[2]), code=str(item[3]))
- except Exception, e:
+ except Exception as e:
logger.warn("add_slicemgr_stat failed on %s: %s" %(aggname, str(e)))
def ListResources(self, api, creds, options):
forward_options['geni_rspec_version'] = options.get('geni_rspec_version')
result = server.ListResources(credential, forward_options)
return {"aggregate": aggregate, "result": result, "elapsed": time.time()-tStart, "status": "success"}
- except Exception, e:
+ except Exception as e:
api.logger.log_exc("ListResources failed at %s" %(server.url))
return {"aggregate": aggregate, "elapsed": time.time()-tStart, "status": "exception", "exc_info": sys.exc_info()}
cred = api.getDelegatedCredential(creds)
if not cred:
cred = api.getCredential()
- threads = ThreadManager()
+ multiclient = MultiClient()
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
# get the rspec from the aggregate
interface = api.aggregates[aggregate]
server = api.server_proxy(interface, cred)
- threads.run(_ListResources, aggregate, server, [cred], options)
+ multiclient.run(_ListResources, aggregate, server, [cred], options)
- results = threads.get_results()
+ results = multiclient.get_results()
rspec_version = version_manager.get_version(options.get('geni_rspec_version'))
if xrn:
result_version = version_manager._get_version(rspec_version.type, rspec_version.version, 'manifest')
hrn, type = urn_to_hrn(xrn)
valid_cred = api.auth.checkCredentials(creds, 'createsliver', hrn)[0]
caller_hrn = Credential(cred=valid_cred).get_gid_caller().get_hrn()
- threads = ThreadManager()
+ multiclient = MultiClient()
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
interface = api.aggregates[aggregate]
server = api.server_proxy(interface, cred)
# Just send entire RSpec to each aggregate
- threads.run(_Allocate, aggregate, server, xrn, [cred], rspec.toxml(), options)
+ multiclient.run(_Allocate, aggregate, server, xrn, [cred], rspec.toxml(), options)
- results = threads.get_results()
+ results = multiclient.get_results()
manifest_version = version_manager._get_version(rspec.version.type, rspec.version.version, 'manifest')
result_rspec = RSpec(version=manifest_version)
geni_urn = None
# get the callers hrn
valid_cred = api.auth.checkCredentials(creds, 'createsliver', xrn)[0]
caller_hrn = Credential(cred=valid_cred).get_gid_caller().get_hrn()
- threads = ThreadManager()
+ multiclient = MultiClient()
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
interface = api.aggregates[aggregate]
server = api.server_proxy(interface, cred)
# Just send entire RSpec to each aggregate
- threads.run(_Provision, aggregate, server, xrn, [cred], options)
+ multiclient.run(_Provision, aggregate, server, xrn, [cred], options)
- results = threads.get_results()
+ results = multiclient.get_results()
manifest_version = version_manager._get_version('GENI', '3', 'manifest')
result_rspec = RSpec(version=manifest_version)
geni_slivers = []
cred = api.getDelegatedCredential(creds)
if not cred:
cred = api.getCredential(minimumExpiration=31*86400)
- threads = ThreadManager()
+ multiclient = MultiClient()
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
continue
interface = api.aggregates[aggregate]
server = api.server_proxy(interface, cred)
- threads.run(_Renew, aggregate, server, xrn, [cred], expiration_time, options)
+ multiclient.run(_Renew, aggregate, server, xrn, [cred], expiration_time, options)
- results = threads.get_results()
+ results = multiclient.get_results()
geni_code = 0
geni_output = ",".join([x.get('output',"") for x in results])
cred = api.getDelegatedCredential(creds)
if not cred:
cred = api.getCredential()
- threads = ThreadManager()
+ multiclient = MultiClient()
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
continue
interface = api.aggregates[aggregate]
server = api.server_proxy(interface, cred)
- threads.run(_Delete, server, xrn, [cred], options)
+ multiclient.run(_Delete, server, xrn, [cred], options)
results = []
- for result in threads.get_results():
+ for result in multiclient.get_results():
results += ReturnValue.get_value(result)
return results
cred = api.getDelegatedCredential(creds)
if not cred:
cred = api.getCredential()
- threads = ThreadManager()
+ multiclient = MultiClient()
for aggregate in api.aggregates:
interface = api.aggregates[aggregate]
server = api.server_proxy(interface, cred)
- threads.run (_Status, server, slice_xrn, [cred], options)
- results = [ReturnValue.get_value(result) for result in threads.get_results()]
+ multiclient.run (_Status, server, slice_xrn, [cred], options)
+ results = [ReturnValue.get_value(result) for result in multiclient.get_results()]
# get rid of any void result - e.g. when call_id was hit, where by convention we return {}
results = [ result for result in results if result and result['geni_slivers']]
cred = api.getDelegatedCredential(creds)
if not cred:
cred = api.getCredential()
- threads = ThreadManager()
+ multiclient = MultiClient()
for aggregate in api.aggregates:
interface = api.aggregates[aggregate]
server = api.server_proxy(interface, cred)
- threads.run (_Describe, server, xrns, [cred], options)
- results = [ReturnValue.get_value(result) for result in threads.get_results()]
+ multiclient.run (_Describe, server, xrns, [cred], options)
+ results = [ReturnValue.get_value(result) for result in multiclient.get_results()]
# get rid of any void result - e.g. when call_id was hit, where by convention we return {}
results = [ result for result in results if result and result.get('geni_urn')]
cred = api.getDelegatedCredential(creds)
if not cred:
cred = api.getCredential()
- threads = ThreadManager()
+ multiclient = MultiClient()
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
continue
interface = api.aggregates[aggregate]
server = api.server_proxy(interface, cred)
- threads.run(server.PerformOperationalAction, xrn, [cred], action, options)
- threads.get_results()
+ multiclient.run(server.PerformOperationalAction, xrn, [cred], action, options)
+ multiclient.get_results()
return 1
- def Shutdown(self, api, xrn, creds, options={}):
+ def Shutdown(self, api, xrn, creds, options=None):
+ if options is None: options={}
xrn = Xrn(xrn)
# get the callers hrn
valid_cred = api.auth.checkCredentials(creds, 'stopslice', xrn.hrn)[0]
cred = api.getDelegatedCredential(creds)
if not cred:
cred = api.getCredential()
- threads = ThreadManager()
+ multiclient = MultiClient()
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
continue
interface = api.aggregates[aggregate]
server = api.server_proxy(interface, cred)
- threads.run(server.Shutdown, xrn.urn, cred)
- threads.get_results()
+ multiclient.run(server.Shutdown, xrn.urn, cred)
+ multiclient.get_results()
return 1