X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2Node.py;h=0a694ad10f756dd99d6b9b7a12888bbe8ee76aab;hb=ed21507f990ecf9c49887283fb44e9c92a8624f9;hp=ea171d61c677c364de320373375a4bab09550e91;hpb=6768452369c6e82f731239fc474b497d1b3ac8ab;p=sfa.git diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py index ea171d61..0a694ad1 100644 --- a/sfa/rspecs/elements/versions/pgv2Node.py +++ b/sfa/rspecs/elements/versions/pgv2Node.py @@ -19,7 +19,7 @@ from sfa.rspecs.elements.attribute import Attribute class PGv2Node: @staticmethod - def add_nodes(xml, nodes): + def add_nodes(xml, nodes, rspec_content_type=None): node_elems = [] for node in nodes: node_fields = ['component_manager_id', 'component_id', 'client_id', 'sliver_id', 'exclusive'] @@ -27,7 +27,7 @@ class PGv2Node: node_elems.append(node_elem) # set component name if node.get('component_id'): - component_name = get_leaf(Xrn(node['component_id']).get_hrn()) + component_name = Xrn.unescape(get_leaf(Xrn(node['component_id']).get_hrn())) node_elem.set('component_name', component_name) # set hardware types if node.get('hardware_types'): @@ -70,6 +70,10 @@ class PGv2Node: tag['name'] = tag.pop('tagname') node_elem.add_instance('{%s}attribute' % xml.namespaces['planetlab'], tag, ['name', 'value']) + # add sliver tag in Request Rspec + if rspec_content_type == "request": + node_elem.add_instance('sliver', '', []) + return node_elems