Refactor to /opt/planetstack, final tweaks to make sure planetstack can run in non...

[plstackapi.git] / planetstack / core / api / keys.py

diff --git a/plstackapi/core/api/keys.py b/planetstack/core/api/keys.py
similarity index 78%
rename from plstackapi/core/api/keys.py
rename to planetstack/core/api/keys.py
index 3b70cac..e653690 100644 (file)
--- a/plstackapi/core/api/keys.py
+++ b/planetstack/core/api/keys.py
@@ -1,9 +1,9 @@
 from types import StringTypes
-from plstackapi.openstack.client import OpenStackClient
-from plstackapi.openstack.driver import OpenStackDriver
-from plstackapi.core.api.auth import auth_check
-from plstackapi.core.models import Key
-from plstackapi.core.api.users import _get_users
+from openstack.client import OpenStackClient
+from openstack.driver import OpenStackDriver
+from core.models import Key
+from core.api.auth import auth_check
+from core.api.users import _get_users
 
 
 def _get_keys(filter):
@@ -27,7 +27,7 @@ def add_key(auth, fields):
     nova_fields = {'name': key.name,
                    'key': key.key} 
     nova_key = driver.create_keypair(**nova_fields)
-    key.key_id = nova_key.id
+    key.nkey_id = nova_key.id
     key.save()
     return key
 
@@ -38,7 +38,7 @@ def delete_key(auth, filter={}):
     driver = OpenStackDriver(client = auth_check(auth))   
     keys = _get_keys(filter)
     for key in keys:
-        driver.delete_keypair(id=key.key_id) 
+        driver.delete_keypair(id=key.nkey_id) 
         key.delete()
     return 1