X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Faggregate.py;h=d69974214875a5f996794b2cfd87382ee0be0004;hb=57b6a99255d4a88be9c0f910f8524677e34ff4bc;hp=ef4705ba1f97940bb946e8fc3c96211ab59adf28;hpb=5e58ea5c00a358b033eec7ff732043e77a9391ca;p=sfa.git diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py index ef4705ba..d6997421 100644 --- a/sfa/plc/aggregate.py +++ b/sfa/plc/aggregate.py @@ -1,9 +1,9 @@ #!/usr/bin/python -from sfa.util.xrn import * -from sfa.util.plxrn import * -from sfa.rspecs.sfa_rspec import SfaRSpec -from sfa.rspecs.pg_rspec import PGRSpec -from sfa.rspecs.rspec_version import RSpecVersion +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.rspecs.rspec import RSpec +from sfa.rspecs.version_manager import VersionManager +from sfa.plc.vlink import get_tc_rate class Aggregate: @@ -30,6 +30,18 @@ class Aggregate: def prepare_nodes(self, force=False): if not self.nodes or force: for node in self.api.plshell.GetNodes(self.api.plauth, {'peer_id': None}): + # 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, force=False): @@ -54,42 +66,23 @@ class Aggregate: def prepare(self, force=False): if not self.prepared or force: self.prepare_sites(force) - self.prepare_nodes(force) self.prepare_interfaces(force) - self.prepare_links(force) self.prepare_node_tags(force) + self.prepare_nodes(force) + self.prepare_links(force) self.prepare_pl_initscripts() - # add site/interface info to nodes - for node_id in self.nodes: - node = self.nodes[node_id] - 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.prepared = True def get_rspec(self, slice_xrn=None, version = None): self.prepare() - rspec = None - rspec_version = RSpecVersion(version) - if slice_xrn: - type = 'manifest' + 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: - type = 'advertisement' - if rspec_version['type'].lower() == 'protogeni': - rspec = PGRSpec(type=type) - elif rspec_version['type'].lower() == 'sfa': - rspec = SfaRSpec(type=type, user_options=self.user_options) - else: - rspec = SfaRSpec(type=type, user_options=self.user_options) - + 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: @@ -102,7 +95,7 @@ class Aggregate: # filter out nodes with a whitelist: valid_nodes = [] for node in self.nodes.values(): - # only doing this becuase protogeni rspec needs + # only doing this because protogeni rspec needs # to advertise available initscripts node['pl_initscripts'] = self.pl_initscripts @@ -113,9 +106,9 @@ class Aggregate: elif not slice and not node['slice_ids_whitelist']: valid_nodes.append(node) - rspec.add_nodes(valid_nodes) - rspec.add_interfaces(self.interfaces.values()) - rspec.add_links(self.links.values()) + 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: @@ -127,8 +120,25 @@ class Aggregate: # 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.add_default_sliver_attribute(tag['tagname'], tag['value'], self.api.hrn) - + 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 = {} @@ -144,6 +154,6 @@ class Aggregate: sliver['tags'].append(tag) except: self.api.logger.log_exc('unable to add sliver %s to node %s' % (slice['name'], node_id)) - rspec.add_slivers(slivers, sliver_urn=slice_xrn) + rspec.version.add_slivers(slivers, sliver_urn=slice_xrn) - return rspec.toxml(cleanup=True) + return rspec.toxml()