accepts = [
Parameter(str, "Credential string"),
- Parameter(str, "Human readable name (hrn)")
+ Parameter(str, "Human readable name (hrn)"),
+ Mixed(Parameter(str, "Request hash"),
+ Parameter(None, "Request hash not specified"))
]
returns = [GeniRecord]
- def call(self, cred, hrn, caller_cred=None):
+ def call(self, cred, hrn, request_hash=None, origin_hrn=None):
+ self.api.auth.authenticateCred(cred, [cred, hrn], request_hash)
self.api.auth.check(cred, 'resolve')
- if caller_cred==None:
- caller_cred=cred
+ 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, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
+ self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
good_records = []
# load all know registry names into a prefix tree and attempt to find
if registry_hrn != self.api.hrn:
credential = self.api.getCredential()
try:
- records = registries[registry_hrn].resolve(credential, hrn, caller_cred=caller_cred)
- good_records = [record.as_dict() for record in records]
- if good_records:
- return good_records
+ request_hash=None
+ records = registries[registry_hrn].resolve(credential, hrn, request_hash, origin_hrn)
+ good_records = [GeniRecord(dict=record).as_dict() for record in records]
except:
- traceback.print_exc()
+ arg_list = [credential, hrn]
+ request_hash=self.api.key.compute_hash(arg_list)
+ records = registries[registry_hrn].resolve(credential, hrn, request_hash, origin_hrn)
+ good_records = [GeniRecord(dict=record).as_dict() for record in records]
+
+ if good_records:
+ return good_records
# if we still havnt found the record yet, try the local registry
table = GeniTable()
good_records.append(dict(record))
except PlanetLabRecordDoesNotExist:
# silently drop the ones that are missing in PL
- print >> log, "ignoring geni record ", record.get_name(), \
+ print >> log, "ignoring geni record ", record['hrn'], \
" because pl record does not exist"
table.remove(record)