From 5fb03530e3624dcee6a35cb05a4753dbe0a4d934 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Sat, 5 Nov 2011 09:57:35 -0400 Subject: [PATCH] nodes should in a network --- sfa/rspecs/elements/versions/sfav1Network.py | 2 +- sfa/rspecs/elements/versions/sfav1Node.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sfa/rspecs/elements/versions/sfav1Network.py b/sfa/rspecs/elements/versions/sfav1Network.py index c6f29d1b..b529ad57 100644 --- a/sfa/rspecs/elements/versions/sfav1Network.py +++ b/sfa/rspecs/elements/versions/sfav1Network.py @@ -7,7 +7,7 @@ from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements class SFAv1Network: elements = { - 'network': RSpecElement(RSpecElements.NETWORK, '//default:network | //network'), + 'network': RSpecElement(RSpecElements.NETWORK, '//network'), } @staticmethod diff --git a/sfa/rspecs/elements/versions/sfav1Node.py b/sfa/rspecs/elements/versions/sfav1Node.py index a4be2c47..b8fe27ef 100644 --- a/sfa/rspecs/elements/versions/sfav1Node.py +++ b/sfa/rspecs/elements/versions/sfav1Node.py @@ -29,11 +29,14 @@ class SFAv1Node: network_elems = SFAv1Network.get_networks(xml) if len(network_elems) > 0: network_elem = network_elems[0] - else: - network_elem = xml.root - + elif len(nodes) > 0 and nodes[0].get('component_manager_id'): + network_elem = SFAv1Network.add_network(xml.root, {'name': nodes[0]['component_manager_id']}) + + + node_elems = [] for node in nodes: node_elem = etree.SubElement(network_elem, 'node') + node_elems.append(node_elem) network = None if 'component_manager_id' in node and node['component_manager_id']: node_elem.set('component_manager_id', node['component_manager_id']) -- 2.43.0