+#!/usr/bin/python
+
import datetime
import time
import traceback
from sfa.plc.aggregate import Aggregate
from sfa.plc.slices import *
from sfa.util.version import version_core
-from sfa.rspecs.rspec_version import RSpecVersion
+from sfa.rspecs.rspec_version import RSpecVersion
+from sfa.rspecs.sfa_rspec import sfa_rspec_version
+from sfa.rspecs.pg_rspec import pg_rspec_version
+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"],
- })
+
+ supported_rspecs = [dict(pg_rspec_version), dict(sfa_rspec_version)]
+ version_more = {'interface':'aggregate',
+ 'testbed':'myplc',
+ 'hrn':xrn.get_hrn(),
+ 'request_rspec_versions': supported_rspecs,
+ 'ad_rspec_versions': supported_rspecs,
+ 'default_ad_rspec': dict(sfa_rspec_version)
+ }
+ 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.UnBindObjectFromPeer(api.plauth, 'slice', slice['slice_id'], peer)
api.plshell.AddSliceToNodes(api.plauth, slice['name'], added_nodes)
- api.plshell.DeleteSliceFromNodes(api.plauth, slice['slice'], deleted_nodes)
+ api.plshell.DeleteSliceFromNodes(api.plauth, slice['name'], deleted_nodes)
# TODO: update slice tags
#network.updateSliceTags()
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=rspec.version)
def RenewSliver(api, xrn, creds, expiration_time, call_id):
return 1
# xxx Thierry : caching at the aggregate level sounds wrong...
-caching=True
-#caching=False
+#caching=True
+caching=False
def ListSlices(api, creds, call_id):
if Callids().already_handled(call_id): return []
# look in cache first
(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)
+ rspec_version = RSpecVersion(options.get('rspec_version'))
+ version_string = "rspec_%s" % (rspec_version.get_version_name())
+
+ #panos adding the info option to the caching key (can be improved)
+ if options.get('info'):
+ version_string = version_string + "_"+options.get('info')
+
+ print "[aggregate] version string = ",version_string
# look in cache first
if caching and api.cache and not xrn:
api.logger.info("aggregate.ListResources: returning cached value for hrn %s"%hrn)
return rspec
- aggregate = Aggregate(api)
+ #aggregate = Aggregate(api)
+ #panos: passing user-defined options
+ #print "manager options = ",options
+ aggregate = Aggregate(api, options)
- 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: