X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fiotlabv1Node.py;h=df3dc6cc7c5e4c8d10ff26f3b0fbb76eb275b700;hb=ed21507f990ecf9c49887283fb44e9c92a8624f9;hp=4abfdf291d321a9e0aa36811932ae53ec127f52b;hpb=875d9ae0a874cd8c703929d6509458a254e3594a;p=sfa.git diff --git a/sfa/rspecs/elements/versions/iotlabv1Node.py b/sfa/rspecs/elements/versions/iotlabv1Node.py index 4abfdf29..df3dc6cc 100644 --- a/sfa/rspecs/elements/versions/iotlabv1Node.py +++ b/sfa/rspecs/elements/versions/iotlabv1Node.py @@ -54,7 +54,21 @@ class Iotlabv1Node: @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 + element. + + :param xml: the xml being constructed. + :type xml: xml + :param nodes: list of node dict + :type nodes: list + :returns: a list of node elements. + :rtype: list + + """ +>>>>>>> f7d277c... rspec.version.add_nodes take an extra arg to handle Request RSpec #Add network item in the xml network_elems = xml.xpath('//network') if len(network_elems) > 0: @@ -134,6 +148,11 @@ class Iotlabv1Node: #'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