elif type == "slice":
hrn=record.get_name()
pl_record=self.api.geni_fields_to_pl_fields(type, hrn, record)
+ if 'name' in pl_record:
+ pl_record.pop('name')
self.api.plshell.UpdateSlice(self.api.plauth, pointer, pl_record)
elif type == "user":
persons = self.api.plshell.GetPersons(self.api.plauth, [pointer], ['key_ids'])
person = persons[0]
keys = person['key_ids']
- keys = GetKeys(person['key_ids'])
+ keys = self.api.plshell.GetKeys(self.api.plauth, person['key_ids'])
key_exists = False
+ if isinstance(record['key'], list):
+ new_key = record['key'][0]
+ else:
+ new_key = record['key']
+
# Delete all stale keys
for key in keys:
if record['key'] != key['key']:
else:
key_exists = True
if not key_exists:
- self.api.plshell.AddPersonKey(pointer, {'key_type': 'ssh', 'key': record['key']})
+ self.api.plshell.AddPersonKey(self.api.plauth, pointer, {'key_type': 'ssh', 'key': new_key})
# find the existing geni record
hrn = record['hrn']
person_record = person_records[0]
# update the openssl key and gid
- pkey = convert_public_key(record['key'])
+ pkey = convert_public_key(new_key)
uuid = create_uuid()
gid_object = self.api.auth.hierarchy.create_gid(hrn, uuid, pkey)
gid = gid_object.save_to_string(save_parents=True)
- person_record['gid'] = gid
- person_record.set_gid(gid)
- table.update(person_record)
+ record['gid'] = gid
+ record.set_gid(gid)
+ table.update(record)
elif type == "node":
self.api.plshell.UpdateNode(self.api.plauth, pointer, record)