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
-from sfa.trust.credential import Credential
-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.
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, caller_cred=None):
- sfa_aggregate_type = Config().get_aggregate_rspec_type()
-
- self.api.auth.check(cred, 'listnodes')
- if caller_cred==None:
- caller_cred=cred
-
- #log the call
- self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
-
- # This code needs to be cleaned up so that 'pl' is treated as just another RSpec manager.
- # The change ought to be straightforward as soon as we define PL's new RSpec.
-
- if (sfa_aggregate_type == 'pl'):
- nodes = Nodes(self.api, caller_cred=caller_cred)
- if hrn:
- rspec = nodes.get_rspec(hrn)
- else:
- nodes.refresh()
- rspec = nodes['rspec']
- else:
- 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)