From 842261043f74b35c61889ee886e480dd280a5c0d Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Mon, 28 Aug 2017 06:11:23 +0000 Subject: Launch Functest RestApi once the container is run And fix the handling about env prepare exception. Change-Id: I3e590e63157182c442602367a244d7ff647f8b7d Signed-off-by: Linda Wang --- docker/Dockerfile | 2 ++ functest/api/resources/v1/envs.py | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5fa4340fd..45dc21e51 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -108,3 +108,5 @@ RUN sh -c 'curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -' \ && cd /src/promise/source && npm install RUN echo ". ${FUNCTEST_DIR}/cli/functest-complete.sh" >> /root/.bashrc + +CMD ["functest_restapi"] diff --git a/functest/api/resources/v1/envs.py b/functest/api/resources/v1/envs.py index fb76fa63f..8020544fb 100644 --- a/functest/api/resources/v1/envs.py +++ b/functest/api/resources/v1/envs.py @@ -33,10 +33,11 @@ class V1Envs(ApiResource): def prepare(self, args): # pylint: disable=no-self-use, unused-argument """ Prepare environment """ - try: - ft_utils.execute_command("prepare_env start") - except Exception as err: # pylint: disable=broad-except - return api_utils.result_handler(status=1, data=str(err)) + + result_env = ft_utils.execute_command("prepare_env start") + if not result_env == 0: + return api_utils.result_handler( + status=1, data="Failed to prepare env") return api_utils.result_handler( status=0, data="Prepare env successfully") -- cgit 1.2.3-korg