rspec.version.add_nodes take an extra arg to handle Request RSpec

[sfa.git] / sfa / rspecs / versions / sfav1.py

diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py
index fd2e031..97950e7 100644 (file)
--- a/sfa/rspecs/versions/sfav1.py
+++ b/sfa/rspecs/versions/sfav1.py
@@ -46,8 +46,8 @@ class SFAv1(RSpecVersion):
     def get_nodes_with_slivers(self):
         return SFAv1Node.get_nodes_with_slivers(self.xml)
 
-    def add_nodes(self, nodes, network = None, no_dupes=False):
-        SFAv1Node.add_nodes(self.xml, nodes)
+    def add_nodes(self, nodes, network = None, no_dupes=False, rspec_content_type=None):
+        SFAv1Node.add_nodes(self.xml, nodes, rspec_content_type)
 
     def merge_node(self, source_node_tag, network, no_dupes=False):
         if no_dupes and self.get_node_element(node['hostname']):
@@ -145,10 +145,15 @@ class SFAv1(RSpecVersion):
             if network:
                 network_tag = self.xml.xpath("//network[@name='%s']" % network)
             else:
-                network_tag = self.xml.xpath("//network")    
-            if isinstance(network_tag, list):
+                network_tag = self.xml.xpath("//network") 
+            if len(network_tag) > 0:
                 network_tag = network_tag[0]
+            elif network:
+                network_tag = self.add_network(network)
+            else:
+                network_tag = self.xml
             defaults = network_tag.add_element('sliver_defaults')
+            
         elif isinstance(defaults, list):
             defaults = defaults[0]
         SFAv1Sliver.add_sliver_attribute(defaults, name, value)