misc pg rspec fixes

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

diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py
index 24f84a1..4dedb7f 100644 (file)
--- a/sfa/plc/aggregate.py
+++ b/sfa/plc/aggregate.py
@@ -19,9 +19,7 @@ class Aggregate:
 
     def __init__(self, api, user_options={}):
         self.api = api
-       #panos 
-       self.user_options = user_options
-       print "[aggregate] options = ",self.user_options
+        self.user_options = user_options
 
     def prepare_sites(self, force=False):
         if not self.sites or force:  
@@ -63,24 +61,24 @@ 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
         rspec_version = RSpecVersion(version)
         if rspec_version['type'].lower() == 'protogeni':
-            rspec = PGRSpec()
+            rspec = PGRSpec(type=type)
            #panos pass user options to SfaRSpec
         elif rspec_version['type'].lower() == 'sfa':
-            rspec = SfaRSpec("",{},self.user_options)
+            rspec = SfaRSpec(type=type, user_options=self.user_options)
         else:
-            rspec = SfaRSpec("",{},self.user_options)
+            rspec = SfaRSpec(type=type, user_options=self.user_options)
 
 
         rspec.add_nodes(self.nodes.values())