misc pg rspec fixes

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

diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py
index 1ba75d2..4dedb7f 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,12 @@ 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
+        self.user_options = user_options
 
     def prepare_sites(self, force=False):
         if not self.sites or force:  
@@ -57,24 +61,25 @@ class Aggregate:
                 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_urn'] = hrn_to_urn(PlXrn.site_hrn(self.api.hrn, site['login_base']), 'authority+am') 
                 node['site'] = site
                 node['interfaces'] = interfaces
                 node['tags'] = tags
 
         self.prepared = True  
 
-    def get_rspec(self, slice_xrn=None, version = None):
+    def get_rspec(self, slice_xrn=None, version = None, type=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(type=type)
+           #panos pass user options to SfaRSpec
+        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()) 
@@ -93,6 +98,7 @@ class Aggregate:
                     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']: