From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 8 Oct 2013 11:49:11 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-27~8^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=f65b3846a75ea1f3273d54b2aa5dc4503301a596

Merge branch 'master' of ssh://git.onelab.eu/git/sfa
---

f65b3846a75ea1f3273d54b2aa5dc4503301a596
diff --cc sfa/rspecs/elements/versions/iotlabv1Node.py
index d95103a0,bb1a0109..a1b5a5cf
--- a/sfa/rspecs/elements/versions/iotlabv1Node.py
+++ b/sfa/rspecs/elements/versions/iotlabv1Node.py
@@@ -58,18 -58,18 +58,18 @@@ class Iotlabv1Node
          if len(network_elems) > 0:
              network_elem = network_elems[0]
  
 -        iotlab_network_dict = {}
 -        iotlab_network_dict['login'] = ldap_username
 +            iotlab_network_dict = {}
 +            iotlab_network_dict['login'] = ldap_username
  
 -        iotlab_network_dict['ssh'] = \
 -            ['ssh ' + ldap_username + '@'+site+'.iotlab.info'
 -             for site in sites_set]
 -        network_elem.set('ssh',
 -                         unicode(iotlab_network_dict['ssh']))
 -        network_elem.set('login', unicode(iotlab_network_dict['login']))
 +            iotlab_network_dict['ssh'] = \
 +                ['ssh ' + ldap_username + '@'+site+'.iotlab.info'
 +                 for site in sites_set]
 +            network_elem.set('ssh',
 +                             unicode(iotlab_network_dict['ssh']))
 +            network_elem.set('login', unicode(iotlab_network_dict['login']))
  
      @staticmethod
-     def add_nodes(xml, nodes):
+     def add_nodes(xml, nodes, rspec_content_type=None):
          """Adds the nodes to the xml.
  
          Adds the nodes as well as dedicated iotlab fields to the node xml