From: Thierry Parmentelat Date: Tue, 8 Nov 2011 00:08:48 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa X-Git-Tag: sfa-2.1-24~36^2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=22629101f0eb055bbe3933937c5b342c3c8fc10b;hp=53826738357e5adf0a199373e34bfb7800f90e1f;p=sfa.git Merge branch 'master' of ssh://git.onelab.eu/git/sfa --- diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py index 654a84f0..abd118f8 100644 --- a/sfa/plc/aggregate.py +++ b/sfa/plc/aggregate.py @@ -1,11 +1,14 @@ #!/usr/bin/python from sfa.util.xrn import hrn_to_urn, urn_to_hrn -from sfa.util.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename +from sfa.util.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename, urn_to_sliver_id from sfa.rspecs.rspec import RSpec +from sfa.rspecs.elements.hardware_type import HardwareType from sfa.rspecs.elements.link import Link +from sfa.rspecs.elements.login import Login from sfa.rspecs.elements.interface import Interface - +from sfa.rspecs.elements.services import Services +from sfa.rspecs.elements.pltag import PLTag from sfa.util.topology import Topology from sfa.rspecs.version_manager import VersionManager from sfa.plc.vlink import get_tc_rate @@ -13,13 +16,6 @@ from sfa.plc.vlink import get_tc_rate class Aggregate: api = None - sites = {} - nodes = {} - interfaces = {} - links = {} - node_tags = {} - pl_initscripts = {} - prepared=False #panos new user options variable user_options = {} @@ -27,198 +23,204 @@ class Aggregate: self.api = api self.user_options = user_options - def prepare_sites(self, filter={}, force=False): - if not self.sites or force: - for site in self.api.driver.GetSites(filter): - self.sites[site['site_id']] = site - - def prepare_nodes(self, filter={}, force=False): - if not self.nodes or force: - filter.update({'peer_id': None}) - nodes = self.api.driver.GetNodes(filter) - site_ids = [] - interface_ids = [] - tag_ids = [] - for node in nodes: - site_ids.append(node['site_id']) - interface_ids.extend(node['interface_ids']) - tag_ids.extend(node['node_tag_ids']) - self.prepare_sites({'site_id': site_ids}) - self.prepare_interfaces({'interface_id': interface_ids}) - self.prepare_node_tags({'node_tag_id': tag_ids}) - for node in nodes: - # add site/interface info to nodes. - # assumes that sites, interfaces and tags have already been prepared. - site = self.sites[node['site_id']] - interfaces = [self.interfaces[interface_id] for interface_id in node['interface_ids']] - tags = [self.node_tags[tag_id] for tag_id in node['node_tag_ids']] - node['network'] = self.api.hrn - node['network_urn'] = hrn_to_urn(self.api.hrn, 'authority+am') - node['urn'] = hostname_to_urn(self.api.hrn, site['login_base'], node['hostname']) - node['site_urn'] = hrn_to_urn(PlXrn.site_hrn(self.api.hrn, site['login_base']), 'authority+sa') - node['site'] = site - node['interfaces'] = interfaces - node['tags'] = tags - self.nodes[node['node_id']] = node - - def prepare_interfaces(self, filter={}, force=False): - if not self.interfaces or force: - for interface in self.api.driver.GetInterfaces(filter): - self.interfaces[interface['interface_id']] = interface - - def prepare_links(self, filter={}, force=False): - # we're aobut to deprecate sfa_aggregate_type, need to get this right - # with the generic framework - if not self.links or force: - if not self.api.config.SFA_AGGREGATE_TYPE.lower() == 'vini': - return - - topology = Topology() - for (site_id1, site_id2) in topology: - link = Link() - if not site_id1 in self.sites or site_id2 not in self.sites: + def get_sites(self, filter={}): + sites = {} + for site in self.api.driver.GetSites(filter): + sites[site['site_id']] = site + return sites + + def get_interfaces(self, filter={}): + interfaces = {} + for interface in self.api.driver.GetInterfaces(filter): + iface = Interface() + iface['interface_id'] = interface['interface_id'] + iface['node_id'] = interface['node_id'] + iface['ipv4'] = interface['ip'] + iface['bwlimit'] = interface['bwlimit'] + interfaces[iface['interface_id']] = iface + return interfaces + + def get_links(self, filter={}): + + if not self.api.config.SFA_AGGREGATE_TYPE.lower() == 'vini': + return + + topology = Topology() + links = {} + for (site_id1, site_id2) in topology: + link = Link() + if not site_id1 in self.sites or site_id2 not in self.sites: + continue + site1 = self.sites[site_id1] + site2 = self.sites[site_id2] + # get hrns + site1_hrn = self.api.hrn + '.' + site1['login_base'] + site2_hrn = self.api.hrn + '.' + site2['login_base'] + # get the first node + node1 = self.nodes[site1['node_ids'][0]] + node2 = self.nodes[site2['node_ids'][0]] + + # set interfaces + # just get first interface of the first node + if1_xrn = PlXrn(auth=self.api.hrn, interface='node%s:eth0' % (node1['node_id'])) + if1_ipv4 = self.interfaces[node1['interface_ids'][0]]['ip'] + if2_xrn = PlXrn(auth=self.api.hrn, interface='node%s:eth0' % (node2['node_id'])) + if2_ipv4 = self.interfaces[node2['interface_ids'][0]]['ip'] + + if1 = Interface({'component_id': if1_xrn.urn, 'ipv4': if1_ipv4} ) + if2 = Interface({'component_id': if2_xrn.urn, 'ipv4': if2_ipv4} ) + + # set link + link = Link({'capacity': '1000000', 'latency': '0', 'packet_loss': '0', 'type': 'ipv4'}) + link['interface1'] = if1 + link['interface2'] = if2 + link['component_name'] = "%s:%s" % (site1['login_base'], site2['login_base']) + link['component_id'] = PlXrn(auth=self.api.hrn, interface=link['component_name']).get_urn() + link['component_manager_id'] = hrn_to_urn(self.api.hrn, 'authority+am') + links[link['component_name']] = link + + return links + + def get_node_tags(self, filter={}): + node_tags = {} + for node_tag in self.api.driver.GetNodeTags(filter): + node_tags[node_tag['node_tag_id']] = node_tag + return node_tags + + def get_pl_initscripts(self, filter={}): + pl_initscripts = {} + filter.update({'enabled': True}) + for initscript in self.api.driver.GetInitScripts(filter): + pl_initscripts[initscript['initscript_id']] = initscript + return pl_initscripts + + + def get_slice_and_slivers(self, slice_xrn): + """ + Returns a dict of slivers keyed on the sliver's node_id + """ + slivers = {} + slice = None + if not slice_xrn: + return (slice, slivers) + slice_urn = hrn_to_urn(slice_xrn) + slice_hrn, _ = urn_to_hrn(slice_xrn) + slice_name = hrn_to_pl_slicename(slice_hrn) + slices = self.api.driver.GetSlices(slice_name) + if not slices: + return (slice, slivers) + slice = slices[0] + + # sort slivers by node id + for node_id in slice['node_ids']: + sliver = Sliver({'sliver_id': urn_to_sliver_id(slice_urn, slice['slice_id'], node_id), + 'name': 'plab-vserver', + 'tags': []}) + slivers[node_id]= sliver + + # sort sliver attributes by node id + tags = self.api.driver.GetSliceTags({'slice_tag_id': slice['slice_tag_ids']}) + for tag in tags: + # most likely a default/global sliver attribute (node_id == None) + if tag['node_id'] not in slivers: + sliver = Sliver({'sliver_id': urn_to_sliver_id(slice_urn, slice['slice_id'], ""), + 'name': 'plab-vserver', + 'tags': []}) + slivers[tag['node_id']] = sliver + slivers[tag['node_id']]['tags'].append(tag) + + return (slice, slivers) + + def get_nodes(self, slice=None): + filter = {} + if slice and 'node_ids' in slice and slice['node_ids']: + filter['node_id'] = slice['node_ids'] + + filter.update({'peer_id': None}) + nodes = self.api.driver.GetNodes(filter) + + site_ids = [] + interface_ids = [] + tag_ids = [] + for node in nodes: + site_ids.append(node['site_id']) + interface_ids.extend(node['interface_ids']) + tag_ids.extend(node['node_tag_ids']) + + # get sites + sites_dict = self.get_sites({'site_id': site_ids}) + # get interfaces + interfaces = self.get_interfaces({'interface_id':interface_ids}) + # get slivers + slivers = self.get_slivers(slice) + # get tags + node_tags = self.get_node_tags({'node_id': node_ids}) + # get initscripts + pl_initscripts = self.get_pl_initscripts() + + rspec_nodes = [] + for node in nodes: + # skip whitelisted nodes + if node['slice_ids_whitelist']: + if not slice or slice['slice_id'] not in node['slice_ids_whitelist']: continue - site1 = self.sites[site_id1] - site2 = self.sites[site_id2] - # get hrns - site1_hrn = self.api.hrn + '.' + site1['login_base'] - site2_hrn = self.api.hrn + '.' + site2['login_base'] - # get the first node - node1 = self.nodes[site1['node_ids'][0]] - node2 = self.nodes[site2['node_ids'][0]] - - # set interfaces - # just get first interface of the first node - if1_xrn = PlXrn(auth=self.api.hrn, interface='node%s:eth0' % (node1['node_id'])) - if1_ipv4 = self.interfaces[node1['interface_ids'][0]]['ip'] - if2_xrn = PlXrn(auth=self.api.hrn, interface='node%s:eth0' % (node2['node_id'])) - if2_ipv4 = self.interfaces[node2['interface_ids'][0]]['ip'] - - if1 = Interface({'component_id': if1_xrn.urn, 'ipv4': if1_ipv4} ) - if2 = Interface({'component_id': if2_xrn.urn, 'ipv4': if2_ipv4} ) - - # set link - link = Link({'capacity': '1000000', 'latency': '0', 'packet_loss': '0', 'type': 'ipv4'}) - link['interface1'] = if1 - link['interface2'] = if2 - link['component_name'] = "%s:%s" % (site1['login_base'], site2['login_base']) - link['component_id'] = PlXrn(auth=self.api.hrn, interface=link['component_name']).get_urn() - link['component_manager_id'] = hrn_to_urn(self.api.hrn, 'authority+am') - self.links[link['component_name']] = link - - - def prepare_node_tags(self, filter={}, force=False): - if not self.node_tags or force: - for node_tag in self.api.driver.GetNodeTags(filter): - self.node_tags[node_tag['node_tag_id']] = node_tag - - def prepare_pl_initscripts(self, filter={}, force=False): - if not self.pl_initscripts or force: - filter.update({'enabled': True}) - for initscript in self.api.driver.GetInitScripts(filter): - self.pl_initscripts[initscript['initscript_id']] = initscript - - def prepare(self, slice = None, force=False): - if not self.prepared or force or slice: - if not slice: - self.prepare_sites(force=force) - self.prepare_interfaces(force=force) - self.prepare_node_tags(force=force) - self.prepare_nodes(force=force) - self.prepare_links(force=force) - self.prepare_pl_initscripts(force=force) - else: - self.prepare_sites({'site_id': slice['site_id']}) - self.prepare_interfaces({'node_id': slice['node_ids']}) - self.prepare_node_tags({'node_id': slice['node_ids']}) - self.prepare_nodes({'node_id': slice['node_ids']}) - self.prepare_links({'slice_id': slice['slice_id']}) - self.prepare_pl_initscripts() - self.prepared = True - + rspec_node = Node() + rspec_node['component_id'] = hostname_to_urn(self.api.hrn, site['login_base'], node['hostname']) + rspec_node['component_name'] = node['hostname'] + rspec_node['component_manager_id'] = self.api.hrn + rspec_node['authority_id'] = hrn_to_urn(PlXrn.site_hrn(self.api.hrn, site['login_base']), 'authority+sa') + rspec_node['boot_state'] = node['boot_state'] + rspec_node['exclusive'] = 'False' + rspec_node['hardware_types'].append(HardwareType({'name': 'plab-vserver'})) + # only doing this because protogeni rspec needs + # to advertise available initscripts + rspec_node['pl_initscripts'] = pl_initscripts + # add site/interface info to nodes. + # assumes that sites, interfaces and tags have already been prepared. + site = sites_dict[node['site_id']] + location = Location({'longitude': site['longitude'], 'latitude': site['latitude']}) + rspec_node['location'] = location + rspec_node['interfaces'] = [] + for if_id in node['interface_ids']: + interface = Interface(interfaces[if_id]) + interface['ipv4'] = interface['ip'] + rspec_node['interfaces'].append(interface) + tags = [PLTag(node_tags[tag_id]) for tag_id in node['node_tag_ids']] + rspec_node['tags'] = tags + if node['node_id'] in slivers: + # add sliver info + sliver = slivers[node['node_id']] + rspec_node['sliver_id'] = sliver['sliver_id'] + rspec_node['client_id'] = node['hostname'] + rspec_node['slivers'] = [slivers[node['node_id']]] + + # slivers always provide the ssh service + login = Login({'authentication': 'ssh-keys', 'hostname': node['hostname'], port:'22'}) + service = Services({'login': login}) + rspec_node['services'].append(service) + rspec_nodes.append(rspec_node) + return rspec_nodes + + def get_rspec(self, slice_xrn=None, version = None): + version_manager = VersionManager() version = version_manager.get_version(version) if not slice_xrn: rspec_version = version_manager._get_version(version.type, version.version, 'ad') else: rspec_version = version_manager._get_version(version.type, version.version, 'manifest') - - rspec = RSpec(version=rspec_version, user_options=self.user_options) - # get slice details if specified - slice = None - if slice_xrn: - slice_hrn, _ = urn_to_hrn(slice_xrn) - slice_name = hrn_to_pl_slicename(slice_hrn) - slices = self.api.driver.GetSlices(slice_name) - if slices: - slice = slices[0] - self.prepare(slice=slice) - else: - self.prepare() - - # filter out nodes with a whitelist: - valid_nodes = [] - for node in self.nodes.values(): - # only doing this because protogeni rspec needs - # to advertise available initscripts - node['pl_initscripts'] = self.pl_initscripts - - if slice and node['node_id'] in slice['node_ids']: - valid_nodes.append(node) - elif slice and slice['slice_id'] in node['slice_ids_whitelist']: - valid_nodes.append(node) - elif not slice and not node['slice_ids_whitelist']: - valid_nodes.append(node) - - rspec.version.add_nodes(valid_nodes) - rspec.version.add_interfaces(self.interfaces.values()) - rspec.version.add_links(self.links.values()) - - # add slivers - if slice_xrn and slice: - slivers = [] - tags = self.api.driver.GetSliceTags(slice['slice_tag_ids']) - - # add default tags - for tag in tags: - # if tag isn't bound to a node then it applies to all slivers - # and belongs in the tag - if not tag['node_id']: - rspec.version.add_default_sliver_attribute(tag['tagname'], tag['value'], self.api.hrn) - if tag['tagname'] == 'topo_rspec' and tag['node_id']: - node = self.nodes[tag['node_id']] - value = eval(tag['value']) - for (id, realip, bw, lvip, rvip, vnet) in value: - bps = get_tc_rate(bw) - remote = self.nodes[id] - site1 = self.sites[node['site_id']] - site2 = self.sites[remote['site_id']] - link1_name = '%s:%s' % (site1['login_base'], site2['login_base']) - link2_name = '%s:%s' % (site2['login_base'], site1['login_base']) - p_link = None - if link1_name in self.links: - link = self.links[link1_name] - elif link2_name in self.links: - link = self.links[link2_name] - v_link = Link() - - link.capacity = bps - for node_id in slice['node_ids']: - try: - sliver = {} - sliver['hostname'] = self.nodes[node_id]['hostname'] - sliver['node_id'] = node_id - sliver['slice_id'] = slice['slice_id'] - sliver['tags'] = [] - slivers.append(sliver) - - # add tags for this node only - for tag in tags: - if tag['node_id'] and (tag['node_id'] == node_id): - sliver['tags'].append(tag) - except: - self.api.logger.log_exc('unable to add sliver %s to node %s' % (slice['name'], node_id)) - rspec.version.add_slivers(slivers, sliver_urn=slice_xrn) + slice, slivers = self.get_slice_and_slivers(slice_xrn) + rspec = RSpec(version=rspec_version, user_options=self.user_options) + rspec.version.add_nodes(self.get_nodes(slice, slivers)) + rspec.version.add_links(self.get_links(slice)) + + # add sliver defaults + default_sliver_attribs = slivers.get(None, []) + for sliver_attrib in default_sliver_attribs: + rspec.version.add_default_sliver_attribute(sliver_attrib['name'], sliver_attrib['value']) + return rspec.toxml() + + diff --git a/sfa/rspecs/elements/node.py b/sfa/rspecs/elements/node.py index a2e11cd5..f90fff1b 100644 --- a/sfa/rspecs/elements/node.py +++ b/sfa/rspecs/elements/node.py @@ -6,6 +6,8 @@ class Node(Element): 'component_id': None, 'component_name': None, 'component_manager_id': None, + 'client_id': None, + 'sliver_id': None, 'authority_id': None, 'exclusive': None, 'location': None, @@ -13,10 +15,12 @@ class Node(Element): 'bw_limit': None, 'boot_state': None, 'slivers': [], - 'hardware_type': [], - 'disk_image': [], + 'hardware_types': [], + 'disk_images': [], 'interfaces': [], + 'services': [], 'tags': [], + 'pl_initscripts': [], } diff --git a/sfa/rspecs/elements/sliver.py b/sfa/rspecs/elements/sliver.py index febb0681..bf2cc1f7 100644 --- a/sfa/rspecs/elements/sliver.py +++ b/sfa/rspecs/elements/sliver.py @@ -2,8 +2,8 @@ from sfa.rspecs.elements.element import Element class Sliver(Element): fields = { + 'sliver_id': None, + 'client_id': None, 'name': None, 'tags': [], - 'slice_id': None, - } diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py index e69de29b..4ddafc1f 100644 --- a/sfa/rspecs/elements/versions/pgv2Node.py +++ b/sfa/rspecs/elements/versions/pgv2Node.py @@ -0,0 +1,146 @@ + +from lxml import etree +from sfa.util.plxrn import PlXrn +from sfa.util.xrn import Xrn +from sfa.rspecs.elements.node import Node +from sfa.rspecs.elements.sliver import Sliver +from sfa.rspecs.elements.network import Network +from sfa.rspecs.elements.location import Location +from sfa.rspecs.elements.hardware_type import HardwareType +from sfa.rspecs.elements.disk_image import DiskImage +from sfa.rspecs.elements.interface import Interface +from sfa.rspecs.elements.bwlimit import BWlimit +from sfa.rspecs.elements.pl_tag import PLTag +from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements +from sfa.rspecs.elements.versions.pgv2Service import PGv2Service + +class PGv2Node: + elements = { + 'node': RSpecElement(RSpecElements.NODE, '//default:node | //node'), + 'sliver': RSpecElement(RSpecElements.SLIVER, './default:sliver_type | ./sliver_type'), + 'interface': RSpecElement(RSpecElements.INTERFACE, './default:interface | ./interface'), + 'location': RSpecElement(RSpecElements.LOCATION, './default:location | ./location'), + 'hardware_type': RSpecElement(RSpecElements.HARDWARE_TYPE, './default:hardware_type | ./hardware_type'), + 'available': RSpecElement(RSpecElements.AVAILABLE, './default:available | ./available'), + } + + @staticmethod + def add_nodes(xml, nodes): + node_elems = [] + for node in nodes: + node_elem = etree.SubElement(xml, 'node') + node_elems.append(node_elem) + if node.get('component_manager_id'): + node_elem.set('component_manager_id', node['component_manager_id']) + if node.get('component_id'): + node_elem.set('component_id', node['component_id']) + component_name = Xrn(node['component_id']).get_leaf() + node_elem.set('component_nama', component_name) + if node.get('client_id'): + node_elem.set('client_id', node['client_id']) + if node.get('sliver_id'): + node_elem.set('sliver_id', node['sliver_id']) + if node.get('exclusive'): + node_elem.set('exclusive', node['exclusive']) + hardware_types = node.get('hardware_type', []) + for hardware_type in hardware_types: + hw_type_elem = etree.SubElement(node_elem, 'hardware_type') + if hardware_type.get('name'): + hw_type_elem.set('name', hardware_type['name']) + if node.get('boot_state', '').lower() == 'boot': + available_elem = etree.SubElement(node_elem, 'available', now='True') + else: + available_elem = etree.SubElement(node_elem, 'available', now='False') + + if node.get('services'): + PGv2Services.add_services(node_elem, node.get('services')) + + slivers = node.get('slivers', []) + pl_initscripts = node.get('pl_initscripts', {}) + for sliver in slivers: + sliver_elem = etree.SubElement(node_elem, 'sliver_type') + if sliver.get('name'): + sliver_elem.set('name', sliver['name']) + if sliver.get('client_id'): + sliver_elem.set('client_id', sliver['client_id']) + for pl_initscript in pl_initscripts.values(): + etree.SubElement(sliver_elem, '{%s}initscript' % xml.namespaces['planetlab'], \ + name=pl_initscript['name']) + location = node.get('location') + #only add locaiton if long and lat are not null + if location.get('longitute') and location.get('latitude'): + location_elem = etree.SubElement(node_elem, country=location['country'], + latitude=location['latitude'], longitude=location['longiutde']) + return node_elems + + @staticmethod + def get_nodes(xml): + nodes = [] + node_elems = xml.xpath(PGv2Node.elements['node'].path) + for node_elem in node_elems: + node = Node(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() + + # set hardware type + node['hardware_types'] = [] + hardware_type_elems = node_elem.xpath(PGv2Node.elements['hardware_type'].path, xml.namespaces) + for hardware_type_elem in hardware_type_elems: + node['hardware_types'].append(HardwareType(hardware_type_elem.attrib, hardware_type_elem)) + + # set location + location_elems = node_elem.xpath(PGv2Node.elements['location'].path, xml.namespaces) + if len(location_elems) > 0: + node['location'] = Location(location_elems[0].attrib, location_elems[0]) + + # set services + services_elems = node_elem.xpath(PGv2Service.elements['services'].path, xml.namespaces) + node['services'] = [] + for services_elem in services_elems: + # services element has no useful info, but the child elements do + for child in services_elem.iterchildren(): + + # set interfaces + interface_elems = node_elem.xpath(PGv2Node.elements['interface'].path, xml.namespaces) + node['interfaces'] = [] + for interface_elem in interface_elems: + node['interfaces'].append(Interface(interface_elem.attrib, interface_elem)) + + # set available + available = node_elem.xpath(PGv2Node.elements['available'].path, xml.namespaces) + if len(available) > 0: + if available[0].attrib.get('now', '').lower() == 'true': + node['boot_state'] = 'boot' + else: + node['boot_state'] = 'disabled' + + # set the slivers + sliver_elems = node_elem.xpath(PGv2Node.elements['sliver'].path, xml.namespaces) + node['slivers'] = [] + for sliver_elem in sliver_elems: + node['slivers'].append(Sliver(sliver_elem.attrib, sliver_elem)) + + return nodes + + + @staticmethod + def add_slivers(xml, slivers): + pass + + @staticmethod + def get_nodes_with_slivers(xml): + nodes = PGv2Node.get_nodes(xml) + nodes_with_slivers = [node for node in nodes if node['slivers']] + return nodes_with_slivers + +if __name__ == '__main__': + from sfa.rspecs.rspec import RSpec + import pdb + r = RSpec('/tmp/emulab.rspec') + r2 = RSpec(version = 'ProtoGENI') + nodes = PGv2Node.get_nodes(r.xml) + PGv2Node.add_nodes(r2.xml.root, nodes) + #pdb.set_trace() + + diff --git a/sfa/rspecs/elements/versions/pgv2Services.py b/sfa/rspecs/elements/versions/pgv2Services.py index 741fbac0..470a2e65 100644 --- a/sfa/rspecs/elements/versions/pgv2Services.py +++ b/sfa/rspecs/elements/versions/pgv2Services.py @@ -10,8 +10,8 @@ class PGv2Services: elements = { 'services': RSpecElement(RSpecElements.SERVICES, '//default:services | //services'), 'install': RSpecElement(RspecElements.INSTALL, './default:install | ./install'), - 'execute': RSpecElement(RspecElements.INSTALL, './default:execute | ./execute'), - 'login': RSpecElement(RspecElements.INSTALL, './default:login | ./login'), + 'execute': RSpecElement(RspecElements.EXECUTE, './default:execute | ./execute'), + 'login': RSpecElement(RspecElements.LOGIN, './default:login | ./login'), } @staticmethod diff --git a/sfa/rspecs/elements/versions/sfav1Node.py b/sfa/rspecs/elements/versions/sfav1Node.py index b8fe27ef..6cdf9954 100644 --- a/sfa/rspecs/elements/versions/sfav1Node.py +++ b/sfa/rspecs/elements/versions/sfav1Node.py @@ -13,6 +13,7 @@ from sfa.rspecs.elements.bwlimit import BWlimit from sfa.rspecs.elements.pl_tag import PLTag from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements from sfa.rspecs.elements.versions.sfav1Network import SFAv1Network +from sfa.rspecs.elements.versions.pgv2Services import PGv2Services class SFAv1Node: @@ -55,7 +56,6 @@ class SFAv1Node: for field in Location.fields: if field in node['location'] and node['location'][field]: location_elem.set(field, node['location'][field]) - if 'interfaces' in node and node['interfaces']: i = 0 for interface in node['interfaces']: @@ -68,17 +68,23 @@ class SFAv1Node: if 'bw_unallocated' in node and node['bw_unallocated']: bw_unallocated = etree.SubElement(node_elem, 'bw_unallocated', units='kbps').text = str(int(node['bw_unallocated'])/1000) + if node.get('services'): + PGv2Services.add_services(node_elem, node.get('services')) + if 'tags' in node: for tag in node['tags']: # expose this hard wired list of tags, plus the ones that are marked 'sfa' in their category if tag['name'] in ['fcdistro', 'arch']: tag_element = etree.SubElement(node_elem, tag['name']).text=tag['value'] - if 'slivers' in node: + if node.get('slivers'): for sliver in node['slivers']: sliver_elem = etree.SubElement(node_elem, 'sliver') - if 'name' in sliver and sliver['name']: - sliver_elem.set('name', sliver['name']) + if sliver.get('sliver_id'): + sliver_id_leaf = Xrn(sliver.get('sliver_id')).get_leaf() + sliver_id_parts = sliver_id_leaf.split(':') + name = sliver_id_parts[0] + sliver_elem.set('name', name) @staticmethod def add_slivers(xml, slivers): @@ -92,7 +98,9 @@ class SFAv1Node: node = Node(node_elem.attrib, node_elem) if 'site_id' in node_elem.attrib: node['authority_id'] = node_elem.attrib['site_id'] - + if 'authority_id' in node_elem.attrib: + node['authority_id'] = node_elem.attrib['authority_id'] + # set the location location_elems = node_elem.xpath(SFAv1Node.elements['location'].path, xml.namespaces) if len(location_elems) > 0: diff --git a/sfa/rspecs/elements/versions/sfav1Sliver.py b/sfa/rspecs/elements/versions/sfav1Sliver.py index e69de29b..f12c9776 100644 --- a/sfa/rspecs/elements/versions/sfav1Sliver.py +++ b/sfa/rspecs/elements/versions/sfav1Sliver.py @@ -0,0 +1,18 @@ + +from lxml import etree + +from sfa.rspecs.elements.sliver import Sliver + +from sfa.util.xrn import Xrn +from sfa.util.plxrn import PlXrn +class SFAv1Sliver: + + @staticmethod + def add_slivers(xml, slivers): + for sliver in slivers: + sliver_elem = etree.SubElement(xml, 'sliver') + if sliver.get('component_id'): + name_full = Xrn(sliver.get('component_id')).get_leaf() + name = name_full.split(':') + sliver_elem.set('name', name) + diff --git a/sfa/rspecs/rspec_elements.py b/sfa/rspecs/rspec_elements.py index 096412e0..ce3cac76 100644 --- a/sfa/rspecs/rspec_elements.py +++ b/sfa/rspecs/rspec_elements.py @@ -2,10 +2,12 @@ from sfa.util.enumeration import Enum # recognized top level rspec elements RSpecElements = Enum( + AVAILABLE='AVAILABLE', BWLIMIT='BWLIMIT', EXECUTE='EXECUTE', NETWORK='NETWORK', COMPONENT_MANAGER='COMPONENT_MANAGER', + HARDWARE_TYPE='HARDWARE_TYPE', INSTALL='INSTALL', INTERFACE='INTERFACE', INTERFACE_REF='INTERFACE_REF', diff --git a/sfa/util/xml.py b/sfa/util/xml.py index 81110506..ddb06e4f 100755 --- a/sfa/util/xml.py +++ b/sfa/util/xml.py @@ -60,10 +60,10 @@ class XML: # it hard for us to write xpath queries for the default naemspace because lxml # wont understand a None prefix. We will just associate the default namespeace # with a key named 'default'. - self.namespaces['default'] = self.namespaces[None] + self.namespaces['default'] = self.namespaces.pop(None) + else: self.namespaces['default'] = 'default' - # set schema for key in self.root.attrib.keys(): if key.endswith('schemaLocation'):