from sfa.rspecs.rspec import RSpec
from sfa.util.xrn import *
from sfa.util.plxrn import hostname_to_urn
-from sfa.util.config import Config
+from sfa.util.config import Config
+from sfa.rspecs.rspec_version import RSpecVersion
+_version = {'type': 'ProtoGeni',
+ 'version': '2',
+ 'schema': 'http://www.protogeni.net/resources/rspec/2/request.xsd',
+ 'namespace': 'http://www.protogeni.net/resources/rspec/2',
+ 'extenstions': [
+ 'http://www.protogeni.net/resources/rspec/ext/gre-tunnel/1',
+ 'http://www.protogeni.net/resources/rspec/ext/other-ext/3'
+ ]
+}
+pg_rspec_version = RSpecVersion(_version)
class PGRSpec(RSpec):
- header = '<?xml version="1.0"?>\n'
- template = """
-<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/0.2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/0.2 http://www.protogeni.net/resources/rspec/0.2/ad.xsd">\n
-</rspec>
-"""
- 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'
xml = None
+ header = '<?xml version="1.0"?>\n'
+ template = """<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/0.2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/0.2 http://www.protogeni.net/resources/rspec/0.2/ad.xsd"></rspec>"""
+ version = pg_rspec_version
+ namespaces = {'rspecv2': version['namespace']}
def get_network(self):
network = None
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):
return nodes
def get_nodes(self, network=None):
- return self.xml.xpath('//rspecv2:node[@component_uuid]/@component_uuid', namespaces=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, namespaces=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, namespaces=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
continue
node_tag = etree.SubElement(self.xml, 'node')
- if 'network' in node:
- node_tag.set('component_manager_id', node['network'])
+ 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('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'
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
pass
+ def merge(self, in_rspec):
+ """
+ Merge contents for specified rspec with current rspec
+ """
+
+ # just copy over all the child elements under the root element
+ tree = etree.parse(StringIO(in_rspec))
+ root = tree.getroot()
+ for child in root.getchildren():
+ self.xml.append(child)
+
+
+
if __name__ == '__main__':
rspec = PGRSpec()
rspec.add_nodes([1])