updates

diff --git a/sfa/importer/openstackimporter.py b/sfa/importer/openstackimporter.py
index 62f29ef..1f2af92 100644 (file)
--- a/sfa/importer/openstackimporter.py
+++ b/sfa/importer/openstackimporter.py
@@ -54,7 +54,8 @@ class OpenstackImporter:
             hrn = OSXrn(name=user.name, auth=auth_hrn, type='user').get_hrn()
             users_dict[hrn] = user
             old_keys = old_user_keys.get(hrn, [])
-            keys = [k.public_key for k in self.shell.nova_manager.keypairs.findall(name=hrn)]
+            keyname = OSXrn(xrn=hrn, type='user').get_slicename()
+            keys = [k.public_key for k in self.shell.nova_manager.keypairs.findall(name=keyname)]
             user_keys[hrn] = keys
             update_record = False
             if old_keys != keys:

diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py
index 98a6723..f8aa84e 100644 (file)
--- a/sfa/openstack/nova_driver.py
+++ b/sfa/openstack/nova_driver.py
@@ -118,7 +118,8 @@ class NovaDriver(Driver):
             self.shell.auth_manager.roles.add_user_role(user, slice_tenant, 'user')
         keys = sfa_records.get('keys', [])
         for key in keys:
-            self.shell.nova_client.keypairs.create(name, key)
+            keyname = OSXrn(xrn=hrn, type='user').get_slicename()
+            self.shell.nova_client.keypairs.create(keyname, key)
         return user
 
     def register_authority(self, sfa_record, hrn):