git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the possibility for users to define a set of information fields
[sfa.git]
/
sfa
/
plc
/
aggregate.py
diff --git
a/sfa/plc/aggregate.py
b/sfa/plc/aggregate.py
index
afc20d4
..
2e49dd6
100644
(file)
--- a/
sfa/plc/aggregate.py
+++ b/
sfa/plc/aggregate.py
@@
-14,9
+14,14
@@
class Aggregate:
links = {}
node_tags = {}
prepared=False
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
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 prepare_sites(self, force=False):
if not self.sites or force:
@@
-71,10
+76,12
@@
class Aggregate:
rspec_version = RSpecVersion(version)
if rspec_version['type'].lower() == 'protogeni':
rspec = PGRSpec()
rspec_version = RSpecVersion(version)
if rspec_version['type'].lower() == 'protogeni':
rspec = PGRSpec()
+ #panos pass user options to SfaRSpec
elif rspec_version['type'].lower() == 'sfa':
elif rspec_version['type'].lower() == 'sfa':
- rspec = SfaRSpec()
+ rspec = SfaRSpec(
"",{},self.user_options
)
else:
else:
- rspec = SfaRSpec()
+ rspec = SfaRSpec("",{},self.user_options)
+
rspec.add_nodes(self.nodes.values())
rspec.add_interfaces(self.interfaces.values())
rspec.add_nodes(self.nodes.values())
rspec.add_interfaces(self.interfaces.values())