Added the possibility for users to define a set of information fields

[sfa.git] / sfa / managers / slice_manager_pl.py

diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index 1765179..e7f779d 100644 (file)
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -360,9 +360,14 @@ def ListResources(api, creds, options, call_id):
 
     # get the rspec's return format from options
     rspec_version = RSpecVersion(options.get('rspec_version'))
-    print dict(rspec_version)
     version_string = "rspec_%s" % (rspec_version.get_version_name())
 
+    #panos adding the info option to the caching key (can be improved)
+    if options.get('info'):
+       version_string = version_string + "_"+options.get('info')
+   
+    print "version string = ",version_string
+
     # look in cache first
     if caching and api.cache and not xrn:
         rspec =  api.cache.get(version_string)
@@ -391,17 +396,18 @@ def ListResources(api, creds, options, call_id):
                     
     results = threads.get_results()
     #results.append(open('/root/protogeni.rspec', 'r').read())
-    rspec = SfaRSpec()
+    rspec_version = RSpecVersion(my_opts.get('rspec_version'))
+    if rspec_version['type'].lower() == 'protogeni':
+        rspec = PGRSpec()
+    else:
+        rspec = SfaRSpec()
+
     for result in results:
+        print "RESULT"
         try:
-            tmp_rspec = parse_rspec(result)
-            if isinstance(tmp_rspec, SfaRSpec):
-                rspec.merge(result)
-            elif isinstance(tmp_rspec, PGRSpec):
-                rspec.merge(RSpecConverter.to_sfa_rspec(result))
-            else:
-                api.logger.info("SM.ListResources: invalid aggregate rspec")                        
+            rspec.merge(result)
         except:
+            raise
             api.logger.info("SM.ListResources: Failed to merge aggregate rspec")
 
     # cache the result