- def call(self, cred, hrn=None):
- sfa_aggregate_type = Config().get_aggregate_rspec_type()=='pl'
+ def call(self, cred, hrn=None, request_hash = None, caller_cred=None):
+ sfa_aggregate_type = Config().get_aggregate_rspec_type()
+
+ # 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_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"])