From d9d3f0354356034d822fe7123e97997db08b0c4b Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 2 Feb 2012 12:57:44 -0500 Subject: [PATCH] update nova shell refrences --- sfa/importer/sfa-import-openstack.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sfa/importer/sfa-import-openstack.py b/sfa/importer/sfa-import-openstack.py index ec785e81..8000b0c4 100755 --- a/sfa/importer/sfa-import-openstack.py +++ b/sfa/importer/sfa-import-openstack.py @@ -27,7 +27,7 @@ from sfa.trust.certificate import convert_public_key, Keypair from sfa.trust.gid import create_uuid from sfa.importer.sfaImport import sfaImport, _cleanup_string from sfa.util.sfalogging import logger -from sfa.openstack.openstack_shell import OpenstackShell +from sfa.openstack.nova_shell import NovaShell def process_options(): @@ -64,7 +64,7 @@ def main(): sys.exit(0) root_auth = config.SFA_REGISTRY_ROOT_AUTH interface_hrn = config.SFA_INTERFACE_HRN - shell = OpenstackShell(config) + shell = NovaShell(config) sfaImporter.create_top_level_records() # create dict of all existing sfa records @@ -79,7 +79,7 @@ def main(): # Get all users - persons = shell.user_get_all() + persons = shell.auth_manager.get_users() persons_dict = {} keys_filename = config.config_path + os.sep + 'person_keys.py' old_person_keys = load_keys(keys_filename) @@ -88,7 +88,7 @@ def main(): hrn = config.SFA_INTERFACE_HRN + "." + person.id persons_dict[hrn] = person old_keys = old_person_keys.get(person.id, []) - keys = [k.public_key for k in shell.key_pair_get_all_by_user(person.id)] + keys = [k.public_key for k in shell.db.key_pair_get_all_by_user(person.id)] person_keys[person.id] = keys update_record = False if old_keys != keys: @@ -113,7 +113,7 @@ def main(): person_record.sync() # Get all projects - projects = shell.project_get_all() + projects = shell.get_projects() projects_dict = {} for project in projects: hrn = config.SFA_INTERFACE_HRN + '.' + project.id -- 2.43.0