X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fversions%2Fiotlabv1.py;h=561b61c58358036b9cca01b63ba78be01e070b9d;hb=ed21507f990ecf9c49887283fb44e9c92a8624f9;hp=6d15973e07d828d60eb8d68789117abc6f3647d0;hpb=b0995f45712c5ea9dd26fdf0c4347ccba2d77fce;p=sfa.git

diff --git a/sfa/rspecs/versions/iotlabv1.py b/sfa/rspecs/versions/iotlabv1.py
index 6d15973e..561b61c5 100644
--- a/sfa/rspecs/versions/iotlabv1.py
+++ b/sfa/rspecs/versions/iotlabv1.py
@@ -3,7 +3,7 @@ from copy import deepcopy
 
 from sfa.rspecs.version import RSpecVersion
 import sys
-from sfa.rspecs.elements.versions.iotlabv1Lease import Iotlabv1Lease
+# from sfa.rspecs.elements.versions.iotlabv1Lease import Iotlabv1Lease
 from sfa.rspecs.elements.versions.iotlabv1Node import Iotlabv1Node
 from sfa.rspecs.elements.versions.iotlabv1Sliver import Iotlabv1Sliver
 
@@ -12,9 +12,14 @@ from sfa.rspecs.elements.versions.sfav1Lease import SFAv1Lease
 
 from sfa.util.sfalogging import logger
 
+
 class Iotlabv1(RSpecVersion):
+    """
+    Defines Iotlab style RSpec and associated methods to parse and create a
+    valid Iotlab XML Rspec.
+    """
     #enabled = True
-    type = 'Slab'
+    type = 'Iotlab'
     content_type = 'ad'
     version = '1'
     #template = '<RSpec type="%s"></RSpec>' % type
@@ -38,7 +43,6 @@ class Iotlabv1(RSpecVersion):
                     network_elem in network_elems]
         return networks
 
-
     def add_network(self, network):
         network_tags = self.xml.xpath('//network[@name="%s"]' % network)
         if not network_tags:
@@ -47,9 +51,7 @@ class Iotlabv1(RSpecVersion):
             network_tag = network_tags[0]
         return network_tag
 
-
     # Nodes
-
     def get_nodes(self, filter=None):
         return Iotlabv1Node.get_nodes(self.xml, filter)
 
@@ -62,8 +64,8 @@ class Iotlabv1(RSpecVersion):
     def add_connection_information(self, ldap_username, sites_set):
         return Iotlabv1Node.add_connection_information(self.xml,ldap_username, sites_set)
 
-    def add_nodes(self, nodes, check_for_dupes=False):
-        return Iotlabv1Node.add_nodes(self.xml,nodes )
+    def add_nodes(self, nodes, check_for_dupes=False, rspec_content_type=None):
+        return Iotlabv1Node.add_nodes(self.xml,nodes, rspec_content_type)
 
     def merge_node(self, source_node_tag, network, no_dupes = False):
         logger.debug("SLABV1 merge_node")