openstack
/
fuel-web
Code Issues Proposed changes

Merge "Message about no tasks to run deploy is fixed"

This commit is contained in:
Jenkins 2017-01-09 11:36:48 +00:00 committed by Gerrit Code Review
parent 068c864edc f114668642
commit 45cf129e61
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nailgun/nailgun/api/v1/validators/base.py
View File

@ -111,10 +111,9 @@ class BasicValidator(object):
and not objects.Cluster.get_deployment_tasks(
cluster, graph_type)):
raise errors.NoDeploymentTasks(
"Deployment tasks not found for '{0}' release in the "
"database. Please upload them. If you're operating "
"from Fuel Master node, please check '/etc/puppet' "
"directory.".format(cluster.release.name))
"There are no deployment tasks for graph type '{}'. "
"Checked cluster (ID={}), its plugins and release (ID={})."
"".format(graph_type, cluster.id, cluster.release.id))
@classmethod
def validate_ids_list(cls, data):

2
nailgun/nailgun/test/integration/test_cluster_changes_handler.py
View File

@ -1684,7 +1684,7 @@ class TestHandlers(BaseIntegrationTest):
expect_errors=True)
self.assertEqual(resp.status_code, 400)
self.assertIn("Deployment tasks not found", resp.body)
self.assertIn("There are no deployment tasks", resp.body)
@mock_rpc()
def test_enough_osds_for_ceph(self):

4
nailgun/nailgun/test/integration/test_orchestrator_handlers.py
View File

@ -493,8 +493,8 @@ class TestSelectedNodesAction(BaseSelectedNodesTest):
self.assertFalse(mcast.called)
self.assertEqual(resp.status_code, 400)
self.assertIn("Deployment tasks not found", resp_msg)
self.assertIn(self.cluster.release.name, resp_msg)
self.assertIn("There are no deployment tasks", resp_msg)
self.assertIn('={})'.format(self.cluster.release.id), resp_msg)
class TestCustomGraphAction(BaseSelectedNodesTest):