git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
703f91b
)
fix problem setting attributes, fix blank return rspecs causing rspec.merge to fail
author
smbaker
<smbaker@fc8clean.lan>
Mon, 19 Dec 2011 02:40:18 +0000
(18:40 -0800)
committer
smbaker
<smbaker@fc8clean.lan>
Mon, 19 Dec 2011 02:40:18 +0000
(18:40 -0800)
sfa/rspecs/versions/sfav1.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/versions/sfav1.py
b/sfa/rspecs/versions/sfav1.py
index
ec27971
..
39bbac5
100644
(file)
--- a/
sfa/rspecs/versions/sfav1.py
+++ b/
sfa/rspecs/versions/sfav1.py
@@
-93,6
+93,7
@@
class SFAv1(BaseVersion):
attributes = []
nodes_with_slivers = self.get_nodes_with_slivers()
for default_attribute in self.get_default_sliver_attributes(network):
+ attribute = default_attribute.copy()
attribute['node_id'] = None
attributes.append(attribute)
for node in nodes_with_slivers:
@@
-194,6
+195,9
@@
class SFAv1(BaseVersion):
Merge contents for specified rspec with current rspec
"""
+ if not in_rspec:
+ return
+
from sfa.rspecs.rspec import RSpec
if isinstance(in_rspec, RSpec):
rspec = in_rspec