From 0620b2cbb21714c1a5e485186c46c2c24485ef37 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Wed, 5 Apr 2017 16:23:03 +0800 Subject: unify error message in TestAPI Change-Id: I994feb7bf340c9e48bebe9fdf3dc3a76bc254652 Signed-off-by: SerenaFeng --- testapi/opnfv_testapi/resources/scenario_handlers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'testapi/opnfv_testapi/resources/scenario_handlers.py') diff --git a/testapi/opnfv_testapi/resources/scenario_handlers.py b/testapi/opnfv_testapi/resources/scenario_handlers.py index 9d0233c..bad79fd 100644 --- a/testapi/opnfv_testapi/resources/scenario_handlers.py +++ b/testapi/opnfv_testapi/resources/scenario_handlers.py @@ -1,6 +1,7 @@ import functools import httplib +from opnfv_testapi.common import message from opnfv_testapi.common import raises from opnfv_testapi.resources import handlers import opnfv_testapi.resources.scenario_models as models @@ -82,8 +83,7 @@ class ScenariosCLHandler(GenericScenarioHandler): return {'name': data.name} def error(data): - message = '{} already exists as a scenario'.format(data.name) - return httplib.FORBIDDEN, message + return httplib.FORBIDDEN, message.exist('scenario', data.name) miss_checks = ['name'] db_checks = [(self.table, False, query, error)] @@ -184,7 +184,7 @@ class ScenarioGURHandler(GenericScenarioHandler): def _update_requests_rename(self, data): data.name = self._term.get('name') if not data.name: - raises.BadRequest("new scenario name is not provided") + raises.BadRequest(message.missing('name')) def _update_requests_add_installer(self, data): data.installers.append(models.ScenarioInstaller.from_dict(self._term)) -- cgit 1.2.3-korg