do not go through the sfatables code, if the current rule list is empty

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

diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index 7ded939..4c7e466 100644 (file)
--- a/sfa/methods/get_resources.py
+++ b/sfa/methods/get_resources.py
@@ -28,7 +28,9 @@ class get_resources(Method):
         Parameter(str, "Credential string"),
         Mixed(Parameter(str, "Human readable name (hrn)"),
               Parameter(None, "hrn not specified")),
-        Parameter(str, "Request hash")
+        Mixed(Parameter(str, "Request hash"),
+              Parameter(None, "Request hash not specified")),
+        Parameter(str, "Callers credential string")
         ]
 
     returns = Parameter(str, "String representatin of an rspec")
@@ -66,12 +68,13 @@ class get_resources(Method):
 
         # Filter the outgoing rspec using sfatables
         outgoing_rules = SFATablesRules('OUTGOING')
-
-        request_context = rspec_manager.fetch_context(
-            hrn,
-            Credential(string=caller_cred).get_gid_caller().get_hrn(),
-            outgoing_rules.contexts)
-        outgoing_rules.set_context(request_context)
-        filtered_rspec = outgoing_rules.apply(rspec)
-
-        return filtered_rspec
+       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)
+           outgoing_rules.set_context(request_context)
+           filtered_rspec = outgoing_rules.apply(rspec)
+           return filtered_rspec
+       else:
+          return rspec