sfa.rspecs.rspec_version and GetVersion() updates

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

diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py
index 8160024..9626d31 100644 (file)
--- a/sfa/plc/aggregate.py
+++ b/sfa/plc/aggregate.py
@@ -11,7 +11,7 @@ class Aggregate:
     nodes = {}
     interfaces = {}
     links = {}
-    tag_types = {}
+    node_tags = {}
     prepared=False
 
     def __init__(self, api):
@@ -36,10 +36,10 @@ class Aggregate:
         if not self.links or force:
             pass
 
-    def prepare_tagtypes(self, force=False):
-        if not self.tag_types or force:
-            for tag_type in self.api.plshell.GetTagTypes(self.api.plauth):
-                self.tag_types[tag_type['tag_type_id']] = tag_type
+    def prepare_node_tags(self, force=False):
+        if not self.node_tags or force:
+            for node_tag in self.api.plshell.GetNodeTags(self.api.plauth):
+                self.node_tags[node_tag['node_tag_id']] = node_tag
 
     def prepare(self, force=False):
         if not self.prepared or force:
@@ -47,26 +47,34 @@ class Aggregate:
             self.prepare_nodes(force)
             self.prepare_interfaces(force)
             self.prepare_links(force)
-            self.prepare_tagtypes(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+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
                 node['interfaces'] = interfaces
+                node['tags'] = tags
 
         self.prepared = True  
 
-    def get_rspec(self, slice_xrn=None, format='sfa'):
+    def get_rspec(self, slice_xrn=None, version = None):
         self.prepare()
         rspec = None
-        if format == ['pg']:
-            rspec = PGRSpec()
-        else:
+        if version:
+            if version['type'].lower() == 'protogeni':
+                rspec = PGRSpec()
+            elif version['type'].lower() == 'sfa':
+                rspec = SfaRSpec()
+            else:
+                rspec = SfaRSpec()
+        else: 
             rspec = SfaRSpec()
 
         rspec.add_nodes(self.nodes.values())
@@ -74,12 +82,26 @@ class Aggregate:
         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'] = []
+                    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()