From: Tony Mack Date: Sat, 9 Jul 2011 21:48:56 +0000 (-0400) Subject: component_manager_id should be a urn not hrn X-Git-Tag: sfa-1.0-28~7^2~18 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fc619225237e38276c0aa6c8eda71f9c562f3e91;p=sfa.git component_manager_id should be a urn not hrn --- diff --git a/sfa/rspecs/sfa_rspec.py b/sfa/rspecs/sfa_rspec.py index 5eb34ed7..57c626bc 100755 --- a/sfa/rspecs/sfa_rspec.py +++ b/sfa/rspecs/sfa_rspec.py @@ -65,6 +65,7 @@ class SfaRSpec(RSpec): nodes = [node.strip() for node in nodes] return nodes + def get_nodes_without_slivers(self, network=None): xpath_nodes_without_slivers = '//node[not(sliver)]/hostname/text()' xpath_nodes_without_slivers_in_network = '//network[@name="%s"]//node[not(sliver)]/hostname/text()' @@ -210,7 +211,7 @@ class SfaRSpec(RSpec): node_tag = etree.SubElement(network_tag, 'node') if 'network' in node: - node_tag.set('component_manager_id', network) + node_tag.set('component_manager_id', hrn_to_urn(network, 'authority+sa')) if 'urn' in node: node_tag.set('component_id', node['urn']) if 'site_urn' in node: