From fd292c9fea3de6e8f53fdbeffd348987359f4193 Mon Sep 17 00:00:00 2001 From: Peter Stachowski Date: Tue, 29 Sep 2015 03:19:27 +0000 Subject: Added enum to elements and admin_alt_demo to tests The Datastore Log Operations have a dependency on ENUM, so it has been added to the elements. There is also a need for an 'admin' user in the alt_demo project, in order to test the functionality fully. This has been added as well. An argument was also added to the cmd_dsvm_gate_tests method to facilitate running the scenario tests in the check/gate. Partially implements: blueprint datastore-log-operations Change-Id: Id449582954b0e3a7e95ef15418bdab3995cb7097 --- scripts/conf/test_begin.conf | 9 +++++++++ scripts/files/requirements/fedora-requirements-default.txt | 1 + scripts/files/requirements/ubuntu-requirements-default.txt | 1 + scripts/redstack | 11 ++++++----- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/scripts/conf/test_begin.conf b/scripts/conf/test_begin.conf index ceb8f02..3543799 100644 --- a/scripts/conf/test_begin.conf +++ b/scripts/conf/test_begin.conf @@ -64,6 +64,15 @@ "services": ["trove"] } }, + { "auth_user":"admin_alt_demo", + "auth_key":"%admin_password%", + "tenant":"alt_demo", + "tenant_id":"%alt_demo_tenant_id%", + "requirements": { + "is_admin":true, + "services": ["swift"] + } + }, { "auth_user":"demo", "auth_key":"%admin_password%", "tenant":"demo", diff --git a/scripts/files/requirements/fedora-requirements-default.txt b/scripts/files/requirements/fedora-requirements-default.txt index 82ff409..8888745 100644 --- a/scripts/files/requirements/fedora-requirements-default.txt +++ b/scripts/files/requirements/fedora-requirements-default.txt @@ -24,3 +24,4 @@ oslo.log>=1.8.0 # Apache-2.0 osprofiler>=0.3.0 oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 pexpect>=3.1,!=3.3 +enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD diff --git a/scripts/files/requirements/ubuntu-requirements-default.txt b/scripts/files/requirements/ubuntu-requirements-default.txt index b094e2f..72795a7 100644 --- a/scripts/files/requirements/ubuntu-requirements-default.txt +++ b/scripts/files/requirements/ubuntu-requirements-default.txt @@ -23,3 +23,4 @@ oslo.service>=0.1.0 # Apache-2.0 oslo.utils>=1.1.0 osprofiler>=0.3.0 oslo.concurrency>=0.3.0 +enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD diff --git a/scripts/redstack b/scripts/redstack index b2004f8..c68de7c 100755 --- a/scripts/redstack +++ b/scripts/redstack @@ -1087,10 +1087,11 @@ function cmd_kick_start() { function cmd_dsvm_gate_tests() { DATASTORE_TYPE=${1:-'mysql'} - HOST_SCP_USERNAME=${2:-'jenkins'} - GUEST_USERNAME=${3:-'ubuntu'} - NETWORK_GATEWAY=${4:-'10.1.0.1'} - ESCAPED_PATH_TROVE=${5:-'\/opt\/stack\/new\/trove'} + TEST_GROUP=${2:-${DATASTORE_TYPE}} + HOST_SCP_USERNAME=${3:-'jenkins'} + GUEST_USERNAME=${4:-'ubuntu'} + NETWORK_GATEWAY=${5:-'10.1.0.1'} + ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'} if [[ $BRANCH_OVERRIDE == "stable/liberty" || $BRANCH_OVERRIDE == "stable/liberty" ]]; then # Devstack in liberty doesn't copy the clouds.yaml file to /etc so we need to @@ -1132,7 +1133,7 @@ function cmd_dsvm_gate_tests() { echo $SWIFT_ENDPOINTS | xargs -n 1 openstack endpoint delete $OS_CLIENT_ARGS fi - cmd_int_tests --group=$DATASTORE_TYPE + cmd_int_tests --group=$TEST_GROUP } function cmd_reset_task() { -- cgit v1.2.1