fixed up the names of new site names/slices to be more PLC compatible

[sfa.git] / sfa / methods / get_resources.py

diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index 468783c..8ebebcd 100644 (file)
--- a/sfa/methods/get_resources.py
+++ b/sfa/methods/get_resources.py
@@ -4,14 +4,14 @@
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.trust.auth import Auth
-from sfa.util.config import Config
-from sfa.plc.nodes import Nodes
-# RSpecManager_pl is not used. This is just to resolve issues with the dynamic __import__ that comes later.
+from sfa.methods.ListResources import ListResources 
+# RSpecManager_pl is not used. This line is a check that ensures that everything is in place for the import to work.
 import sfa.rspecs.aggregates.rspec_manager_pl
 
-class get_resources(Method):
+class get_resources(ListResources):
     """
+    Deprecated. Use ListResources instead. 
+
     Get an resource specification (rspec). The rspec may describe the resources
     available at an authority or the resources being used by a slice.      
 
@@ -24,26 +24,17 @@ class get_resources(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Mixed(Parameter(str, "Human readable name (hrn)"),
-              Parameter(None, "hrn not specified"))
+        Mixed(Parameter(str, "Human readable name (hrn or urn)"),
+              Parameter(None, "hrn not specified")),
+        Mixed(Parameter(str, "Human readable name of the original caller"),
+              Parameter(None, "Origin hrn not specified"))
         ]
 
     returns = Parameter(str, "String representatin of an rspec")
     
-    def call(self, cred, hrn=None):
-        sfa_aggregate_type = Config().get_aggregate_rspec_type()
-
-        self.api.auth.check(cred, 'listnodes')
-        if (sfa_aggregate_type == 'pl'):
-            nodes = Nodes(self.api)
-            if hrn:
-                rspec = nodes.get_rspec(hrn)
-            else:
-                nodes.refresh()
-                rspec = nodes['rspec']
-        else:
-            # To clean up after July 21 - SB    
-            rspec_manager = __import__("sfa.rspecs.aggregates.rspec_manager_"+sfa_aggregate_type, fromlist = ["sfa.rspecs.aggregates"])
-            rspec = rspec_manager.get_rspec(self.api, hrn)
-        
-        return rspec
+    def call(self, cred, xrn=None, origin_hrn=None):
+        options = {'geni_slice_urn': xrn,
+                   'origin_hrn': origin_hrn
+        }
+                  
+        return ListResources.call(self, cred, options)