X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Faggregate.py;h=d69974214875a5f996794b2cfd87382ee0be0004;hb=57b6a99255d4a88be9c0f910f8524677e34ff4bc;hp=7f4fcb25e41f20c561cc36706b9b83ded789c95c;hpb=7841ee3ce022c84fcf9a8ea17ce12d52e36b3aaa;p=sfa.git diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py index 7f4fcb25..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: @@ -13,6 +13,7 @@ class Aggregate: interfaces = {} links = {} node_tags = {} + pl_initscripts = {} prepared=False #panos new user options variable user_options = {} @@ -28,7 +29,19 @@ class Aggregate: def prepare_nodes(self, force=False): if not self.nodes or force: - for node in self.api.plshell.GetNodes(self.api.plauth): + 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): @@ -45,73 +58,102 @@ class Aggregate: for node_tag in self.api.plshell.GetNodeTags(self.api.plauth): self.node_tags[node_tag['node_tag_id']] = node_tag + def prepare_pl_initscripts(self, force=False): + if not self.pl_initscripts or force: + for initscript in self.api.plshell.GetInitScripts(self.api.plauth, {'enabled': True}): + self.pl_initscripts[initscript['initscript_id']] = initscript + 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) - # 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.prepare_nodes(force) + self.prepare_links(force) + self.prepare_pl_initscripts() 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.add_nodes(self.nodes.values()) - rspec.add_interfaces(self.interfaces.values()) - rspec.add_links(self.links.values()) - + 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: - # If slicename is specified then resulting rspec is a manifest. - # Add sliver details to rspec and remove 'advertisement' elements - rspec.remove_element('available') slice_hrn, _ = urn_to_hrn(slice_xrn) slice_name = hrn_to_pl_slicename(slice_hrn) slices = self.api.plshell.GetSlices(self.api.plauth, slice_name) if slices: - slice = slices[0] - slivers = [] - tags = self.api.plshell.GetSliceTags(self.api.plauth, slice['slice_tag_ids']) - for node_id in slice['node_ids']: + slice = slices[0] + + # 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.plshell.GetSliceTags(self.api.plauth, 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 isn't bound to a node then it applies to all slivers - if not tag['node_id']: + if tag['node_id'] and (tag['node_id'] == node_id): sliver['tags'].append(tag) - else: - tag_host = self.nodes[tag['node_id']]['hostname'] - if tag_host == sliver['hostname']: - sliver.tags.append(tag) - rspec.add_slivers(slivers, sliver_urn=slice_xrn) + 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) - return rspec.toxml() + return rspec.toxml()