Added the possibility for users to define a set of information fields

[sfa.git] / sfa / plc / aggregate.py

diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py
index 089ec04..2e49dd6 100644 (file)
--- a/sfa/plc/aggregate.py
+++ b/sfa/plc/aggregate.py
@@ -3,6 +3,7 @@ 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
 
 class Aggregate:
 
@@ -13,9 +14,14 @@ class Aggregate:
     links = {}
     node_tags = {}
     prepared=False
+    #panos new user options variable
+    user_options = {}
 
-    def __init__(self, api):
+    def __init__(self, api, user_options={}):
         self.api = api
+       #panos 
+       self.user_options = user_options
+       print "[aggregate] options = ",self.user_options
 
     def prepare_sites(self, force=False):
         if not self.sites or force:  
@@ -55,6 +61,7 @@ class Aggregate:
                 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+sa')
                 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') 
                 node['site'] = site
@@ -66,26 +73,42 @@ class Aggregate:
     def get_rspec(self, slice_xrn=None, version = None):
         self.prepare()
         rspec = None
-        if version:
-            format = version.format
-            if format == 'pg':
-                rspec = PGRSpec()
-            else:
-                rspec = SfaRSpec()
-        else: 
-            rspec = SfaRSpec()
+        rspec_version = RSpecVersion(version)
+        if rspec_version['type'].lower() == 'protogeni':
+            rspec = PGRSpec()
+       #panos pass user options to SfaRSpec
+        elif rspec_version['type'].lower() == 'sfa':
+            rspec = SfaRSpec("",{},self.user_options)
+        else:
+            rspec = SfaRSpec("",{},self.user_options)
+
 
         rspec.add_nodes(self.nodes.values())
         rspec.add_interfaces(self.interfaces.values()) 
         rspec.add_links(self.links.values())
 
         if slice_xrn:
+            # get slice details
             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]   
-                hostnames = [self.nodes[node_id]['hostname'] for node_id in slice['node_ids']]
-                rspec.add_slivers(hostnames)
+                slice = slices[0]
+                slivers = []
+                tags = self.api.plshell.GetSliceTags(self.api.plauth, slice['slice_tag_ids'])
+                for node_id in slice['node_ids']:
+                    sliver = {}
+                    sliver['hostname'] = self.nodes[node_id]['hostname']
+                    sliver['tags'] = []
+                    slivers.append(sliver)
+                    for tag in tags:
+                        # if tag isn't bound to a node then it applies to all slivers
+                        if not tag['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)
 
         return rspec.toxml()