ListResources uses the 'rspec_version' field specified in the 'options' struct to...

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

diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py
index cc46c11..1d123d8 100644 (file)
--- a/sfa/plc/aggregate.py
+++ b/sfa/plc/aggregate.py
@@ -49,23 +49,33 @@ class Aggregate:
             self.prepare_links(force)
             self.prepare_tagtypes(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']]
+                node['network'] = self.api.hrn
+                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
 
         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 +84,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()