From 6790e17eb7c1a3eaaccfe97ac90932e3c15eea6d Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Wed, 4 May 2016 11:47:40 +0200 Subject: Refactor improvements JIRA: FUNCTEST-190 - Deleted unnecessary old scripts - Fixed healtcheck logging - Moved config_functest.yaml to /ci/ - Created env var CONFIG_FUNCTEST_YAML pointing to that new location - Modified all scripts which open config_functest.yaml using the new env var Change-Id: Ic4f0e40a70c02ac08287a1d621956f602bdee177 Signed-off-by: jose.lausuch --- .../VIM/OpenStack/CI/libraries/healthcheck.sh | 94 +++++++++++++++------- .../VIM/OpenStack/CI/libraries/run_rally-cert.py | 2 +- .../VIM/OpenStack/CI/libraries/run_tempest.py | 2 +- 3 files changed, 68 insertions(+), 30 deletions(-) (limited to 'testcases/VIM') diff --git a/testcases/VIM/OpenStack/CI/libraries/healthcheck.sh b/testcases/VIM/OpenStack/CI/libraries/healthcheck.sh index 9d3559b20..611c100c5 100755 --- a/testcases/VIM/OpenStack/CI/libraries/healthcheck.sh +++ b/testcases/VIM/OpenStack/CI/libraries/healthcheck.sh @@ -16,14 +16,31 @@ set -e +#Redirect all the output (stdout) to a log file and show only possible errors. +LOG_FILE=/home/opnfv/functest/results/healthcheck.log +echo "">$LOG_FILE +exec 1<>$LOG_FILE + +info () { + echo -e "$(date '+%Y-%m-%d %H:%M:%S,%3N') - healtcheck - INFO - " "$*" | tee -a $LOG_FILE 1>&2 +} + +debug () { + if [[ "${CI_DEBUG,,}" == "true" ]]; then + echo -e "$(date '+%Y-%m-%d %H:%M:%S,%3N') - healtcheck - DEBUG - " "$*" | tee -a $LOG_FILE 1>&2 + fi +} + +error () { + echo -e "$(date '+%Y-%m-%d %H:%M:%S,%3N') - healtcheck - ERROR - " "$*" | tee -a $LOG_FILE 1>&2 + exit 1 +} + if [ -z $OS_AUTH_URL ]; then echo "Source credentials first." exit 1 fi -#Redirect all the output (stdout) to a log file and show only possible errors. -LOG_FILE=/home/opnfv/functest/results/healthcheck.log -exec 1<>$LOG_FILE echo "Using following credentials:" env | grep OS @@ -62,10 +79,10 @@ function wait_for_ip() { timeout=60 while [[ ${timeout} > 0 ]]; do if [[ $(nova console-log $1|grep "No lease, failing") ]]; then - echo "ERROR: The instance $1 couldn't get an IP from the DHCP agent." | tee -a $LOG_FILE 1>&2 + error "The instance $1 couldn't get an IP from the DHCP agent." | tee -a $LOG_FILE 1>&2 exit 1 elif [[ $(nova console-log $1|grep "^Lease"|grep "obtained") ]]; then - echo "The instance $1 got an IP successfully from the DHCP agent." + debug "The instance $1 got an IP successfully from the DHCP agent." | tee -a $LOG_FILE 1>&2 break fi let timeout=timeout-1 @@ -75,39 +92,47 @@ function wait_for_ip() { ################################# -echo "Testing Keystone API..." | tee -a $LOG_FILE 1>&2 +info "Testing Keystone API..." | tee -a $LOG_FILE 1>&2 ################################# openstack project create ${project_1} +debug "project '${project_1}' created." openstack project create ${project_2} - +debug "project '${project_2}' created." openstack user create ${user_1} --project ${project_1} +debug "user '${user_1}' created in project ${project_1}." openstack user create ${user_2} --project ${project_1} +debug "user '${user_2}' created in project ${project_1}." openstack user create ${user_3} --project ${project_1} +debug "user '${user_3}' created in project ${project_1}." openstack user create ${user_4} --project ${project_2} +debug "user '${user_4}' created in project ${project_2}." openstack user create ${user_5} --project ${project_2} +debug "user '${user_5}' created in project ${project_2}." openstack user create ${user_6} --project ${project_2} - -echo "...OK" | tee -a $LOG_FILE 1>&2 +debug "user '${user_6}' created in project ${project_2}." +info "...Keystone OK!" ################################# -echo "Testing Glance API..." | tee -a $LOG_FILE 1>&2 +info "Testing Glance API..." ################################# image=/home/opnfv/functest/data/cirros-0.3.4-x86_64-disk.img glance image-create --name ${image_1} --disk-format qcow2 --container-format bare < ${image} +debug "image '${image_1}' created." glance image-create --name ${image_2} --disk-format qcow2 --container-format bare < ${image} - -echo "...OK" | tee -a $LOG_FILE 1>&2 +debug "image '${image_2}' created." +info "... Glance OK!" ################################# -echo "Testing Cinder API..." | tee -a $LOG_FILE 1>&2 +info "Testing Cinder API..." ################################# cinder create --display_name ${volume_1} 1 +debug "volume '${volume_1}' created." cinder create --display_name ${volume_2} 10 - -echo "...OK" | tee -a $LOG_FILE 1>&2 +debug "volume '${volume_2}' created." +info "...Cinder OK!" ################################# -echo "Testing Neutron API..." | tee -a $LOG_FILE 1>&2 +info "Testing Neutron API..." ################################# network_ids=($(neutron net-list|grep -v "+"|grep -v name|awk '{print $2}')) @@ -115,56 +140,69 @@ for id in ${network_ids[@]}; do [[ $(neutron net-show ${id}|grep 'router:external'|grep -i "true") != "" ]] && ext_net_id=${id} done if [[ "${ext_net_id}" == "" ]]; then - echo "ERROR: No external network found. Exiting Health Check..." | tee -a $LOG_FILE 1>&2 + error "No external network found. Exiting Health Check..." exit 1 else - echo "External network found. ${ext_net_id}" + info "External network found. ${ext_net_id}" fi -echo "1. Create Networks..." +info "1. Create Networks..." neutron net-create ${net_1} +debug "net '${net_1}' created." neutron net-create ${net_2} +debug "net '${net_2}' created." net1_id=$(neutron net-list | grep ${net_1} | awk '{print $2}') net2_id=$(neutron net-list | grep ${net_2} | awk '{print $2}') -echo "2. Create subnets..." +info "2. Create subnets..." neutron subnet-create --name ${subnet_1} --allocation-pool start=10.6.0.2,end=10.6.0.253 --gateway 10.6.0.254 ${net_1} 10.6.0.0/24 +debug "subnet '${subnet_1}' created." neutron subnet-create --name ${subnet_2} --allocation-pool start=10.7.0.2,end=10.7.0.253 --gateway 10.7.0.254 ${net_2} 10.7.0.0/24 +debug "subnet '${subnet_2}' created." -echo "4. Create Routers..." +info "4. Create Routers..." neutron router-create ${router_1} +debug "router '${router_1}' created." neutron router-create ${router_2} +debug "router '${router_2}' created." neutron router-gateway-set ${router_1} ${ext_net_id} +debug "router '${router_1}' gateway set to ${ext_net_id}." neutron router-gateway-set ${router_2} ${ext_net_id} +debug "router '${router_2}' gateway set to ${ext_net_id}." neutron router-interface-add ${router_1} ${subnet_1} +debug "router '${router_1}' interface added ${subnet_1}." neutron router-interface-add ${router_2} ${subnet_2} +debug "router '${router_2}' interface added ${subnet_2}." -echo "...OK" | tee -a $LOG_FILE 1>&2 +info "...Neutron OK!" ################################# -echo "Testing Nova API..." | tee -a $LOG_FILE 1>&2 +info "Testing Nova API..." ################################# nova boot --flavor 2 --image ${image_1} --nic net-id=${net1_id} ${instance_1} +debug "nova instance '${instance_1}' booted on ${net_1}." nova boot --flavor 2 --image ${image_1} --nic net-id=${net1_id} ${instance_2} +debug "nova instance '${instance_2}' booted on ${net_1}." nova boot --flavor 2 --image ${image_2} --nic net-id=${net2_id} ${instance_3} +debug "nova instance '${instance_3}' booted on ${net_2}." nova boot --flavor 2 --image ${image_2} --nic net-id=${net2_id} ${instance_4} +debug "nova instance '${instance_4}' booted on ${net_2}." vm1_id=$(nova list | grep ${instance_1} | awk '{print $2}') vm2_id=$(nova list | grep ${instance_2} | awk '{print $2}') vm3_id=$(nova list | grep ${instance_3} | awk '{print $2}') vm4_id=$(nova list | grep ${instance_4} | awk '{print $2}') +info "...Nova OK!" -echo "...OK" | tee -a $LOG_FILE 1>&2 - -echo "Checking if instances get an IP from DHCP..." | tee -a $LOG_FILE 1>&2 - +info "Checking if instances get an IP from DHCP..." wait_for_ip ${instance_1} "10.6" wait_for_ip ${instance_2} "10.6" wait_for_ip ${instance_3} "10.7" wait_for_ip ${instance_4} "10.7" +info "...DHCP OK!" -echo "Health check passed!" | tee -a $LOG_FILE 1>&2 +info "Health check passed!" exit 0 diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py index 26e6b8c19..6aa6ee064 100755 --- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py @@ -82,7 +82,7 @@ if not os.path.exists(REPO_PATH): exit(-1) -with open("/home/opnfv/functest/conf/config_functest.yaml") as f: +with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: functest_yaml = yaml.safe_load(f) f.close() diff --git a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py index 3afbbffa6..d29869a04 100644 --- a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py @@ -61,7 +61,7 @@ logger = ft_logger.Logger("run_tempest").getLogger() REPO_PATH = os.environ['repos_dir'] + '/functest/' -with open("/home/opnfv/functest/conf/config_functest.yaml") as f: +with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: functest_yaml = yaml.safe_load(f) f.close() TEST_DB = functest_yaml.get("results").get("test_db_url") -- cgit 1.2.3-korg