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, origin_hrn=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 origin_hrn==None:
- origin_hrn=Credential(string=cred).get_gid_caller().get_hrn()
-
- #log the call
- self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
-
-
# send the call to the right manager
manager_base = 'sfa.managers'
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, origin_hrn)
+ 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, origin_hrn)
+ rspec = manager.get_rspec(self.api, hrn, gid_origin_caller)
outgoing_rules = SFATablesRules('FORWARD-OUTGOING')
filtered_rspec = rspec