Merge "Cluster status fix when error during vms starting"

savanna/service/api.py

@@ -97,12 +97,13 @@ def _cluster_creation_job(headers, cluster_id):
               _cluster(cluster).dict)
 
     if CONF.allow_cluster_ops:
-        cluster_ops.launch_cluster(headers, cluster)
+        launched = cluster_ops.launch_cluster(headers, cluster)
     else:
         LOG.info("Cluster ops are disabled, use --allow-cluster-ops flag")
+        launched = True
 
-    # update cluster status
-    storage.update_cluster_status('Active', id=cluster.id)
+    if launched:
+        storage.update_cluster_status('Active', id=cluster.id)
 
 
 def terminate_cluster(headers, **args):

savanna/service/cluster_ops.py

@@ -155,7 +155,7 @@ def launch_cluster(headers, cluster):
             _launch_node(nova, node, clmap['image'])
     except Exception, e:
         _rollback_cluster_creation(cluster, clmap, nova, e)
-        return
+        return False
 
     all_set = False
 
@@ -186,6 +186,8 @@ def launch_cluster(headers, cluster):
 
     _start_cluster(cluster, clmap)
 
+    return True
+
 
 def _launch_node(nova, node, image):
     srv = nova.servers.create(node['name'], image, node['flavor'])

savanna/tests/unit/base.py

@@ -52,6 +52,8 @@ def _stub_launch_cluster(headers, cluster):
         DB.session.add(Node(vm_id, cluster.id, elem))
         LOG.debug("VM '%s/%s/%s' created", ip, vm_id, elem)
 
+    return True
+
 
 def _stub_stop_cluster(headers, cluster):
     LOG.debug("stub stop_cluster called with %s, %s", headers, cluster)

savanna/tests/unit/test_api_v02.py

@@ -23,7 +23,7 @@ from savanna.tests.unit.base import SavannaTestCase
 LOG = logging.getLogger(__name__)
 
 
-class TestApi(SavannaTestCase):
+class TestApiV02(SavannaTestCase):
 
     def test_list_node_templates(self):
         rv = self.app.get('/v0.2/some-tenant-id/node-templates.json')