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/?a=commitdiff_plain;h=f65b3846a75ea1f3273d54b2aa5dc4503301a596;hp=-c;p=sfa.git

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

f65b3846a75ea1f3273d54b2aa5dc4503301a596
diff --combined sfa/rspecs/elements/versions/iotlabv1Node.py
index d95103a0,bb1a0109..a1b5a5cf
--- a/sfa/rspecs/elements/versions/iotlabv1Node.py
+++ b/sfa/rspecs/elements/versions/iotlabv1Node.py
@@@ -39,7 -39,7 +39,7 @@@ class IotlabLocation(Location)
  class IotlabMobility(Element):
      """ Class to give information of a node's mobility, and what kind of
      mobility it is (train, roomba robot ...) """
 -    fields = ['mobile', 'mobility-type']
 +    fields = ['mobile', 'mobility_type']
  
  
  
@@@ -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
@@@ -94,6 -94,7 +94,6 @@@
          else:
              network_elem = xml
  
 -        logger.debug("iotlabv1Node \t add_nodes  nodes %s \r\n " % (nodes[0]))
          node_elems = []
          #Then add nodes items to the network item in the xml
          for node in nodes:
@@@ -146,9 -147,12 +146,9 @@@
                                                                 now='false')
  
              #set position
 -                logger.debug("Iotlabv1Node position node_elem %s" % (node_elem))
                  if attribute is 'position':
                      node_elem.add_instance('position', node['position'],
                                             IotlabPosition.fields)
 -                logger.debug("Iotlabv1Node position node[position] %s "
 -                            % (node['position']))
              ## add services
              #PGv2Services.add_services(node_elem, node.get('services', []))
              # add slivers
@@@ -165,6 -169,11 +165,11 @@@
                                                      #'value': initscript['name']})
  
                      Iotlabv1Sliver.add_slivers(node_elem, slivers)
+             
+             # add sliver tag in Request Rspec
+             if rspec_content_type == "request":
+                 node_elem.add_instance('sliver', '', [])
+ 
          return node_elems
  
      @staticmethod