X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fnitos%2Fnitosaggregate.py;h=4201a897d3f11371c20a676c6a3fb33642f09dd0;hb=6766a510ba0528c1c880497d4ae5a547cc76844a;hp=2a36fbf08a9865c818a6459c76630bf81a4b2852;hpb=7fcb8153bd74ce00f9f0d43c8aa090e0b70e345f;p=sfa.git diff --git a/sfa/nitos/nitosaggregate.py b/sfa/nitos/nitosaggregate.py index 2a36fbf0..4201a897 100644 --- a/sfa/nitos/nitosaggregate.py +++ b/sfa/nitos/nitosaggregate.py @@ -5,32 +5,31 @@ from sfa.util.sfalogging import logger from sfa.rspecs.rspec import RSpec from sfa.rspecs.elements.hardware_type import HardwareType -from sfa.rspecs.elements.node import Node +from sfa.rspecs.elements.node import NodeElement from sfa.rspecs.elements.link import Link from sfa.rspecs.elements.sliver import Sliver from sfa.rspecs.elements.login import Login from sfa.rspecs.elements.location import Location from sfa.rspecs.elements.position_3d import Position3D from sfa.rspecs.elements.interface import Interface -from sfa.rspecs.elements.services import Services from sfa.rspecs.elements.pltag import PLTag from sfa.rspecs.elements.lease import Lease from sfa.rspecs.elements.granularity import Granularity from sfa.rspecs.elements.channel import Channel from sfa.rspecs.version_manager import VersionManager -from sfa.nitos.nitosxrn import NitosXrn, hostname_to_urn, hrn_to_nitos_slicename, slicename_to_hrn +from sfa.nitos.nitosxrn import NitosXrn, hostname_to_urn, hrn_to_nitos_slicename, slicename_to_hrn, channel_to_urn from sfa.planetlab.vlink import get_tc_rate from sfa.planetlab.topology import Topology import time + class NitosAggregate: def __init__(self, driver): self.driver = driver - def get_slice_and_slivers(self, slice_xrn): """ Returns a dict of slivers keyed on the sliver's node_id @@ -43,35 +42,38 @@ class NitosAggregate: slice_hrn, _ = urn_to_hrn(slice_xrn) slice_name = hrn_to_nitos_slicename(slice_hrn) slices = self.driver.shell.getSlices({'slice_name': slice_name}, []) - #filter results + # filter results for slc in slices: - if slc['slice_name'] == slice_name: - slice = slc - break + if slc['slice_name'] == slice_name: + slice = slc + break if not slice: return (slice, slivers) - - reserved_nodes = self.driver.shell.getReservedNodes({'slice_id': slice['slice_id']}, []) + + reserved_nodes = self.driver.shell.getReservedNodes( + {'slice_id': slice['slice_id']}, []) reserved_node_ids = [] # filter on the slice for node in reserved_nodes: - if node['slice_id'] == slice['slice_id']: - reserved_node_ids.append(node['node_id']) - #get all the nodes + if node['slice_id'] == slice['slice_id']: + reserved_node_ids.append(node['node_id']) + # get all the nodes all_nodes = self.driver.shell.getNodes({}, []) - + for node in all_nodes: - if node['node_id'] in reserved_node_ids: - slivers[node['node_id']] = node - - return (slice, slivers) - + if node['node_id'] in reserved_node_ids: + slivers[node['node_id']] = node + return (slice, slivers) - def get_nodes(self, slice_xrn, slice=None,slivers={}, options={}): - # if we are dealing with a slice that has no node just return - # and empty list + def get_nodes(self, slice_xrn, slice=None, slivers=None, options=None): + if slivers is None: + slivers = {} + if options is None: + options = {} + # if we are dealing with a slice that has no node just return + # and empty list if slice_xrn: if not slice or not slivers: return [] @@ -79,34 +81,38 @@ class NitosAggregate: nodes = [slivers[sliver] for sliver in slivers] else: nodes = self.driver.shell.getNodes({}, []) - + # get the granularity in second for the reservation system grain = self.driver.testbedInfo['grain'] #grain = 1800 - rspec_nodes = [] for node in nodes: - rspec_node = Node() + rspec_node = NodeElement() site_name = self.driver.testbedInfo['name'] - rspec_node['component_id'] = hostname_to_urn(self.driver.hrn, site_name, node['hostname']) + rspec_node['component_id'] = hostname_to_urn( + self.driver.hrn, site_name, node['hostname']) rspec_node['component_name'] = node['hostname'] - rspec_node['component_manager_id'] = Xrn(self.driver.hrn, 'authority+cm').get_urn() - rspec_node['authority_id'] = hrn_to_urn(NitosXrn.site_hrn(self.driver.hrn, site_name), 'authority+sa') + rspec_node['component_manager_id'] = Xrn( + self.driver.hrn, 'authority+cm').get_urn() + rspec_node['authority_id'] = hrn_to_urn( + NitosXrn.site_hrn(self.driver.hrn, site_name), 'authority+sa') # do not include boot state ( element) in the manifest rspec - #if not slice: + # if not slice: # rspec_node['boot_state'] = node['boot_state'] rspec_node['exclusive'] = 'true' # site location longitude = self.driver.testbedInfo['longitude'] - latitude = self.driver.testbedInfo['latitude'] - if longitude and latitude: - location = Location({'longitude': longitude, 'latitude': latitude, 'country': 'unknown'}) + latitude = self.driver.testbedInfo['latitude'] + if longitude and latitude: + location = Location( + {'longitude': longitude, 'latitude': latitude, 'country': 'unknown'}) rspec_node['location'] = location # 3D position - position_3d = Position3D({'x': node['position']['X'], 'y': node['position']['Y'], 'z': node['position']['Z']}) + position_3d = Position3D({'x': node['position']['X'], 'y': node[ + 'position']['Y'], 'z': node['position']['Z']}) #position_3d = Position3D({'x': 1, 'y': 2, 'z': 3}) - rspec_node['position_3d'] = position_3d + rspec_node['position_3d'] = position_3d # Granularity granularity = Granularity({'grain': grain}) rspec_node['granularity'] = granularity @@ -114,8 +120,8 @@ class NitosAggregate: # HardwareType rspec_node['hardware_type'] = node['node_type'] #rspec_node['hardware_type'] = "orbit" - - #slivers + + # slivers if node['node_id'] in slivers: # add sliver info sliver = slivers[node['node_id']] @@ -123,12 +129,13 @@ class NitosAggregate: rspec_node['client_id'] = node['hostname'] rspec_node['slivers'] = [sliver] - rspec_nodes.append(rspec_node) - return rspec_nodes + return rspec_nodes + + def get_leases_and_channels(self, slice=None, slice_xrn=None, options=None): - def get_leases_and_channels(self, slice=None, slice_xrn=None, options={}): - + if options is None: + options = {} slices = self.driver.shell.getSlices({}, []) nodes = self.driver.shell.getNodes({}, []) leases = self.driver.shell.getReservedNodes({}, []) @@ -145,91 +152,98 @@ class NitosAggregate: all_reserved_channels = [] all_reserved_channels.extend(reserved_channels) for lease in all_leases: - if lease['slice_id'] != slice['slice_id']: - leases.remove(lease) + if lease['slice_id'] != slice['slice_id']: + leases.remove(lease) for channel in all_reserved_channels: - if channel['slice_id'] != slice['slice_id']: - reserved_channels.remove(channel) + if channel['slice_id'] != slice['slice_id']: + reserved_channels.remove(channel) rspec_channels = [] for channel in reserved_channels: - + rspec_channel = {} - #retrieve channel number + # retrieve channel number for chl in channels: - if chl['channel_id'] == channel['channel_id']: - channel_number = chl['channel'] - break + if chl['channel_id'] == channel['channel_id']: + channel_number = chl['channel'] + break rspec_channel['channel_num'] = channel_number rspec_channel['start_time'] = channel['start_time'] - rspec_channel['duration'] = (int(channel['end_time']) - int(channel['start_time'])) / int(grain) - + rspec_channel['duration'] = ( + int(channel['end_time']) - int(channel['start_time'])) / int(grain) + rspec_channel['component_id'] = channel_to_urn( + self.driver.hrn, self.driver.testbedInfo['name'], channel_number) + # retreive slicename for slc in slices: - if slc['slice_id'] == channel['slice_id']: - slicename = slc['slice_name'] - break + if slc['slice_id'] == channel['slice_id']: + slicename = slc['slice_name'] + break if slice_xrn: slice_urn = slice_xrn slice_hrn = urn_to_hrn(slice_urn) else: - slice_hrn = slicename_to_hrn(self.driver.hrn, self.driver.testbedInfo['name'], slicename) + slice_hrn = slicename_to_hrn( + self.driver.hrn, self.driver.testbedInfo['name'], slicename) slice_urn = hrn_to_urn(slice_hrn, 'slice') rspec_channel['slice_id'] = slice_urn rspec_channels.append(rspec_channel) - rspec_leases = [] for lease in leases: rspec_lease = Lease() - + rspec_lease['lease_id'] = lease['reservation_id'] # retreive node name for node in nodes: - if node['node_id'] == lease['node_id']: - nodename = node['hostname'] - break - - rspec_lease['component_id'] = hostname_to_urn(self.driver.hrn, self.driver.testbedInfo['name'], nodename) + if node['node_id'] == lease['node_id']: + nodename = node['hostname'] + break + + rspec_lease['component_id'] = hostname_to_urn( + self.driver.hrn, self.driver.testbedInfo['name'], nodename) # retreive slicename for slc in slices: - if slc['slice_id'] == lease['slice_id']: - slicename = slc['slice_name'] - break - + if slc['slice_id'] == lease['slice_id']: + slicename = slc['slice_name'] + break + if slice_xrn: slice_urn = slice_xrn slice_hrn = urn_to_hrn(slice_urn) else: - slice_hrn = slicename_to_hrn(self.driver.hrn, self.driver.testbedInfo['name'], slicename) + slice_hrn = slicename_to_hrn( + self.driver.hrn, self.driver.testbedInfo['name'], slicename) slice_urn = hrn_to_urn(slice_hrn, 'slice') rspec_lease['slice_id'] = slice_urn rspec_lease['start_time'] = lease['start_time'] - rspec_lease['duration'] = (int(lease['end_time']) - int(lease['start_time'])) / int(grain) + rspec_lease['duration'] = ( + int(lease['end_time']) - int(lease['start_time'])) / int(grain) rspec_leases.append(rspec_lease) return (rspec_leases, rspec_channels) + def get_channels(self, slice=None, options=None): + if options is None: + options = {} - def get_channels(self, slice=None, options={}): - all_channels = self.driver.shell.getChannels({}, []) channels = [] if slice: reserved_channels = self.driver.shell.getReservedChannels() reserved_channel_ids = [] for channel in reserved_channels: - if channel['slice_id'] == slice['slice_id']: - reserved_channel_ids.append(channel['channel_id']) + if channel['slice_id'] == slice['slice_id']: + reserved_channel_ids.append(channel['channel_id']) for channel in all_channels: - if channel['channel_id'] in reserved_channel_ids: - channels.append(channel) + if channel['channel_id'] in reserved_channel_ids: + channels.append(channel) else: channels = all_channels @@ -239,46 +253,50 @@ class NitosAggregate: rspec_channel['channel_num'] = channel['channel'] rspec_channel['frequency'] = channel['frequency'] rspec_channel['standard'] = channel['modulation'] + rspec_channel['component_id'] = channel_to_urn( + self.driver.hrn, self.driver.testbedInfo['name'], channel['channel']) rspec_channels.append(rspec_channel) return rspec_channels - - - def get_rspec(self, slice_xrn=None, version = None, options={}): + def get_rspec(self, slice_xrn=None, version=None, options=None): + if options is None: + options = {} version_manager = VersionManager() version = version_manager.get_version(version) if not slice_xrn: - rspec_version = version_manager._get_version(version.type, version.version, 'ad') + rspec_version = version_manager._get_version( + version.type, version.version, 'ad') else: - rspec_version = version_manager._get_version(version.type, version.version, 'manifest') + rspec_version = version_manager._get_version( + version.type, version.version, 'manifest') slice, slivers = self.get_slice_and_slivers(slice_xrn) rspec = RSpec(version=rspec_version, user_options=options) if slice and 'expires' in slice: - rspec.xml.set('expires', datetime_to_string(utcparse(slice['expires']))) + rspec.xml.set('expires', datetime_to_string( + utcparse(slice['expires']))) if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'leases': - nodes = self.get_nodes(slice_xrn, slice, slivers, options) - rspec.version.add_nodes(nodes) - # add sliver defaults - default_sliver = slivers.get(None, []) - if default_sliver: - default_sliver_attribs = default_sliver.get('tags', []) - for attrib in default_sliver_attribs: - logger.info(attrib) - rspec.version.add_default_sliver_attribute(attrib['tagname'], attrib['value']) - # add wifi channels - channels = self.get_channels(slice, options) - rspec.version.add_channels(channels) + nodes = self.get_nodes(slice_xrn, slice, slivers, options) + rspec.version.add_nodes(nodes) + # add sliver defaults + default_sliver = slivers.get(None, []) + if default_sliver: + default_sliver_attribs = default_sliver.get('tags', []) + for attrib in default_sliver_attribs: + logger.info(attrib) + rspec.version.add_default_sliver_attribute( + attrib['tagname'], attrib['value']) + # add wifi channels + channels = self.get_channels(slice, options) + rspec.version.add_channels(channels) if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'resources': - leases, channels = self.get_leases_and_channels(slice, slice_xrn) - rspec.version.add_leases(leases, channels) + leases_channels = self.get_leases_and_channels(slice, slice_xrn) + rspec.version.add_leases(leases_channels) return rspec.toxml() - -