X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Faggregate.py;h=c1f008fc3ef127175a949b8414f6a04ba363679e;hb=69fb221c274eb0b6e9f6ff6f895e5e6f90b17230;hp=bda3bbccbdbdd979f4f1ccb33d9437b7cbd36783;hpb=7691d2227f76cac186cb98167ac425bd9b5c0d5e;p=sfa.git diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py index bda3bbcc..c1f008fc 100644 --- a/sfa/plc/aggregate.py +++ b/sfa/plc/aggregate.py @@ -6,6 +6,7 @@ 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.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.interface import Interface @@ -14,6 +15,7 @@ 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 +from sfa.util.sfatime import epochparse class Aggregate: @@ -38,7 +40,8 @@ class Aggregate: iface['interface_id'] = interface['interface_id'] iface['node_id'] = interface['node_id'] iface['ipv4'] = interface['ip'] - iface['bwlimit'] = interface['bwlimit'] + if interface['bwlimit']: + iface['bwlimit'] = str(int(interface['bwlimit'])/1000) interfaces[iface['interface_id']] = iface return interfaces @@ -58,28 +61,27 @@ class Aggregate: # 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 + + for s1_node in self.nodes[site1['node_ids']]: + for s2_node in self.nodes[site2['node_ids']]: + # set interfaces + # just get first interface of the first node + if1_xrn = PlXrn(auth=self.api.hrn, interface='node%s:eth0' % (s1_node['node_id'])) + if1_ipv4 = self.interfaces[node1['interface_ids'][0]]['ip'] + if2_xrn = PlXrn(auth=self.api.hrn, interface='node%s:eth0' % (s2_node['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 @@ -105,7 +107,7 @@ class Aggregate: slice = None if not slice_xrn: return (slice, slivers) - slice_urn = hrn_to_urn(slice_xrn) + slice_urn = hrn_to_urn(slice_xrn, 'slice') slice_hrn, _ = urn_to_hrn(slice_xrn) slice_name = hrn_to_pl_slicename(slice_hrn) slices = self.api.driver.GetSlices(slice_name) @@ -116,7 +118,8 @@ class Aggregate: # 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', + 'name': slice['name'], + 'type': 'plab-vserver', 'tags': []}) slivers[node_id]= sliver @@ -155,13 +158,6 @@ class Aggregate: sites_dict = self.get_sites({'site_id': site_ids}) # get interfaces interfaces = self.get_interfaces({'interface_id':interface_ids}) - # get slivers - # - # thierry: no get_slivers, we have slivers as a result of - # get_slice_and_slivers passed as an argument - # -# slivers = self.get_slivers(slice) - # get tags node_tags = self.get_node_tags(tags_filter) # get initscripts @@ -183,20 +179,26 @@ class Aggregate: 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'})) + rspec_node['hardware_types']= [HardwareType({'name': 'plab-pc'}), + HardwareType({'name': 'pc'})] # only doing this because protogeni rspec needs # to advertise available initscripts - rspec_node['pl_initscripts'] = pl_initscripts + rspec_node['pl_initscripts'] = pl_initscripts.values() # 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 + if site['longitude'] and site['latitude']: + location = Location({'longitude': site['longitude'], 'latitude': site['latitude']}) + rspec_node['location'] = location rspec_node['interfaces'] = [] + if_count=0 for if_id in node['interface_ids']: interface = Interface(interfaces[if_id]) interface['ipv4'] = interface['ipv4'] + interface['component_id'] = PlXrn(auth=self.api.hrn, interface='node%s:eth%s' % (node['node_id'], if_count)).get_urn() rspec_node['interfaces'].append(interface) + if_count+=1 + tags = [PLTag(node_tags[tag_id]) for tag_id in node['node_tag_ids']] rspec_node['tags'] = tags if node['node_id'] in slivers: @@ -204,12 +206,12 @@ class Aggregate: 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']]] + rspec_node['slivers'] = [sliver] # slivers always provide the ssh service - login = Login({'authentication': 'ssh-keys', 'hostname': node['hostname'], port:'22'}) + login = Login({'authentication': 'ssh-keys', 'hostname': node['hostname'], 'port':'22'}) service = Services({'login': login}) - rspec_node['services'].append(service) + rspec_node['services'] = [service] rspec_nodes.append(rspec_node) return rspec_nodes @@ -225,7 +227,9 @@ class Aggregate: 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) + if slice and 'expires' in slice: + rspec.xml.set('expires', epochparse(slice['expires'])) + rspec.version.add_nodes(self.get_nodes(slice, slivers)) rspec.version.add_links(self.get_links(slice)) # add sliver defaults