Merge branch 'master' into eucalyptus-devel

[sfa.git] / sfa / plc / api.py

diff --git a/sfa/plc/api.py b/sfa/plc/api.py
index 57f8b9d..d4781f3 100644 (file)
--- a/sfa/plc/api.py
+++ b/sfa/plc/api.py
@@ -172,7 +172,7 @@ class SfaAPI(BaseAPI):
         # get self credential
         self_cred = registry.GetSelfCredential(cert_string, self.hrn, 'authority')
         # get credential
-        cred = registry.GetCredential(self_cred, self.hrn, type)
+        cred = registry.GetCredential(self_cred, self.hrn, 'authority')
         return Credential(string=cred)
 
     def __getCredentialRaw(self):
@@ -338,8 +338,11 @@ class SfaAPI(BaseAPI):
                         break
             # fill in key info
             if record['type'] == 'user':
-                pubkeys = [keys[key_id]['key'] for key_id in record['key_ids'] if key_id in keys] 
-                record['keys'] = pubkeys
+                if 'key_ids' not in record:
+                    self.logger.info("user record has no 'key_ids' - need to import from myplc ?")
+                else:
+                    pubkeys = [keys[key_id]['key'] for key_id in record['key_ids'] if key_id in keys] 
+                    record['keys'] = pubkeys
 
         # fill in record hrns
         records = self.fill_record_hrns(records)