From: smbaker <smbaker@fc8clean.lan>
Date: Mon, 19 Dec 2011 02:40:18 +0000 (-0800)
Subject: fix problem setting attributes, fix blank return rspecs causing rspec.merge to fail
X-Git-Tag: sfa-2.0-7~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f1b412b12df00618ca55bd077d2d8b7aa23c0287;p=sfa.git

fix problem setting attributes, fix blank return rspecs causing rspec.merge to fail
---

diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py
index ec279715..39bbac5b 100644
--- 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