bugfix

[sfa.git] / sfa / rspecs / elements / versions / sfav1Node.py

diff --git a/sfa/rspecs/elements/versions/sfav1Node.py b/sfa/rspecs/elements/versions/sfav1Node.py
index 37a786e..c2f1907 100644 (file)
--- a/sfa/rspecs/elements/versions/sfav1Node.py
+++ b/sfa/rspecs/elements/versions/sfav1Node.py
@@ -1,11 +1,10 @@
 
 from sfa.util.xml import XpathFilter
-from sfa.util.plxrn import PlXrn
+from sfa.util.plxrn import PlXrn, xrn_to_hostname
 from sfa.util.xrn import Xrn
 from sfa.rspecs.elements.element import Element
 from sfa.rspecs.elements.node import Node
 from sfa.rspecs.elements.sliver import Sliver
-from sfa.rspecs.elements.network import Network 
 from sfa.rspecs.elements.location import Location
 from sfa.rspecs.elements.hardware_type import HardwareType
 from sfa.rspecs.elements.disk_image import DiskImage
@@ -42,10 +41,10 @@ class SFAv1Node:
 
             # set component_name attribute and  hostname element
             if 'component_id' in node and node['component_id']:
-                xrn = Xrn(node['component_id'])
-                node_elem.set('component_name', xrn.get_leaf())
+                component_name = xrn_to_hostname(node['component_id'])
+                node_elem.set('component_name', component_name)
                 hostname_tag = node_elem.add_element('hostname')
-                hostname_tag.set_text(xrn.get_leaf())
+                hostname_tag.set_text(component_name)
 
             # set site id
             if 'authority_id' in node and node['authority_id']:
@@ -96,9 +95,9 @@ class SFAv1Node:
 
     @staticmethod
     def get_nodes_with_slivers(xml):
-        xpath = '//node/sliver | //default:node/default:sliver' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter))
+        xpath = '//node/sliver | //default:node/default:sliver' 
         node_elems = xml.xpath(xpath)
-        return SFAv1Node.get_nodes_objs(node_elems)
+        return SFAv1Node.get_node_objs(node_elems)
 
 
     @staticmethod
@@ -117,7 +116,8 @@ class SFAv1Node:
             node['interfaces'] = Element.get_elements(node_elem, './default:interface | ./interface', Interface)
             node['services'] = PGv2Services.get_services(node_elem) 
             node['slivers'] = SFAv1Sliver.get_slivers(node_elem)
-            node['tags'] =  SFAv1PLTag.get_pl_tags(node_elem, ignore=Node.fields.keys())
+#thierry    node['tags'] =  SFAv1PLTag.get_pl_tags(node_elem, ignore=Node.fields.keys())
+            node['tags'] =  SFAv1PLTag.get_pl_tags(node_elem, ignore=Node.fields)
             nodes.append(node)
         return nodes