update restapi to use OpenStackManager instead of OpenStackDriver

[plstackapi.git] / plstackapi / core / api / slivers.py

diff --git a/plstackapi/core/api/slivers.py b/plstackapi/core/api/slivers.py
index 0bdaa5d..f832dae 100644 (file)
--- a/plstackapi/core/api/slivers.py
+++ b/plstackapi/core/api/slivers.py
@@ -1,9 +1,7 @@
-import re
-from plstackapi.openstack.client import OpenStackClient
-from plstackapi.openstack.driver import OpenStackDriver
-from plstackapi.core.api.auth import auth_check
+from types import StringTypes
+from django.contrib.auth import authenticate
+from plstackapi.openstack.manager import OpenStackManager
 from plstackapi.core.models import Sliver, Slice
-from plstackapi.core.api.flavors import _get_flavors
 from plstackapi.core.api.images import _get_images
 from plstackapi.core.api.keys import _get_keys
 from plstackapi.core.api.slices import _get_slices
@@ -12,42 +10,36 @@ from plstackapi.core.api.nodes import _get_nodes
  
 
 def _get_slivers(filter):
+    if isinstance(filter, StringTypes) and filter.isdigit():
+        filter = int(filter)
     if isinstance(filter, int):
         slivers = Sliver.objects.filter(id=filter)
     elif isinstance(filter, StringTypes):
         slivers = Sliver.objects.filter(name=filter)
-    elif isinstance(filer, dict):
+    elif isinstance(filter, dict):
         slivers = Sliver.objects.filter(**filter)
     else:
         slivers = []
     return slivers
  
 def add_sliver(auth, fields):
-    driver = OpenStackDriver(client = auth_check(auth))
+    user = authenticate(username=auth.get('username'),
+                        password=auth.get('password'))
     
-    flavors = _get_flavor(fields.get('flavor'))
-    if flavors: fields['flavor'] = flavors[0]     
     images = _get_images(fields.get('image'))
+    keys = _get_keys(fields.get('key'))
+    slices = _get_slices(fields.get('slice'))
+    deployment_networks = _get_deployment_networks(fields.get('deploymentNetwork'))
+    nodes = _get_nodes(fields.get('node'))
     if images: fields['image'] = images[0]     
-    keys = _get_keys(fields.get('get'))
     if keys: fields['key'] = keys[0]     
-    slices = _get_slices(fields.get('slice'))
     if slices: fields['slice'] = slices[0]     
-    deployment_networks = _get_deployment_networks(field.get('deployment_network'))
-    if deployment_networks: fields['deployment_network'] = deployment_networks[0]     
-    nodes = _get_nodes(fields.get('node'))
-    if nodes: fields['node'] = nodess[0]     
-    
-    sliver = Sliver(**fields)
-    # create quantum sliver
-    sliver = driver.spawn_instance(name=sliver.name,
-                                   key_name = sliver.key.name,
-                                   flavor=sliver.flavor.name,
-                                   image = sliver.image.name,
-                                   hostname = sliver.node.hostname )
-
-    sliver.instance_id=sliver.id
+    if deployment_networks: fields['deploymentNetwork'] = deployment_networks[0]     
+    if nodes: fields['node'] = nodes[0]     
 
+    sliver = Sliver(**fields)
+    auth['tenant'] = sliver.slice.name
+    sliver.os_manager = OpenStackManager(auth=auth, caller = user)    
     sliver.save()
     return sliver
 
@@ -55,15 +47,18 @@ def update_sliver(auth, sliver, **fields):
     return  
 
 def delete_sliver(auth, filter={}):
-    driver = OpenStackDriver(client = auth_check(auth))   
+    user = authenticate(username=auth.get('username'),
+                        password=auth.get('password'))
     slivers = _get_slivers(filter)
     for sliver in slivers:
-        driver.destroy_instance(sliver.sliver_id) 
+        auth['tenant'] = sliver.slice.name 
+        slice.os_manager = OpenStackManager(auth=auth, caller = user)
         sliver.delete()
     return 1
 
 def get_slivers(auth, filter={}):
-    client = auth_check(auth)
+    user = authenticate(username=auth.get('username'),
+                        password=auth.get('password'))
     if 'slice' in filter:
         slices = _get_slices(filter.get('slice'))
         if slices: filter['slice'] = slices[0]