Merge "Clarify REST field valiation error"

This commit is contained in:
Zuul 2018-11-27 13:59:49 +00:00 committed by Gerrit Code Review
commit c4ccb70feb
3 changed files with 33 additions and 5 deletions

View File

@ -703,10 +703,9 @@ class TestWorkflowsController(base.APITest):
self.assertEqual(400, resp.status_int)
self.assertIn(
"nonexist are invalid",
resp.body.decode()
)
response_msg = resp.body.decode()
self.assertIn("nonexist", response_msg)
self.assertIn("do not exist", response_msg)
def test_validate(self):
resp = self.app.post(

View File

@ -0,0 +1,27 @@
# Copyright 2018 - Nokia, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from wsme import exc as wsme_exc
from mistral.tests.unit import base
from mistral.utils import rest_utils
class RestUtilsTest(base.BaseTest):
def test_validate_fields(self):
rest_utils.validate_fields(["a", "b"], ["a", "b", "c"])
e = self.assertRaises(wsme_exc.ClientSideError,
rest_utils.validate_fields, ["d"], ["a"])
self.assertIn("[d]", str(e))

View File

@ -1,5 +1,6 @@
# Copyright 2014 - Mirantis, Inc.
# Copyright 2016 - Brocade Communications Systems, Inc.
# Copyright 2018 - Nokia, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -115,7 +116,8 @@ def validate_fields(fields, object_fields):
if invalid_fields:
raise wsme_exc.ClientSideError(
'Field(s) %s are invalid.' % ', '.join(invalid_fields)
'Some fields do not exist [%s], please choose from [%s]' %
(', '.join(invalid_fields), ', '.join(object_fields))
)