removing refrences to flavor

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

diff --git a/plstackapi/core/api/slivers.py b/plstackapi/core/api/slivers.py
index 0fcc191..da5d17f 100644 (file)
--- a/plstackapi/core/api/slivers.py
+++ b/plstackapi/core/api/slivers.py
@@ -3,7 +3,6 @@ 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 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
@@ -27,28 +26,25 @@ def _get_slivers(filter):
 def add_sliver(auth, fields):
     driver = OpenStackDriver(client = auth_check(auth))
     
-    flavors = _get_flavors(fields.get('flavor'))
-    if flavors: fields['flavor'] = flavors[0]     
     images = _get_images(fields.get('image'))
     if images: fields['image'] = images[0]     
-    keys = _get_keys(fields.get('get'))
+    keys = _get_keys(fields.get('key'))
     if keys: fields['key'] = keys[0]     
     slices = _get_slices(fields.get('slice'))
-    if slices: fields['slice'] = slices[0]     
+    if slices: 
+        fields['slice'] = slices[0]     
     deployment_networks = _get_deployment_networks(fields.get('deploymentNetwork'))
     if deployment_networks: fields['deploymentNetwork'] = deployment_networks[0]     
     nodes = _get_nodes(fields.get('node'))
-    if nodes: fields['node'] = nodess[0]     
-    
+    if nodes: fields['node'] = nodes[0]     
     sliver = Sliver(**fields)
     # create quantum sliver
-    sliver = driver.spawn_instance(name=sliver.name,
+    instance = driver.spawn_instance(name=sliver.name,
                                    key_name = sliver.key.name,
-                                   flavor=sliver.flavor.name,
-                                   image = sliver.image.name,
-                                   hostname = sliver.node.hostname )
+                                   image_id = sliver.image.image_id,
+                                   hostname = sliver.node.name )
 
-    sliver.instance_id=sliver.id
+    sliver.instance_id=instance.id
 
     sliver.save()
     return sliver