From 68c9f7b0ab2ef093c5e3a6d77fe4af6a75aae569 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 20 May 2011 10:39:35 -0400 Subject: [PATCH] merge in rspec_extension branch --- sfa/plc/aggregate.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py index 505155f7..24f84a12 100644 --- a/sfa/plc/aggregate.py +++ b/sfa/plc/aggregate.py @@ -14,9 +14,14 @@ 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: @@ -65,16 +70,18 @@ class Aggregate: self.prepared = True - def get_rspec(self, slice_xrn=None, version = None, type=None): + def get_rspec(self, slice_xrn=None, version = None): self.prepare() rspec = None rspec_version = RSpecVersion(version) if rspec_version['type'].lower() == 'protogeni': - rspec = PGRSpec(type=type) + rspec = PGRSpec() + #panos pass user options to SfaRSpec elif rspec_version['type'].lower() == 'sfa': - rspec = SfaRSpec() + rspec = SfaRSpec("",{},self.user_options) else: - rspec = SfaRSpec() + rspec = SfaRSpec("",{},self.user_options) + rspec.add_nodes(self.nodes.values()) rspec.add_interfaces(self.interfaces.values()) -- 2.43.0