X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fpg_rspec.py;h=a2033cdc2746e4f4bdbc27f3b19b2a2737e564f4;hb=b4d3c48e1f55ef03042a03173dcdf8e9ef425937;hp=569c342b6700a1f0bb6ca918064de8023862f309;hpb=f2a4ff047199d94add5e2240b952851e5a04445a;p=sfa.git
diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py
index 569c342b..a2033cdc 100755
--- a/sfa/rspecs/pg_rspec.py
+++ b/sfa/rspecs/pg_rspec.py
@@ -6,44 +6,41 @@ from sfa.util.xrn import *
from sfa.util.plxrn import hostname_to_urn
from sfa.util.config import Config
-
class PGRSpec(RSpec):
header = '\n'
- template = """
-\n
-
-"""
+ template = """"""
namespaces = {'rspecv2':'http://www.protogeni.net/resources/rspec/0.2',
'xsi': 'http://www.w3.org/2001/XMLSchema-instance'
}
schemas = {'xsi': 'http://www.protogeni.net/resources/rspec/0.2 http://www.protogeni.net/resources/rspec/0.2/ad.xsd'
}
format = 'pg'
+ format = 'protogeni'
xml = None
def get_network(self):
network = None
- nodes = self.xml.xpath('//rspecv2:node[@component_manager_uuid][1]', self.namespaces)
+ nodes = self.xml.xpath('//rspecv2:node[@component_manager_uuid][1]', namespaces=self.namespaces)
if nodes:
network = nodes[0].get('component_manager_uuid')
return network
def get_networks(self):
- networks = self.xml.xpath('//rspecv2:node[@component_manager_uuid]/@component_manager_uuid')
+ networks = self.xml.xpath('//rspecv2:node[@component_manager_uuid]/@component_manager_uuid', namespaces=self.namespaces)
return set(networks)
def get_node_elements(self):
- nodes = self.xml.xpath('//rspecv2:node', self.namespaces)
+ nodes = self.xml.xpath('//rspecv2:node', namespaces=self.namespaces)
return nodes
def get_nodes(self, network=None):
- return self.xml.xpath('//rspecv2:node[@component_uuid]/@component_uuid', self.namespaces)
+ return self.xml.xpath('//rspecv2:node[@component_name]/@component_name', namespaces=self.namespaces)
def get_nodes_with_slivers(self, network=None):
if network:
- return self.xml.xpath('//node[@component_manager_uuid="%s"][sliver_type]/@component_uuid' % network, self.namespaces)
+ return self.xml.xpath('//rspecv2:node[@component_manager_id="%s"][sliver_type]/@component_name' % network, namespaces=self.namespaces)
else:
- return self.xml.xpath('//node[sliver_type]/@component_uuid' % network, self.namespaces)
+ return self.xml.xpath('//rspecv2:node[rspecv2:sliver_type]/@component_name', namespaces=self.namespaces)
def get_nodes_without_slivers(self, network=None):
pass
@@ -54,20 +51,43 @@ class PGRSpec(RSpec):
for node in nodes:
urn = ""
if check_for_dupes and \
- self.xml.xpath('//rspecv2:node[@component_uuid="%s"]' % urn, self.namespaces):
+ self.xml.xpath('//rspecv2:node[@component_uuid="%s"]' % urn, namespaces=self.namespaces):
# node already exists
continue
node_tag = etree.SubElement(self.xml, 'node')
+ if 'network_urn' in node:
+ node_tag.set('component_manager_id', node['network_urn'])
+ if 'urn' in node:
+ node_tag.set('component_id', node['urn'])
+ if 'hostname' in node:
+ 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'
- location_tag = etree.SubElement(node_tag, 'location')
- interface_tag = etree.SubElement(node_tag, 'interface')
+ location_tag = etree.SubElement(node_tag, 'location', location="US")
+ if 'site' in node:
+ if 'longitude' in node['site']:
+ location_tag.set('longitude', str(node['site']['longitude']))
+ if 'latitude' in node['site']:
+ location_tag.set('latitude', str(node['site']['latitude']))
+ #if 'interfaces' in node:
def add_slivers(self, slivers, check_for_dupes=False):
- pass
+ if not isinstance(slivers, list):
+ slivers = [slivers]
+
+ nodes_with_slivers = self.get_nodes_with_slivers()
+ for sliver in slivers:
+ hostname = sliver['hostname']
+ if hostname in nodes_with_slivers:
+ continue
+ nodes = self.xml.xpath('//rspecv2:node[@component_name="%s"] | //node[@component_name="%s"]' % (hostname, 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