From: Paulo Vital <pvital@linux.vnet.ibm.com> Move the KCHASYNC0003E ("Timeout of %(seconds)s seconds expired while running task '%(task)s.") message error from Kimchi to Wok and update its code to WOKASYNC0003E. Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- plugins/kimchi/i18n.py | 2 -- src/wok/i18n.py | 2 ++ src/wok/model/tasks.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/kimchi/i18n.py b/plugins/kimchi/i18n.py index 253f00d..23b6f96 100644 --- a/plugins/kimchi/i18n.py +++ b/plugins/kimchi/i18n.py @@ -25,8 +25,6 @@ _ = gettext.gettext messages = { "KCHAPI0001E": _("Unknown parameter %(value)s"), - "KCHASYNC0003E": _("Timeout of %(seconds)s seconds expired while running task '%(task)s."), - "KCHAUTH0004E": _("User %(user_id)s not found with given LDAP settings."), "KCHDEVS0001E": _('Unknown "_cap" specified'), diff --git a/src/wok/i18n.py b/src/wok/i18n.py index 43a1edf..a6376bd 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -33,6 +33,8 @@ messages = { "WOKASYNC0001E": _("Datastore is not initiated in the model object."), "WOKASYNC0002E": _("Unable to start task due error: %(err)s"), + "WOKASYNC0003E": _("Timeout of %(seconds)s seconds expired while running task '%(task)s."), + "WOKAUTH0001E": _("Authentication failed for user '%(username)s'. [Error code: %(code)s]"), "WOKAUTH0002E": _("You are not authorized to access Kimchi"), diff --git a/src/wok/model/tasks.py b/src/wok/model/tasks.py index 678fdc2..d57c908 100644 --- a/src/wok/model/tasks.py +++ b/src/wok/model/tasks.py @@ -60,5 +60,5 @@ class TaskModel(object): time.sleep(1) - raise TimeoutExpired('KCHASYNC0003E', {'seconds': timeout, + raise TimeoutExpired('WOKASYNC0003E', {'seconds': timeout, 'task': task['target_uri']}) -- 2.4.3