From 69dfdb2b270c9ccfe054ec7704cc8e739f5a5e51 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 23 Mar 2009 20:13:45 +0000 Subject: [PATCH] add add foreign users public keys when needed in createSlice --- geni/aggregate.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/geni/aggregate.py b/geni/aggregate.py index 1e718598..5ae2c6fd 100644 --- a/geni/aggregate.py +++ b/geni/aggregate.py @@ -394,13 +394,16 @@ class Aggregate(GeniServer): person_record = person_records[0] person_dict = person_record.as_dict()['plc_info'] persons = self.shell.GetPersons(self.auth, [person_dict['email']], ['person_id', 'key_ids']) + + # Create the person record if not persons: self.shell.AddPerson(self.auth, person_dict) - else: - person = persons[0] self.shell.AddPersonToSlice(self.auth, person_dict['email'], login_base) - # XX Dont forget to add this person's public keys - + # Add this person's public keys + for personkey in person_dict['keys']: + key = {'type': 'ssh', 'key': personkey} + self.shellAddPersonKey(self.auth, person_dict['email'], key) + # find out where this slice is currently running nodelist = self.shell.GetNodes(self.auth, slice['node_ids'], ['hostname']) hostnames = [node['hostname'] for node in nodelist] -- 2.43.0