from sfa.plc.slices import *
from sfa.util.version import version_core
from sfa.rspecs.rspec_version import RSpecVersion
+from sfa.rspecs.pl_rspec_version import supported_rspecs
from sfa.rspecs.rspec_parser import parse_rspec
from sfa.util.sfatime import utcparse
from sfa.util.callids import Callids
def GetVersion(api):
xrn=Xrn(api.hrn)
- return version_core({'interface':'aggregate',
- 'testbed':'myplc',
- 'hrn':xrn.get_hrn(),
- 'input_rspec' : ['PG 2', 'SFA 1'],
- 'output_rspec' : ["SFA 1"],
- 'ad_rspec' : ["PG 2", "SFA 1"],
- })
+ version_more = {'interface':'aggregate',
+ 'testbed':'myplc',
+ 'hrn':xrn.get_hrn()}
+ version_more.update(supported_rspecs)
+ return version_core(version_more)
def __get_registry_objects(slice_xrn, creds, users):
"""
nodes = api.plshell.GetNodes(api.plauth, slice['node_ids'], ['hostname'])
current_slivers = [node['hostname'] for node in nodes]
rspec = parse_rspec(rspec_string)
- requested_slivers = rspec.get_nodes_with_slivers()
-
+ requested_slivers = [str(host) for host in rspec.get_nodes_with_slivers()]
# remove nodes not in rspec
deleted_nodes = list(set(current_slivers).difference(requested_slivers))
api.plshell.BindObjectToPeer(api.plauth, 'slice', slice.id, peer,
slice.peer_id)
- return aggregate.get_rspec(slice_xrn=slice_xrn)
+ return aggregate.get_rspec(slice_xrn=slice_xrn, version=RSpecVersion("protogeni"))
def RenewSliver(api, xrn, creds, expiration_time, call_id):
# 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)
+ version_string = "rspec_%s" % (rspec_version.get_version_name())
# look in cache first
if caching and api.cache and not xrn:
aggregate = Aggregate(api)
- if xrn:
- # get this rspec for the specified slice
- rspec = aggregate.get_rspec(slice_xrn=hrn, version=rspec_version)
- else:
- # generate rspec in both pg and sfa formats
- rspec = aggregate.get_rspec(version=rspec_version)
+ rspec = aggregate.get_rspec(slice_xrn=xrn, version=rspec_version)
# cache the result
if caching and api.cache and not xrn: