From: Mohamed Larabi Date: Sun, 13 Oct 2013 09:57:51 +0000 (+0200) Subject: remove pl dependency from rspec X-Git-Tag: sfa-3.0-2-bonfire-r1-0~26 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=1d313ecb50cfe38de38f287217fe71abc5b09f83 remove pl dependency from rspec --- diff --git a/sfa/rspecs/elements/v3/node.py b/sfa/rspecs/elements/v3/node.py index 1ddaa737..1f20c680 100644 --- a/sfa/rspecs/elements/v3/node.py +++ b/sfa/rspecs/elements/v3/node.py @@ -1,4 +1,4 @@ -from sfa.util.xrn import Xrn +from sfa.util.xrn import Xrn, get_leaf from sfa.util.xml import XpathFilter from sfa.rspecs.elements.node import NodeElement @@ -13,7 +13,6 @@ from sfa.rspecs.elements.v3.services import Services from sfa.rspecs.elements.versions.pgv2SliverType import PGv2SliverType from sfa.rspecs.elements.versions.pgv2Interface import PGv2Interface -from sfa.planetlab.plxrn import xrn_to_hostname class Node: @staticmethod @@ -25,7 +24,7 @@ class Node: node_elems.append(node_elem) # set component name if node.get('component_id'): - component_name = xrn_to_hostname(node['component_id']) + 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'):