IndentationError

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

diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index 10cf5be..f5870a1 100644 (file)
--- a/sfa/methods/get_resources.py
+++ b/sfa/methods/get_resources.py
@@ -29,55 +29,46 @@ class get_resources(Method):
         Mixed(Parameter(str, "Human readable name (hrn)"),
               Parameter(None, "hrn not specified")),
         Mixed(Parameter(str, "Request hash"),
-              Parameter(None, "Request hash not specified")),
-        Parameter(str, "Callers credential string")
+              Parameter(None, "Request hash not specified"))
         ]
 
     returns = Parameter(str, "String representatin of an rspec")
     
-    def call(self, cred, hrn=None, request_hash = None, caller_cred=None):
-        sfa_aggregate_type = Config().get_aggregate_rspec_type()
+    def call(self, cred, hrn=None, request_hash = None):
+        user_cred = Credential(string=cred)
+
+        #log the call
+        gid_origin_caller = user_cred.get_gid_origin_caller()
+        origin_hrn = gid_origin_caller.get_hrn()
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
 
         # This cred will be an authority cred, not a user, so we cant use it to 
         # authenticate the caller's request_hash. Let just get the caller's gid
         # from the cred and authenticate using that 
-        client_gid = Credential(string=cred).get_gid_caller()
+        client_gid = user_cred.get_gid_caller()
         client_gid_str = client_gid.save_to_string(save_parents=True)
         self.api.auth.authenticateGid(client_gid_str, [cred,hrn], request_hash)
         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.
 
-        rspec_manager = __import__("sfa.rspecs.aggregates.rspec_manager_"+sfa_aggregate_type,
-                                   fromlist = ["sfa.rspecs.aggregates"])
-        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 = rspec_manager.get_rspec(self.api, hrn)
+        # send the call to the right manager
+        manager_base = 'sfa.managers'
+        if self.api.interface in ['aggregate']:
+            mgr_type = self.api.config.SFA_AGGREGATE_TYPE
+            manager_module = manager_base + ".aggregate_manager_%s" % mgr_type
+            manager = __import__(manager_module, fromlist=[manager_base])
+            rspec = manager.get_rspec(self.api, hrn, gid_origin_caller)
+            outgoing_rules = SFATablesRules('OUTGOING')
+        elif self.api.interface in ['slicemgr']:
+            mgr_type = self.api.config.SFA_SM_TYPE
+            manager_module = manager_base + ".slice_manager_%s" % mgr_type
+            manager = __import__(manager_module, fromlist=[manager_base])
+            rspec = manager.get_rspec(self.api, hrn, gid_origin_caller)
+            outgoing_rules = SFATablesRules('FORWARD-OUTGOING')
 
-        # Filter the outgoing rspec using sfatables
-       if self.api.interface=='slicemgr':
-           outgoing_rules = SFATablesRules('FORWARD-OUTGOING')
-       else:
-           outgoing_rules = SFATablesRules('OUTGOING')
-       if outgoing_rules.sorted_rule_list:
-           request_context = rspec_manager.fetch_context(
-               hrn,
-               Credential(string=caller_cred).get_gid_caller().get_hrn(),
-               outgoing_rules.contexts)
+        filtered_rspec = rspec
+        if outgoing_rules.sorted_rule_list:
+           request_context = manager.fetch_context(hrn, origin_hrn, outgoing_rules.contexts)
            outgoing_rules.set_context(request_context)
            filtered_rspec = outgoing_rules.apply(rspec)
-           return filtered_rspec
-       else:
-          return rspec
+
+        return filtered_rspec