New system tests

- add 4 tests for checking different router types
- add bigger timeout for haproxy
- fix bvt test
- different fixes

Change-Id: Ib5dee87929f31fd9309b66e5af8dee5dba46b879
Partial-Bug: #1508139
This commit is contained in:
Andrey Setyaev 2016-03-09 00:21:36 +00:00
parent ca8edefd1b
commit e34457743d
4 changed files with 549 additions and 320 deletions

@ -1 +1 @@
Subproject commit e9e9ac9f255d85de390fb31c7a7f505ae1b37072
Subproject commit b54b6a58d8d8148d5a434dbf596baa1b0f23e1a5

View File

@ -0,0 +1,14 @@
"""Copyright 2016 Mirantis, Inc.
Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
"""

File diff suppressed because it is too large Load Diff

View File

@ -273,7 +273,8 @@ CheckVariables() {
export VCENTER_CLUSTERS="Cluster1,Cluster2"
fi
if [ -z "${WORKSTATION_SNAPSHOT}" ]; then
export WORKSTATION_SNAPSHOT="nsxv"
echo "Error! WORKSTATION_SNAPSHOT is not set!"
exit 1
fi
if [ -z "${WORKSTATION_USERNAME}" ]; then
echo "Error! WORKSTATION_USERNAME is not set!"
@ -305,9 +306,6 @@ CheckVariables() {
if [ -z "${NSXV_DATACENTER_MOID}" ]; then
export NSXV_DATACENTER_MOID='datacenter-126'
fi
if [ -z "${NSXV_CLUSTER_MOID}" ]; then
export NSXV_CLUSTER_MOID='domain-c131,domain-c133'
fi
if [ -z "${NSXV_RESOURCE_POOL_ID}" ]; then
export NSXV_RESOURCE_POOL_ID='resgroup-134'
fi
@ -362,6 +360,9 @@ CheckVariables() {
fi
# Export settings
if [ -z "${NODE_VOLUME_SIZE}" ]; then
export NODE_VOLUME_SIZE=350
fi
if [ -z "${ADMIN_NODE_MEMORY}" ]; then
export ADMIN_NODE_MEMORY=4096
fi
@ -544,7 +545,7 @@ RunTest() {
if [ "${DRY_RUN}" = "yes" ]; then
echo dos.py erase "${ENV_NAME}"
else
if [ $(dos.py list | grep "^${ENV_NAME}\$") ]; then
if [ "$(dos.py list | grep "^${ENV_NAME}\$")" ]; then
dos.py erase "${ENV_NAME}"
fi
fi
@ -583,7 +584,7 @@ RunTest() {
exit 1
fi
while [ $(virsh net-list | grep $ENV_NAME | wc -l) -ne 5 ];do sleep 10
while [ "$(virsh net-list | grep $ENV_NAME | wc -l)" -ne 5 ];do sleep 10
if ! ps -p $SYSTEST_PID > /dev/null
then
echo System tests exited prematurely, aborting
@ -707,7 +708,7 @@ setup_net() {
# MAIN
# first we want to get variable from command line options
GetoptsVariables ${@}
GetoptsVariables "${@}"
# then we define global variables and there defaults when needed
GlobalVariables