X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fget_resources.py;h=6e93926fe8bdc2f97bf05f28b41a54420db8357d;hb=11d02cbfd5e91784119bb9377fceb4fa6adae621;hp=a9b9cdc25beea22136c987fca11b7401ef015294;hpb=6691cc4c8f8ca1b6ed0a634c44627e8248db81b9;p=sfa.git

diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index a9b9cdc2..6e93926f 100644
--- a/sfa/methods/get_resources.py
+++ b/sfa/methods/get_resources.py
@@ -2,11 +2,16 @@
 ### $URL$
 
 from sfa.util.faults import *
+from sfa.util.namespace 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 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
+from sfatables.runtime import SFATablesRules
 
 class get_resources(Method):
     """
@@ -22,20 +27,45 @@ 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):
-        
+    def call(self, cred, xrn=None, origin_hrn=None):
+        hrn, type = urn_to_hrn(xrn)
+        user_cred = Credential(string=cred)
+
+        #log the call
+        if not origin_hrn:
+            origin_hrn = user_cred.get_gid_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))
+
+        # validate the cred    
         self.api.auth.check(cred, 'listnodes')
-        nodes = Nodes(self.api)
-        if hrn:
-            rspec = nodes.get_rspec(hrn)
-        else:
-            nodes.refresh()
-            rspec = nodes['rspec']
-        
-        return rspec
+
+        # 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, xrn, origin_hrn)
+            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, xrn, origin_hrn)
+            outgoing_rules = SFATablesRules('FORWARD-OUTGOING')
+
+        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