From 7a413d26a8dcb34a135e5f85d36a2b0760139b86 Mon Sep 17 00:00:00 2001 From: Craig Bryant Date: Tue, 11 Nov 2014 13:17:38 -0700 Subject: [PATCH] Do not set MONASCA_API_URL Let it be retrieved from keystone so that part of the CLI gets tested Change-Id: I9dfa10605951280b65b2da976ba79fb39e49953e --- tests/env.sh | 2 -- tests/smoke.py | 1 - tests/utils.py | 1 - 3 files changed, 4 deletions(-) diff --git a/tests/env.sh b/tests/env.sh index 4ebe714..8223b77 100644 --- a/tests/env.sh +++ b/tests/env.sh @@ -4,5 +4,3 @@ export OS_USERNAME=mini-mon export OS_PASSWORD=password export OS_PROJECT_NAME=mini-mon export OS_AUTH_URL=http://192.168.10.5:35357/v3/ - -export MONASCA_API_URL=http://192.168.10.4:8080/v2.0/ diff --git a/tests/smoke.py b/tests/smoke.py index d5fd29d..b01cebe 100755 --- a/tests/smoke.py +++ b/tests/smoke.py @@ -24,7 +24,6 @@ OS_PASSWORD OS_PROJECT_NAME OS_AUTH_URL - MONASCA_API_URL TODO: 1. Add more logic to give ideas of why a particular step failed, for diff --git a/tests/utils.py b/tests/utils.py index 5b51bfc..e583092 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -96,7 +96,6 @@ def setup_cli(): set_if_not_env('OS_PASSWORD', OS_PASSWORD) set_if_not_env('OS_PROJECT_NAME', OS_PROJECT_NAME) set_if_not_env('OS_AUTH_URL', OS_AUTH_URL) - set_if_not_env('MONASCA_API_URL', 'http://' + api_host + ':8080/v2.0/') os.environ['http_proxy'] = '' os.environ['https_proxy'] = '' os.environ['HTTP_PROXY'] = ''