-from sfa.util.xrn import Xrn
+from sfa.util.xrn import Xrn, get_leaf
from sfa.util.xml import XpathFilter
-from sfa.rspecs.elements.node import Node
+from sfa.rspecs.elements.node import NodeElement
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.hardware_type import HardwareType
from sfa.rspecs.elements.interface import Interface
from sfa.rspecs.elements.bwlimit import BWlimit
from sfa.rspecs.elements.pltag import PLTag
-from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
-from sfa.rspecs.elements.versions.pgv2SliverType import PGv2SliverType
-from sfa.rspecs.elements.versions.pgv2Interface import PGv2Interface
+from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
+from sfa.rspecs.elements.versions.pgv2SliverType import PGv2SliverType
+from sfa.rspecs.elements.versions.pgv2Interface import PGv2Interface
+from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
+from sfa.rspecs.elements.granularity import Granularity
+from sfa.rspecs.elements.attribute import Attribute
-from sfa.planetlab.plxrn import xrn_to_hostname
class PGv2Node:
+
@staticmethod
- def add_nodes(xml, nodes):
+ def add_nodes(xml, nodes, rspec_content_type=None):
node_elems = []
for node in nodes:
- node_fields = ['component_manager_id', 'component_id', 'client_id', 'sliver_id', 'exclusive']
+ node_fields = ['component_manager_id', 'component_id',
+ 'client_id', 'sliver_id', 'exclusive']
node_elem = xml.add_instance('node', node, node_fields)
node_elems.append(node_elem)
# set component name
if node.get('component_id'):
- component_name = xrn_to_hostname(node['component_id'])
+ component_name = Xrn.unescape(
+ get_leaf(Xrn(node['component_id']).get_hrn()))
node_elem.set('component_name', component_name)
# set hardware types
if node.get('hardware_types'):
- for hardware_type in node.get('hardware_types', []):
- node_elem.add_instance('hardware_type', hardware_type, HardwareType.fields)
+ for hardware_type in node.get('hardware_types', []):
+ node_elem.add_instance(
+ 'hardware_type', hardware_type, HardwareType.fields)
# set location
if node.get('location'):
- node_elem.add_instance('location', node['location'], Location.fields)
+ node_elem.add_instance(
+ 'location', node['location'], Location.fields)
+
+ # set granularity
+ if node.get('exclusive') == "true":
+ granularity = node.get('granularity')
+ node_elem.add_instance(
+ 'granularity', granularity, granularity.fields)
# set interfaces
PGv2Interface.add_interfaces(node_elem, node.get('interfaces'))
- #if node.get('interfaces'):
+ # if node.get('interfaces'):
# for interface in node.get('interfaces', []):
# node_elem.add_instance('interface', interface, ['component_id', 'client_id'])
# set available element
- if node.get('boot_state'):
- if node.get('boot_state').lower() == 'boot':
- available_elem = node_elem.add_element('available', now='true')
- else:
- available_elem = node_elem.add_element('available', now='false')
+ if node.get('available'):
+ available_elem = node_elem.add_element(
+ 'available', now=node['available'])
# add services
- PGv2Services.add_services(node_elem, node.get('services', []))
+ PGv2Services.add_services(node_elem, node.get('services', []))
# add slivers
slivers = node.get('slivers', [])
if not slivers:
# we must still advertise the available sliver types
- slivers = Sliver({'type': 'plab-vserver'})
+ if node.get('sliver_type'):
+ slivers = Sliver({'type': node['sliver_type']})
+ else:
+ # Planet lab
+ slivers = Sliver({'type': 'plab-vserver'})
# we must also advertise the available initscripts
slivers['tags'] = []
- if node.get('pl_initscripts'):
+ if node.get('pl_initscripts'):
for initscript in node.get('pl_initscripts', []):
- slivers['tags'].append({'name': 'initscript', 'value': initscript['name']})
+ slivers['tags'].append(
+ {'name': 'initscript', 'value': initscript['name']})
PGv2SliverType.add_slivers(node_elem, slivers)
+
+ # advertise the node tags
+ tags = node.get('tags', [])
+ if tags:
+ for tag in tags:
+ tag['name'] = tag.pop('tagname')
+ node_elem.add_instance('{%s}attribute' % xml.namespaces[
+ 'planetlab'], tag, ['name', 'value'])
+
+ # add sliver tag in Request Rspec
+ # if rspec_content_type == "request":
+ # node_elem.add_instance('sliver', '', [])
+
return node_elems
@staticmethod
- def get_nodes(xml, filter={}):
- xpath = '//node%s | //default:node%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter))
+ def get_nodes(xml, filter=None):
+ if filter is None:
+ filter = {}
+ xpath = '//node%s | //default:node%s' % (
+ XpathFilter.xpath(filter), XpathFilter.xpath(filter))
node_elems = xml.xpath(xpath)
return PGv2Node.get_node_objs(node_elems)
@staticmethod
- def get_nodes_with_slivers(xml, filter={}):
- xpath = '//node[count(sliver_type)>0] | //default:node[count(default:sliver_type) > 0]'
- node_elems = xml.xpath(xpath)
+ def get_nodes_with_slivers(xml, filter=None):
+ if filter is None:
+ filter = {}
+ xpath = '//node[count(sliver_type)>0] | //default:node[count(default:sliver_type) > 0]'
+ node_elems = xml.xpath(xpath)
return PGv2Node.get_node_objs(node_elems)
@staticmethod
def get_node_objs(node_elems):
nodes = []
for node_elem in node_elems:
- node = Node(node_elem.attrib, node_elem)
- nodes.append(node)
+ node = NodeElement(node_elem.attrib, node_elem)
+ nodes.append(node)
if 'component_id' in node_elem.attrib:
- node['authority_id'] = Xrn(node_elem.attrib['component_id']).get_authority_urn()
-
+ node['authority_id'] = Xrn(
+ node_elem.attrib['component_id']).get_authority_urn()
+
# get hardware types
- hardware_type_elems = node_elem.xpath('./default:hardware_type | ./hardware_type')
- node['hardware_types'] = [hw_type.get_instance(HardwareType) for hw_type in hardware_type_elems]
-
+ hardware_type_elems = node_elem.xpath(
+ './default:hardware_type | ./hardware_type')
+ node['hardware_types'] = [dict(hw_type.get_instance(
+ HardwareType)) for hw_type in hardware_type_elems]
+
# get location
location_elems = node_elem.xpath('./default:location | ./location')
- locations = [location_elem.get_instance(Location) for location_elem in location_elems]
+ locations = [dict(location_elem.get_instance(Location))
+ for location_elem in location_elems]
if len(locations) > 0:
node['location'] = locations[0]
+ # get granularity
+ granularity_elems = node_elem.xpath(
+ './default:granularity | ./granularity')
+ if len(granularity_elems) > 0:
+ node['granularity'] = granularity_elems[
+ 0].get_instance(Granularity)
+
# get interfaces
iface_elems = node_elem.xpath('./default:interface | ./interface')
- node['interfaces'] = [iface_elem.get_instance(Interface) for iface_elem in iface_elems]
+ node['interfaces'] = [dict(iface_elem.get_instance(
+ Interface)) for iface_elem in iface_elems]
# get services
node['services'] = PGv2Services.get_services(node_elem)
-
+
# get slivers
- node['slivers'] = PGv2SliverType.get_slivers(node_elem)
- available_elems = node_elem.xpath('./default:available | ./available')
- if len(available_elems) > 0 and 'name' in available_elems[0].attrib:
- if available_elems[0].attrib.get('now', '').lower() == 'true':
+ node['slivers'] = PGv2SliverType.get_slivers(node_elem)
+
+ # get boot state
+ available_elems = node_elem.xpath(
+ './default:available | ./available')
+ if len(available_elems) > 0 and 'now' in available_elems[0].attrib:
+ if available_elems[0].attrib.get('now', '').lower() == 'true':
node['boot_state'] = 'boot'
- else:
- node['boot_state'] = 'disabled'
- return nodes
+ else:
+ node['boot_state'] = 'disabled'
+
+ # get initscripts
+ try:
+ node['pl_initscripts'] = []
+ initscript_elems = node_elem.xpath(
+ './default:sliver_type/planetlab:initscript | ./sliver_type/initscript')
+ if len(initscript_elems) > 0:
+ for initscript_elem in initscript_elems:
+ if 'name' in initscript_elem.attrib:
+ node['pl_initscripts'].append(
+ dict(initscript_elem.attrib))
+ except:
+ pass
+ # get node tags
+ try:
+ tag_elems = node_elem.xpath(
+ './planetlab:attribute | ./attribute')
+ node['tags'] = []
+ if len(tag_elems) > 0:
+ for tag_elem in tag_elems:
+ tag = dict(tag_elem.get_instance(Attribute))
+ tag['tagname'] = tag.pop('name')
+ node['tags'].append(tag)
+ except:
+ pass
+
+ return nodes
@staticmethod
def add_slivers(xml, slivers):
sliver = {}
elif 'component_id' in sliver and sliver['component_id']:
filter['component_id'] = '*%s*' % sliver['component_id']
- if not filter:
+ if not filter:
continue
nodes = PGv2Node.get_nodes(xml, filter)
if not nodes:
@staticmethod
def remove_slivers(xml, hostnames):
for hostname in hostnames:
- nodes = PGv2Node.get_nodes(xml, {'component_id': '*%s*' % hostname})
+ nodes = PGv2Node.get_nodes(
+ xml, {'component_id': '*%s*' % hostname})
for node in nodes:
slivers = PGv2SliverType.get_slivers(node.element)
for sliver in slivers:
- node.element.remove(sliver.element)
+ node.element.remove(sliver.element)
if __name__ == '__main__':
from sfa.rspecs.rspec import RSpec
import pdb
r = RSpec('/tmp/emulab.rspec')
- r2 = RSpec(version = 'ProtoGENI')
+ r2 = RSpec(version='ProtoGENI')
nodes = PGv2Node.get_nodes(r.xml)
PGv2Node.add_nodes(r2.xml.root, nodes)
- #pdb.set_trace()
-
-
+ # pdb.set_trace()
git://git.onelab.eu / sfa.git / blobdiff