Improve error message for nova unknown status

The current message is obtuse and fails the zbitter
test of good taste.

Change-Id: I12b6904f78452a7dedf3265af4930ba0fc6902a1

diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index dbb66d1335812575ef8f728db1a7e96079194d3b..f2796a6f4566d5265f87cf11cb56b402bbcc130c 100644 (file)
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -311,17 +311,16 @@ class Instance(resource.Resource):
                 fault = getattr(server, 'fault', {})
                 message = fault.get('message', 'Unknown')
                 code = fault.get('code', 500)
-                exc = exception.Error(_("Build of server %(server)s failed: "
-                                        "%(message)s (%(code)s)") %
+                exc = exception.Error(_("Creation of server %(server)s "
+                                        "failed: %(message)s (%(code)s)") %
                                       dict(server=server.name,
                                            message=message,
                                            code=code))
                 raise exc
             else:
-                exc = exception.Error(_('Nova reported unexpected '
-                                        'instance[%(name)s] '
-                                        'status[%(status)s]') %
-                                      dict(name=self.name,
+                exc = exception.Error(_("Creation of server %(server)s failed "
+                                        "with unknown status: %(status)s") %
+                                      dict(server=server.name,
                                            status=server.status))
                 raise exc
         else:

diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py
index 91c075a2a697d1ae2f182bbfe9661ee693c41110..cb96e88cead51049dc70c0d3650e8248048c20ab 100644 (file)
--- a/heat/tests/test_instance.py
+++ b/heat/tests/test_instance.py
@@ -254,7 +254,7 @@ class InstancesTest(HeatTestCase):
                 (return_server, self.FakeVolumeAttach()))
         except exception.Error as e:
             self.assertEqual(
-                'Build of server sample-server2 failed: Unknown (500)',
+                'Creation of server sample-server2 failed: Unknown (500)',
                 str(e))
         else:
             self.fail('Error not raised')