from sfa.util.plxrn import *
from sfa.rspecs.sfa_rspec import SfaRSpec
from sfa.rspecs.pg_rspec import PGRSpec
+from sfa.rspecs.rspec_version import RSpecVersion
class Aggregate:
links = {}
node_tags = {}
prepared=False
+ #panos new user options variable
+ user_options = {}
- def __init__(self, api):
+ def __init__(self, api, user_options={}):
self.api = api
+ #panos
+ self.user_options = user_options
+ print "[aggregate] options = ",self.user_options
def prepare_sites(self, force=False):
if not self.sites or force:
def get_rspec(self, slice_xrn=None, version = None):
self.prepare()
rspec = None
- if version:
- format = version.format
- if format == 'pg':
- rspec = PGRSpec()
- else:
- rspec = SfaRSpec()
- else:
- rspec = SfaRSpec()
+ rspec_version = RSpecVersion(version)
+ if rspec_version['type'].lower() == 'protogeni':
+ rspec = PGRSpec()
+ #panos pass user options to SfaRSpec
+ elif rspec_version['type'].lower() == 'sfa':
+ rspec = SfaRSpec("",{},self.user_options)
+ else:
+ rspec = SfaRSpec("",{},self.user_options)
+
rspec.add_nodes(self.nodes.values())
rspec.add_interfaces(self.interfaces.values())
sliver = {}
sliver['hostname'] = self.nodes[node_id]['hostname']
sliver['tags'] = []
+ slivers.append(sliver)
for tag in tags:
# if tag isn't bound to a node then it applies to all slivers
if not tag['node_id']: