From 8453bd70f793dea29ee048c473c572f20463b0e5 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 2 May 2011 15:47:32 -0400 Subject: [PATCH] fix attribute names and xpath queries --- sfa/rspecs/pg_rspec.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py index 57381b41..6ba9ecf2 100755 --- a/sfa/rspecs/pg_rspec.py +++ b/sfa/rspecs/pg_rspec.py @@ -38,9 +38,9 @@ class PGRSpec(RSpec): def get_nodes_with_slivers(self, network=None): if network: - return self.xml.xpath('//node[@component_manager_uuid="%s"][sliver_type]/@component_uuid' % network, namespaces=self.namespaces) + return self.xml.xpath('//node[@component_manager_uuid="%s"][sliver_type]/@component_name' % network, namespaces=self.namespaces) else: - return self.xml.xpath('//node[sliver_type]/@component_uuid' % network, namespaces=self.namespaces) + return self.xml.xpath('//node[sliver_type]/@component_name', namespaces=self.namespaces) def get_nodes_without_slivers(self, network=None): pass @@ -61,7 +61,7 @@ class PGRSpec(RSpec): if 'urn' in node: node_tag.set('component_id', node['urn']) if 'hostname' in node: - node_tag.set('name', node['hostname']) + node_tag.set('component_name', node['hostname']) node_type_tag = etree.SubElement(node_tag, 'node_type', type_name='pcvm', type_slots='100') available_tag = etree.SubElement(node_tag, 'available').text = 'true' exclusive_tag = etree.SubElement(node_tag, 'exclusive').text = 'false' @@ -74,8 +74,19 @@ class PGRSpec(RSpec): #if 'interfaces' in node: - def add_slivers(self, slivers, check_for_dupes=False): - pass + def add_slivers(self, hostnames, check_for_dupes=False): + if not isinstance(hostnames, list): + hostnames = [hostnames] + + nodes_with_slivers = self.get_nodes_with_slivers() + for hostname in hostnames: + if hostname in nodes_with_slivers: + continue + nodes = self.xml.xpath('//node[@component_name="%s"]' % hostname, namespaces=self.namespaces) + if nodes: + node = nodes[0] + node.set('client_id', hostname) + etree.SubElement(node, 'sliver_type', name='planetlab-vnode') def add_interfaces(self, interfaces, check_for_dupes=False): pass -- 2.43.0