from sfa.util.specdict import *
from sfa.util.faults import *
from sfa.util.record import SfaRecord
+from sfa.rspecs.pg_rspec import PGRSpec
+from sfa.rspecs.sfa_rspec import SfaRSpec
+from sfa.rspecs.pg_rspec_converter import PGRSpecConverter
+from sfa.rspecs.rspec_parser import parse_rspec
from sfa.util.policy import Policy
from sfa.util.prefixTree import prefixTree
from sfa.util.sfaticket import *
import sfa.util.xmlrpcprotocol as xmlrpcprotocol
import sfa.plc.peers as peers
from sfa.util.version import version_core
+from sfa.rspecs.rspec_version import RSpecVersion
from sfa.util.callids import Callids
# we have specialized xmlrpclib.ServerProxy to remember the input url
server = api.aggregates[aggregate]
threads.run(server.CreateSliver, xrn, credential, rspec, users, call_id)
- results = threads.get_results()
- merged_rspec = merge_rspecs(results)
- return merged_rspec
+ results = threads.get_results()
+ rspec = SfaRSpec()
+ for result in results:
+ rspec.merge(result)
+ return rspec
def RenewSliver(api, xrn, creds, expiration_time, call_id):
if Callids().already_handled(call_id): return True
xrn = options.get('geni_slice_urn', '')
(hrn, type) = urn_to_hrn(xrn)
+ # get the rspec's return format from options
+ rspec_version = RSpecVersion(options.get('rspec_version', 'SFA 1'))
+ version_string = "rspec_%s_%s" % (rspec_version.format, rspec_version.version)
+
# get hrn of the original caller
origin_hrn = options.get('origin_hrn', None)
if not origin_hrn:
# look in cache first
if caching and api.cache and not xrn:
- rspec = api.cache.get('nodes')
+ rspec = api.cache.get(version_string)
if rspec:
return rspec
#threads.run(server.get_resources, cred, xrn, origin_hrn)
results = threads.get_results()
- merged_rspec = merge_rspecs(results)
+ #results.append(open('/root/protogeni.rspec', 'r').read())
+ rspec = SfaRSpec()
+ for result in results:
+ try:
+ tmp_rspec = parse_rspec(result)
+ if isinstance(tmp_rspec, SfaRSpec):
+ rspec.merge(result)
+ elif isinstance(tmp_rspec, PGRSpec):
+ rspec.merge(PGRSpecConverter.to_sfa_rspec(result))
+ else:
+ api.logger.info("SM.ListResources: invalid aggregate rspec")
+ except:
+ api.logger.info("SM.ListResources: Failed to merge aggregate rspec")
# cache the result
if caching and api.cache and not xrn:
- api.cache.add('nodes', merged_rspec)
+ api.cache.add(version_string, rspec.toxml())
- return merged_rspec
+ return rspec.toxml()
# first draft at a merging SliverStatus
def SliverStatus(api, slice_xrn, creds, call_id):
results = threads.get_results()
# get rid of any void result - e.g. when call_id was hit where by convention we return {}
- results = [ result in results if result and result['geni_resources']]
+ results = [ result for result in results if result and result['geni_resources']]
# do not try to combine if there's no result
if not results : return {}