fix value of 'component_manager_id' node attribute in PG RSpec

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

diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py
index cc46c11..4073243 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,25 +47,38 @@ 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 in self.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:
+            format = version.format
+            if format == 'pg':
+                rspec = PGRSpec()
+            else:
+                rspec = SfaRSpec()
+        else: 
             rspec = SfaRSpec()
 
-        rspec.add_nodes(self.nodes)
-        rspec.add_interfaces(self.interfaces) 
-        rspec.add_links(self.links)
+        rspec.add_nodes(self.nodes.values())
+        rspec.add_interfaces(self.interfaces.values()) 
+        rspec.add_links(self.links.values())
 
         if slice_xrn:
             slice_hrn, _ = urn_to_hrn(slice_xrn)
@@ -74,4 +87,6 @@ class Aggregate:
             if slices:
                 slice = slices[0]   
                 hostnames = [self.nodes[node_id]['hostname'] for node_id in slice['node_ids']]
-                rspec.add_slivers(hostnames)          
+                rspec.add_slivers(hostnames)
+
+        return rspec.toxml()