X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fget_resources.py;h=4c7e466b159b751f317a2a1fb155fd5dc6ca8b15;hb=6f8fbddbe8ba6a0b6304655d80df53ab813d9001;hp=7ded939919becefed7b66b60cb7dc41bf847450d;hpb=62792bcff03b7c63c3140066563a1530aa497d48;p=sfa.git

diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index 7ded9399..4c7e466b 100644
--- 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