Fix bugs in tacker-setup use. Remove vHello_VES_3Node test.

JIRA: VES-1

Change-Id: I773266eb00f800e36cf110da8cc8c65f9517edab
Signed-off-by: bryan <bryan.sullivan@att.com>

2 files changed, 3 insertions, 432 deletions

diff --git a/tests/vHello_VES.sh b/tests/vHello_VES.sh
index bbddfa5..91d615a 100644
--- a/tests/vHello_VES.sh
+++ b/tests/vHello_VES.sh
@@ -124,7 +124,8 @@ setup () {
   chmod 755 /opt/tacker/*.sh
 
   echo "$0: $(date) tacker-setup part 1"
-  bash utils/tacker-setup.sh init
+  wget https://git.opnfv.org/models/plain/tests/utils/tacker-setup.sh -O /tmp/tacker-setup.sh
+  bash /tmp/tacker-setup.sh init
   if [ $? -eq 1 ]; then fail; fi
 
   echo "$0: $(date) tacker-setup part 2"
@@ -166,8 +167,8 @@ copy_blueprint() {
   fi
 
   echo "$0: $(date) copy tosca-vnfd-hello-ves to blueprints folder"
+  if [[ ! -d /opt/tacker/blueprints ]]; then mkdir /opt/tacker/blueprints; fi
   cp -r blueprints/tosca-vnfd-hello-ves /opt/tacker/blueprints/tosca-vnfd-hello-ves
-  cp $0 /opt/tacker/.
 }
 
 start() {
diff --git a/tests/vHello_VES_3Node.sh b/tests/vHello_VES_3Node.sh
deleted file mode 100644
index cc85ebc..0000000
--- a/tests/vHello_VES_3Node.sh
+++ /dev/null
@@ -1,430 +0,0 @@
-#!/bin/bash
-# Copyright 2016 AT&T Intellectual Property, 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 a 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.
-#
-# What this is: Deployment test for the VES agent and collector based 
-# upon the Tacker Hello World blueprint 
-#
-# Status: this is a work in progress, under test.
-#
-# How to use:
-#   $ git clone https://gerrit.opnfv.org/gerrit/ves
-#   $ cd ves/tests
-#   $ bash vHello_VES.sh [setup|start|run|test|stop|clean] [VDU1|VDU2|VDU3]
-#        [monitor|traffic|pause|nic]
-#   setup: setup test environment
-#   start: install blueprint and run test
-#   run: setup test environment and run test
-#   test: run test tools/scenario - see below
-#   stop: stop test and uninstall blueprint
-#   clean: cleanup after test
-#   Test:
-#     monitor: attach to the collector VM and run the VES Monitor
-#     traffic: generate some traffic
-#     pause: pause the VNF (web server) for a minute to generate a state change
-#       VDU1|VDU2
-#     nic: timed ifdown/ifup to generate a NIC fault report (not yet implemented)
-
-trap 'fail' ERR
-
-pass() {
-  echo "$0: $(date) Hooray!"
-  exit 0
-}
-
-fail() {
-  echo "$0: $(date) Test Failed!"
-  exit 1
-}
-
-get_floating_net () {
-  network_ids=($(neutron net-list|grep -v "+"|grep -v name|awk '{print $2}'))
-  for id in ${network_ids[@]}; do
-      [[ $(neutron net-show ${id}|grep 'router:external'|grep -i "true") != "" ]] && FLOATING_NETWORK_ID=${id}
-  done
-  if [[ $FLOATING_NETWORK_ID ]]; then
-    FLOATING_NETWORK_NAME=$(openstack network show $FLOATING_NETWORK_ID | awk "/ name / { print \$4 }")
-  else
-    echo "$0: $(date) Floating network not found"
-    exit 1
-  fi
-}
-
-try () {
-  count=$1
-  $3
-  while [[ $? -eq 1 && $count -gt 0 ]] 
-  do 
-    sleep $2
-    let count=$count-1
-    $3
-  done
-  if [[ $count -eq 0 ]]; then echo "$0: $(date) Command \"$3\" was not successful after $1 tries"; fi
-}
-
-setup () {
-  echo "$0: $(date) Started"
-  echo "$0: $(date) Setup temp test folder /tmp/tacker and copy this script there"
-  mkdir -p /tmp/tacker
-  chmod 777 /tmp/tacker/
-  cp $0 /tmp/tacker/.
-  chmod 755 /tmp/tacker/*.sh
-
-  echo "$0: $(date) tacker-setup part 1"
-  wget https://git.opnfv.org/cgit/models/plain/tests/utils/tacker-setup.sh -O /tmp/tacker/tacker-setup.sh
-  bash /tmp/tacker/tacker-setup.sh tacker-cli init
-
-  echo "$0: $(date) tacker-setup part 2"
-  CONTAINER=$(sudo docker ps -l | awk "/tacker/ { print \$1 }")
-  dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'`
-  if [ "$dist" == "Ubuntu" ]; then
-    echo "$0: $(date) JOID workaround for Colorado - enable ML2 port security"
-    juju set neutron-api enable-ml2-port-security=true
-
-    echo "$0: $(date) Execute tacker-setup.sh in the container"
-    sudo docker exec -it $CONTAINER /bin/bash /tmp/tacker/tacker-setup.sh tacker-cli setup
-  else
-    echo "$0: $(date) Copy private key to the container (needed for later install steps)"
-    cp ~/.ssh/id_rsa /tmp/tacker/id_rsa
-    echo "$0: $(date) Execute tacker-setup.sh in the container"
-    sudo docker exec -i -t $CONTAINER /bin/bash /tmp/tacker/tacker-setup.sh tacker-cli setup
-  fi
-
-  echo "$0: $(date) reset blueprints folder"
-  if [[ -d /tmp/tacker/blueprints/tosca-vnfd-hello-ves ]]; then rm -rf /tmp/tacker/blueprints/tosca-vnfd-hello-ves; fi
-  mkdir -p /tmp/tacker/blueprints/tosca-vnfd-hello-ves
-
-  echo "$0: $(date) copy tosca-vnfd-hello-ves to blueprints folder"
-  cp -r blueprints/tosca-vnfd-hello-ves /tmp/tacker/blueprints
-
-  # Following two steps are in testing still. The guestfish step needs work.
-
-  #  echo "$0: $(date) Create Nova key pair"
-  #  mkdir -p ~/.ssh
-  #  nova keypair-delete vHello
-  #  nova keypair-add vHello > /tmp/tacker/vHello.pem
-  #  chmod 600 /tmp/tacker/vHello.pem
-  #  pubkey=$(nova keypair-show vHello | grep "Public key:" | sed -- 's/Public key: //g')
-  #  nova keypair-show vHello | grep "Public key:" | sed -- 's/Public key: //g' >/tmp/tacker/vHello.pub
-
-  echo "$0: $(date) Inject key into xenial server image"
-  #  wget http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
-  #  sudo yum install -y libguestfs-tools
-  #  guestfish <<EOF
-#add xenial-server-cloudimg-amd64-disk1.img
-#run
-#mount /dev/sda1 /
-#mkdir /home/ubuntu
-#mkdir /home/ubuntu/.ssh
-#cat <<EOM >/home/ubuntu/.ssh/authorized_keys
-#$pubkey
-#EOM
-#exit
-#chown -R ubuntu /home/ubuntu
-#EOF
-
-  # Using pre-key-injected image for now, vHello.pem as provided in the blueprint
-  if [ ! -f /tmp/xenial-server-cloudimg-amd64-disk1.img ]; then 
-    wget -O /tmp/xenial-server-cloudimg-amd64-disk1.img  http://artifacts.opnfv.org/models/images/xenial-server-cloudimg-amd64-disk1.img
-  fi
-  cp blueprints/tosca-vnfd-hello-ves/vHello.pem /tmp/tacker
-  chmod 600 /tmp/tacker/vHello.pem
-
-  echo "$0: $(date) setup OpenStack CLI environment"
-  source /tmp/tacker/admin-openrc.sh
-
-  echo "$0: $(date) Setup image_id"
-  image_id=$(openstack image list | awk "/ models-xenial-server / { print \$2 }")
-  if [[ -z "$image_id" ]]; then glance --os-image-api-version 1 image-create --name models-xenial-server --disk-format qcow2 --file /tmp/xenial-server-cloudimg-amd64-disk1.img --container-format bare; fi
-
-  echo "$0: $(date) Completed"
-}
-
-start() {
-  echo "$0: $(date) Started"
-  echo "$0: $(date) setup OpenStack CLI environment"
-  source /tmp/tacker/admin-openrc.sh
-
-  echo "$0: $(date) create VNFD"
-  cd /tmp/tacker/blueprints/tosca-vnfd-hello-ves
-  tacker vnfd-create --vnfd-file blueprint.yaml --name hello-ves
-  if [ $? -eq 1 ]; then fail; fi
-
-  echo "$0: $(date) create VNF"
-  tacker vnf-create --vnfd-name hello-ves --name hello-ves
-  if [ $? -eq 1 ]; then fail; fi
-
-  echo "$0: $(date) wait for hello-ves to go ACTIVE"
-  active=""
-  while [[ -z $active ]]
-  do
-    active=$(tacker vnf-show hello-ves | grep ACTIVE)
-    if [ "$(tacker vnf-show hello-ves | grep -c ERROR)" == "1" ]; then 
-      echo "$0: $(date) hello-ves VNF creation failed with state ERROR"
-      fail
-    fi
-    sleep 10
-  done
-
-  echo "$0: $(date) directly set port security on ports (bug/unsupported in Mitaka Tacker?)"
-  vdus="VDU1 VDU2 VDU3 VDU4"
-  vdui="1 2 3 4"
-  declare -a vdu_id=()
-  declare -a vdu_ip=()
-  declare -a vdu_url=()
-  HEAT_ID=$(tacker vnf-show hello-ves | awk "/instance_id/ { print \$4 }")
-  vdu_id[1]=$(openstack stack resource list $HEAT_ID | awk "/VDU1 / { print \$4 }")
-  vdu_id[2]=$(openstack stack resource list $HEAT_ID | awk "/VDU2 / { print \$4 }")
-  vdu_id[3]=$(openstack stack resource list $HEAT_ID | awk "/VDU3 / { print \$4 }")
-  vdu_id[4]=$(openstack stack resource list $HEAT_ID | awk "/VDU4 / { print \$4 }")
-
-cat >/tmp/grep <<EOF
-${vdu_id[1]}
-${vdu_id[2]}
-${vdu_id[3]}
-${vdu_id[4]}
-EOF
-  id=($(neutron port-list|grep -v "+"|grep -v name|awk '{print $2}'))
-  for id in ${id[@]}; do
-    if [[ $(neutron port-show $id | grep -f /tmp/grep) ]]; then 
-      neutron port-update ${id} --port-security-enabled=True
-    fi
-  done
-
-  echo "$0: $(date) directly assign security group (unsupported in Mitaka Tacker)"
-  if [[ $(openstack security group list | awk "/ vHello / { print \$2 }") ]]; then openstack security group delete vHello; fi
-  openstack security group create vHello
-  openstack security group rule create --ingress --protocol TCP --dst-port 22:22 vHello
-  openstack security group rule create --ingress --protocol TCP --dst-port 80:80 vHello
-  for i in $vdui; do
-    openstack server add security group ${vdu_id[$i]} vHello
-    openstack server add security group ${vdu_id[$i]} default
-  done
-
-  echo "$0: $(date) associate floating IPs"
-  get_floating_net
-  for i in $vdui; do
-    vdu_ip[$i]=$(openstack floating ip create $FLOATING_NETWORK_NAME | awk "/floating_ip_address/ { print \$4 }")
-    nova floating-ip-associate ${vdu_id[$i]} ${vdu_ip[$i]}
-  done
-
-  echo "$0: $(date) get web server addresses"
-  vdu_url[1]="http://${vdu_ip[1]}"
-  vdu_url[2]="http://${vdu_ip[3]}"
-  vdu_url[3]="http://${vdu_ip[3]}"
-  vdu_url[4]="http://${vdu_ip[4]}:30000/eventListener/v1"
-
-  if [[ -f /tmp/tacker/id_rsa ]]; then
-    echo "$0: $(date) setup private key for ssh to hypervisors"
-    cp -p /tmp/tacker/id_rsa ~/.ssh/id_rsa
-    chown root ~/.ssh/id_rsa
-    chmod 600 ~/.ssh/id_rsa
-  fi
-
-  echo "$0: $(date) start collectd agent on bare metal hypervisor hosts"
-  hosts=($(openstack hypervisor list | grep -v Hostname | grep -v "+" | awk '{print $4}'))
-  for host in ${hosts[@]}; do
-    ip=$(openstack hypervisor show $host | grep host_ip | awk '{print $4}')
-    if [[ "$OS_CLOUDNAME" == "overcloud" ]]; then 
-      u="heat-admin"
-      p=""
-    else 
-      u="ubuntu"
-      p=":ubuntu"
-    fi
-    scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no /tmp/tacker/blueprints/tosca-vnfd-hello-ves/start.sh $u@$ip:/home/$u/start.sh
-    ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $u$p@$ip \
-      "nohup bash /home/$u/start.sh collectd $ip ${vdu_ip[4]} hello world > /dev/null 2>&1 &"
-  done
-
-  echo "$0: $(date) wait 30 seconds for server SSH to be available"
-  sleep 30
-
-  echo "$0: $(date) Copy startup script to the VMs"
-  for i in $vdui; do
-    ssh -i /tmp/tacker/vHello.pem -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@${vdu_ip[$i]} "sudo chown ubuntu /home/ubuntu"
-    scp -i /tmp/tacker/vHello.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no /tmp/tacker/blueprints/tosca-vnfd-hello-ves/start.sh ubuntu@${vdu_ip[$i]}:/home/ubuntu/start.sh
-  done
-
-  echo "$0: $(date) start vHello webserver in VDU1 at ${vdu_ip[1]}"
-  ssh -i /tmp/tacker/vHello.pem -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
-    ubuntu@${vdu_ip[1]} "nohup bash /home/ubuntu/start.sh webserver ${vdu_id[1]} ${vdu_ip[4]} hello world > /dev/null 2>&1 &"
-
-  echo "$0: $(date) start vHello webserver in VDU2 at ${vdu_ip[2]}"
-  ssh -i /tmp/tacker/vHello.pem -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
-    ubuntu@${vdu_ip[2]} "nohup bash /home/ubuntu/start.sh webserver ${vdu_id[2]} ${vdu_ip[4]} hello world > /dev/null 2>&1 &"
-
-  echo "$0: $(date) start LB in VDU3 at ${vdu_ip[3]}"
-  ssh -i /tmp/tacker/vHello.pem -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
-    ubuntu@${vdu_ip[3]} "nohup bash /home/ubuntu/start.sh lb ${vdu_id[3]} ${vdu_ip[4]} hello world ${vdu_ip[1]} ${vdu_ip[2]} > /dev/null 2>&1 &"
-
-  echo "$0: $(date) start Monitor in VDU4 at ${vdu_ip[4]}"
-  # Replacing the default collector with monitor.py which has processing logic as well
-  scp -i /tmp/tacker/vHello.pem -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no /tmp/tacker/blueprints/tosca-vnfd-hello-ves/monitor.py ubuntu@${vdu_ip[4]}:/home/ubuntu/monitor.py
-  ssh -i /tmp/tacker/vHello.pem -t -t -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@${vdu_ip[4]} "bash /home/ubuntu/start.sh monitor ${vdu_id[1]} ${vdu_id[2]} ${vdu_id[3]} hello world"
-
-#  echo "$0: $(date) verify vHello server is running at http://${vdu_ip[3]}"
-#  apt-get install -y curl
-#  count=10
-#  while [[ $count -gt 0 ]] 
-#  do 
-#    sleep 60
-#    let count=$count-1
-#    if [[ $(curl http://${vdu_ip[3]} | grep -c "Hello World") > 0 ]]; then pass; fi
-#  done
-#  fail
-}
-
-stop() {
-  echo "$0: $(date) setup OpenStack CLI environment"
-  source /tmp/tacker/admin-openrc.sh
-
-  echo "$0: $(date) uninstall vHello blueprint via CLI"
-  vid=($(tacker vnf-list|grep hello-ves|awk '{print $2}')); for id in ${vid[@]}; do tacker vnf-delete ${id};  done
-  vid=($(tacker vnfd-list|grep hello-ves|awk '{print $2}')); for id in ${vid[@]}; do tacker vnfd-delete ${id};  done
-# Need to remove the floatingip deletion or make it specific to the vHello VM
-  fip=($(neutron floatingip-list|grep -v "+"|grep -v id|awk '{print $2}')); for id in ${fip[@]}; do neutron floatingip-delete ${id};  done
-  sg=($(openstack security group list|grep vHello|awk '{print $2}'))
-  for id in ${sg[@]}; do try 10 5 "openstack security group delete ${id}";  done
-	
-  echo "$0: $(date) remove collectd agent on bare metal hypervisor hosts"
-  hosts=($(openstack hypervisor list | grep -v Hostname | grep -v "+" | awk '{print $4}'))
-  for host in ${hosts[@]}; do
-    ip=$(openstack hypervisor show $host | grep host_ip | awk '{print $4}')
-    if [[ "$OS_CLOUDNAME" == "overcloud" ]]; then 
-      u="heat-admin"
-      p=""
-    else 
-      u="ubuntu"
-      p=":ubuntu"
-    fi
-    ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $u$p@$ip <<'EOF'
-dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'`
-if [ "$dist" == "Ubuntu" ]; then 
-  sudo service collectd stop
-  sudo apt-get remove -y collectd
-  sudo rm /etc/collectd/collectd.conf
-else
-  sudo service collectd stop
-  sudo yum remove -y collectd
-  sudo rm /etc/collectd.conf
-fi
-rm -rf $HOME/OpenStackBarcelonaDemo
-EOF
-  done
-}
-
-#
-# Test tools and scenarios
-#
-
-get_vdu_ip () {
-  source /tmp/tacker/admin-openrc.sh
-
-  echo "$0: $(date) find VM IP for $1"
-  ip=$(openstack server list | awk "/$1/ { print \$10 }")
-}
-
-monitor () {
-  echo "$0: $(date) Start the VES Monitor in VDU4 - Stop first if running"
-  get_vdu_ip VDU4
-  sudo cp /tmp/tacker/vHello.pem /tmp/vHello.pem
-  sudo chown $USER:$USER /tmp/vHello.pem
-  chmod 600 /tmp/vHello.pem
-  ssh -t -t -i /tmp/vHello.pem -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@$ip << 'EOF'
-sudo kill $(ps -ef | grep evel-test-collector | awk '{print $2}')
-python monitor.py --config evel-test-collector/config/collector.conf --section default 
-EOF
-}
-
-traffic () {
-  echo "$0: $(date) Generate some traffic, somewhat randomly"
-  get_vdu_ip VDU3
-  ns="0 00 000"
-  while true
-  do
-    for n in $ns; do
-      sleep .$n$[ ( $RANDOM % 10 ) + 1 ]s
-      curl -s http://$ip > /dev/null
-    done
-  done
-}
-
-pause () {
-  echo "$0: $(date) Pause the VNF (web server) in $1 for 30 seconds to generate a state change fault report (Stopped)"
-  get_vdu_ip $1
-  ssh -i /tmp/vHello.pem -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@$ip "sudo docker pause vHello"
-  sleep 20
-  echo "$0: $(date) Unpausing the VNF to generate a state change fault report (Started)"
-  ssh -i /tmp/vHello.pem -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ubuntu@$ip "sudo docker unpause vHello"
-}
-
-forward_to_container () {
-  echo "$0: $(date) pass $1 command to this script in the tacker container"
-  CONTAINER=$(sudo docker ps -a | awk "/tacker/ { print \$1 }")
-  sudo docker exec $CONTAINER /bin/bash /tmp/tacker/vHello_VES.sh $1 $1
-  if [ $? -eq 1 ]; then fail; fi
-}
-
-dist=`grep DISTRIB_ID /etc/*-release | awk -F '=' '{print $2}'`
-case "$1" in
-  setup)
-    setup
-    pass
-    ;;
-  run)
-    setup
-    forward_to_container start
-    pass
-    ;;
-  start|stop)
-    if [[ $# -eq 1 ]]; then forward_to_container $1
-    else
-      # running inside the tacker container, ready to go
-      $1
-    fi
-    pass
-    ;;
-  traffic)
-    $1
-    pass
-    ;;
-  test)
-    $2 $3
-    ;;
-  clean)
-    echo "$0: $(date) Uninstall Tacker and test environment"
-    bash /tmp/tacker/tacker-setup.sh $1 clean
-    pass
-    ;;
-  *)
-    echo "usage: bash vHello_VES.sh [setup|start|run|clean]"
-    echo "setup: setup test environment"
-    echo "start: install blueprint and run test"
-    echo "run: setup test environment and run test"
-    echo "stop: stop test and uninstall blueprint"
-    echo "clean: cleanup after test"
-    echo "usage: bash vHello_VES.sh [setup|start|run|test|stop|clean] [monitor|traffic|pause|nic]"
-    echo "setup: setup test environment"
-    echo "start: install blueprint and run test"
-    echo "run: setup test environment and run test"
-    echo "test: run test tools/scenario - see below"
-    echo "stop: stop test and uninstall blueprint"
-    echo "clean: cleanup after test"
-    echo "Test:"
-    echo "  monitor: attach to the collector VM and run the VES Monitor"
-    echo "  traffic: generate some traffic"
-    echo "  pause: pause the VNF (web server) for a minute to generate a state change"
-    fail
-esac