Merge "HTTP 400 instead of 500 when Unicode Bay name"

magnum/conductor/handlers/bay_conductor.py

@@ -11,6 +11,8 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+
+import six
 import uuid
 
 from heatclient.common import template_utils
@@ -150,7 +152,7 @@ class Handler(object):
                                           bay_create_timeout)
         except exc.HTTPBadRequest as e:
             cert_manager.delete_certificates_from_bay(bay)
-            raise exception.InvalidParameterValue(message=str(e))
+            raise exception.InvalidParameterValue(message=six.text_type(e))
         except Exception:
             raise
 

magnum/tests/unit/conductor/handlers/test_bay_conductor.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 # Copyright 2014 NEC Corporation.  All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -11,6 +13,8 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+
+import six
 import uuid
 
 from heatclient import exc
@@ -168,6 +172,27 @@ class TestHandler(db_base.DbTestCase):
             self.bay)
         mock_cert_manager.delete_certificates_from_bay(self.bay)
 
+    @patch('magnum.conductor.handlers.bay_conductor.cert_manager')
+    @patch('magnum.conductor.handlers.bay_conductor._create_stack')
+    @patch('magnum.conductor.handlers.bay_conductor.uuid')
+    def test_create_with_invalid_unicode_name(self,
+                                              mock_uuid,
+                                              mock_create_stack,
+                                              mock_cert_manager):
+        timeout = 15
+        test_uuid = uuid.uuid4()
+        mock_uuid.uuid4.return_value = test_uuid
+        error_message = six.u("""Invalid stack name 测试集群-zoyh253geukk
+                              must contain only alphanumeric or "_-."
+                              characters, must start with alpha""")
+        mock_create_stack.side_effect = exc.HTTPBadRequest(error_message)
+
+        self.assertRaises(exception.InvalidParameterValue,
+                          self.handler.bay_create, self.context,
+                          self.bay, timeout)
+        mock_cert_manager.generate_certificates_to_bay.assert_called_once_with(
+            self.bay)
+
     @patch('magnum.common.clients.OpenStackClients')
     def test_bay_delete(self, mock_openstack_client_class):
         osc = mock.MagicMock()