diff --git a/nailgun/nailgun/api/v1/validators/base.py b/nailgun/nailgun/api/v1/validators/base.py index 8c7be3dc62..4775805fd1 100644 --- a/nailgun/nailgun/api/v1/validators/base.py +++ b/nailgun/nailgun/api/v1/validators/base.py @@ -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): diff --git a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py index d7e964e5bb..a8661ab816 100644 --- a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py +++ b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py @@ -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): diff --git a/nailgun/nailgun/test/integration/test_orchestrator_handlers.py b/nailgun/nailgun/test/integration/test_orchestrator_handlers.py index 048602b918..3e6416cf3a 100644 --- a/nailgun/nailgun/test/integration/test_orchestrator_handlers.py +++ b/nailgun/nailgun/test/integration/test_orchestrator_handlers.py @@ -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):