class PGRSpec(RSpec):
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/2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/2 http://www.protogeni.net/resources/rspec/2/%(rspec_type)s.xsd"/>'
+ template = '<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/2 http://www.protogeni.net/resources/rspec/2/%(rspec_type)s.xsd" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" />'
def __init__(self, rspec="", namespaces={}, type=None):
if not type:
self.template = self.template % {'rspec_type': rspec_type}
if not namespaces:
- self.namespaces = {'rspecv2': self.version['namespace']}
+ self.namespaces = {'rspecv2': self.version['namespace'],
+ 'flack': 'http://www.protogeni.net/resources/rspec/ext/flack/1' }
+
else:
self.namespaces = namespaces
return set(networks)
def get_node_element(self, hostname, network=None):
- nodes = self.xml.xpath('//rspecv2:node[@component_id[contains(., "%s")]]' % hostname, namespaces=self.namespaces)
+ nodes = self.xml.xpath('//rspecv2:node[@component_id[contains(., "%s")]] | node[@component_id[contains(., "%s")]]' % (hostname, hostname), namespaces=self.namespaces)
if isinstance(nodes,list) and nodes:
return nodes[0]
else:
def get_slice_attributes(self, network=None):
slice_attributes = []
nodes_with_slivers = self.get_nodes_with_slivers(network)
- from sfa.util.sfalogging import logger
# TODO: default sliver attributes in the PG rspec?
default_ns_prefix = self.namespaces['rspecv2']
for node in nodes_with_slivers:
value=str(sliver_attribute[1])
# we currently only suppor the <initscript> and <flack> attributes
if 'info' in name:
- value = ",".join(["%s=%s" %(a,b) for (a,b) in sliver_attribute[2].items()])
- attribute = {'name': 'flack_info', 'value': value, 'node_id': node}
+ attribute = {'name': 'flack_info', 'value': str(sliver_attribute[2]), 'node_id': node}
slice_attributes.append(attribute)
elif 'initscript' in name:
attribute = {'name': 'initscript', 'value': value, 'node_id': node}
# all nodes hould already be present in the rspec. Remove all
# nodes that done have slivers
slivers = self._process_slivers(slivers)
- sliver_hosts = [sliver['hostname'] for sliver in slivers]
+ slivers_dict = {}
+ for sliver in slivers:
+ slivers_dict[sliver['hostname']] = sliver
nodes = self.get_node_elements()
for node in nodes:
urn = node.get('component_id')
hostname = xrn_to_hostname(urn)
- if hostname not in sliver_hosts:
+ if hostname not in slivers_dict:
parent = node.getparent()
parent.remove(node)
else:
+ sliver_info = slivers_dict[hostname]
node.set('client_id', hostname)
if sliver_urn:
- node.set('sliver_id', sliver_urn)
+ slice_id = sliver_info.get('slice_id', -1)
+ node_id = sliver_info.get('node_id', -1)
+ sliver_id = urn_to_sliver_id(sliver_urn, slice_id, node_id)
+ node.set('sliver_id', sliver_id)
+ sliver_elem = node.xpath('//rspecv2:sliver_type | //sliver_type', namespaces=self.namespaces)
+ if sliver_elem and isinstance(sliver_elem, list):
+ sliver_elem = sliver_elem[0]
+ for tag in sliver_info['tags']:
+ if tag['tagname'] == 'flack_info':
+ e = etree.SubElement(sliver_elem, '{%s}info' % self.namespaces['flack'], attrib=eval(tag['value']))
+
def add_default_sliver_attribute(self, name, value, network=None):
pass