From 519a8f070faee9c999137c6f95b30b3955ffe08f Mon Sep 17 00:00:00 2001 From: smbaker Date: Mon, 2 Jan 2012 16:54:37 -0800 Subject: [PATCH] fix hostname, add conversion of hardware_types --- sfa/rspecs/pg_rspec_converter.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sfa/rspecs/pg_rspec_converter.py b/sfa/rspecs/pg_rspec_converter.py index 5db0dc3e..b39184a5 100755 --- a/sfa/rspecs/pg_rspec_converter.py +++ b/sfa/rspecs/pg_rspec_converter.py @@ -68,12 +68,18 @@ class PGRSpecConverter: node_element.set(attrib, attribs[attrib]) urn = pg_node["component_id"] if urn: - urn = urn[0] + if type(urn)==list: + # legacy code, not sure if urn is ever a list... + urn = urn[0] hostname = Xrn.urn_split(urn)[-1] hostname_element = node_element.add_element('hostname') hostname_element.set_text(hostname) if hostname in nodes_with_slivers: - node_element.add_element('sliver') + node_element.add_element('sliver') + + for hardware_type in pg_node["hardware_types"]: + if "name" in hardware_type: + node_element.add_element("hardware_type", name=hardware_type["name"]) # just copy over remaining child elements #for child in pg_node_element.getchildren(): -- 2.47.0