7 files changed, 299 insertions, 46 deletions
diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index fa4a54df6..3579909c5 100755
--- a/tests/ci/clean_images.sh
+++ b/tests/ci/clean_images.sh
@@ -20,7 +20,7 @@ cleanup()
     fi
 
     for image in $(openstack image list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \
-        -e yardstick-vivid-kernel | awk '{print $2}'); do
+        | awk '{print $2}'); do
         echo "Deleting image $image..."
         openstack image delete $image || true
     done
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index f81ee1b26..4b8f2c0e1 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -15,26 +15,27 @@ set -e
 YARD_IMG_ARCH=amd64
 export YARD_IMG_ARCH
 
-HW_FW_TYPE=""
-if [ "${YARD_IMG_ARCH}" = "arm64" ]; then
-    HW_FW_TYPE=uefi
-fi
-export HW_FW_TYPE
-
 if ! grep -q "Defaults env_keep += \"YARD_IMG_ARCH\"" "/etc/sudoers"; then
-    sudo echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" >> /etc/sudoers
+    echo "Defaults env_keep += \"YARD_IMG_ARCH YARDSTICK_REPO_DIR\"" | sudo tee -a /etc/sudoers
 fi
 
-ARCH_SCRIPT="test -f /etc/fuel_openstack_arch && grep -q arm64 /etc/fuel_openstack_arch"
+# Look for a compute node, that is online, and check if it is aarch64
+ARCH_SCRIPT="ssh \$(fuel2 node list | awk -F'|' '\$6 ~ /compute/ && \$11 ~ /rue/ {print \$7; exit;}') uname -m 2>/dev/null | grep -q aarch64"
 if [ "$INSTALLER_TYPE" == "fuel" ]; then
-    sshpass -p r00tme ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l root $INSTALLER_IP "${ARCH_SCRIPT}" && YARD_IMG_ARCH=arm64
+    sshpass -p r00tme ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l root "${INSTALLER_IP}" "${ARCH_SCRIPT}" && YARD_IMG_ARCH=arm64
 fi
 
+HW_FW_TYPE=""
+if [ "${YARD_IMG_ARCH}" == "arm64" ]; then
+    HW_FW_TYPE=uefi
+fi
+export HW_FW_TYPE
+
 UCA_HOST="cloud-images.ubuntu.com"
 if [ "${YARD_IMG_ARCH}" == "arm64" ]; then
     export CLOUD_IMG_URL="http://${UCA_HOST}/${release}/current/${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz"
     if ! grep -q "Defaults env_keep += \"CLOUD_IMG_URL\"" "/etc/sudoers"; then
-        sudo echo "Defaults env_keep += \"CLOUD_IMG_URL\"" >> /etc/sudoers
+        echo "Defaults env_keep += \"CLOUD_IMG_URL\"" | sudo tee -a /etc/sudoers
     fi
 fi
 
@@ -44,22 +45,24 @@ build_yardstick_image()
     echo "========== Build yardstick cloud image =========="
 
     if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
-        local cmd="sudo $(which yardstick-img-lxd-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh"
+        local cmd
+        cmd="sudo $(which yardstick-img-lxd-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh"
 
         # Build the image. Retry once if the build fails
         $cmd || $cmd
 
-        if [ ! -f $RAW_IMAGE ]; then
+        if [ ! -f "${RAW_IMAGE}" ]; then
             echo "Failed building RAW image"
             exit 1
         fi
     else
-        local cmd="sudo $(which yardstick-img-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh"
+        local cmd
+        cmd="sudo $(which yardstick-img-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh"
 
         # Build the image. Retry once if the build fails
         $cmd || $cmd
 
-        if [ ! -f $QCOW_IMAGE ]; then
+        if [ ! -f "${QCOW_IMAGE}" ]; then
             echo "Failed building QCOW image"
             exit 1
         fi
@@ -71,24 +74,24 @@ load_yardstick_image()
     echo
     echo "========== Loading yardstick cloud image =========="
     EXTRA_PARAMS=""
-    if [[ "${YARD_IMG_ARCH}" = "arm64" && "${YARD_IMG_AKI}" = "true" ]]; then
+    if [[ "${YARD_IMG_ARCH}" == "arm64" && "${YARD_IMG_AKI}" == "true" ]]; then
         CLOUD_IMAGE="/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz"
         CLOUD_KERNEL="/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}-vmlinuz-generic"
         cd /tmp
         if [ ! -f "${CLOUD_IMAGE}" ]; then
-            wget $CLOUD_IMG_URL
+            wget "${CLOUD_IMG_URL}"
         fi
         if [ ! -f "${CLOUD_KERNEL}" ]; then
-            tar zxf $CLOUD_IMAGE $(basename $CLOUD_KERNEL)
+            tar xf "${CLOUD_IMAGE}" "${CLOUD_KERNEL##**/}"
         fi
         create_kernel=$(openstack image create \
                 --public \
                 --disk-format qcow2 \
                 --container-format bare \
-                --file $CLOUD_KERNEL \
+                --file ${CLOUD_KERNEL} \
                 yardstick-${release}-kernel)
 
-        GLANCE_KERNEL_ID=$(echo "$create_kernel" | grep " id " | awk '{print $(NF-1)}')
+        GLANCE_KERNEL_ID=$(echo "$create_kernel" | awk '/ id / {print $(NF-1)}')
         if [ -z "$GLANCE_KERNEL_ID" ]; then
             echo 'Failed uploading kernel to cloud'.
             exit 1
@@ -98,8 +101,8 @@ load_yardstick_image()
 
         EXTRA_PARAMS="--property kernel_id=$GLANCE_KERNEL_ID --property os_command_line=\"$command_line\""
 
-        rm -f $CLOUD_KERNEL $CLOUD_IMAGE
-        cd $YARDSTICK_REPO_DIR
+        rm -f -- "${CLOUD_KERNEL}" "${CLOUD_IMAGE}"
+        cd "${YARDSTICK_REPO_DIR}"
     fi
 
     # VPP requires guest memory to be backed by large pages
@@ -114,18 +117,18 @@ load_yardstick_image()
     if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
         output=$(eval openstack image create \
             --public \
-            --disk-format root-tar \
+            --disk-format raw \
             --container-format bare \
-            $EXTRA_PARAMS \
-            --file $RAW_IMAGE \
+            ${EXTRA_PARAMS} \
+            --file ${RAW_IMAGE} \
             yardstick-image)
     else
         output=$(eval openstack image create \
             --public \
             --disk-format qcow2 \
             --container-format bare \
-            $EXTRA_PARAMS \
-            --file $QCOW_IMAGE \
+            ${EXTRA_PARAMS} \
+            --file ${QCOW_IMAGE} \
             yardstick-image)
     fi
 
@@ -138,10 +141,10 @@ load_yardstick_image()
         exit 1
     fi
 
-    if [ "$DEPLOY_SCENARIO" == *"-lxd-"* ]; then
-        sudo rm -f $RAW_IMAGE
+    if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
+        sudo rm -f -- "${RAW_IMAGE}"
     else
-        sudo rm -f $QCOW_IMAGE
+        sudo rm -f -- "${QCOW_IMAGE}"
     fi
 
     echo "Glance image id: $GLANCE_IMAGE_ID"
@@ -163,8 +166,8 @@ load_cirros_image()
     output=$(openstack image create \
         --disk-format qcow2 \
         --container-format bare \
-        $EXTRA_PARAMS \
-        --file $image_file \
+        ${EXTRA_PARAMS} \
+        --file ${image_file} \
         cirros-0.3.3)
     echo "$output"
 
@@ -233,12 +236,12 @@ main()
 
     build_yardstick_image
     load_yardstick_image
-    if [ "${YARD_IMG_ARCH}" = "arm64" ]; then
+    if [ "${YARD_IMG_ARCH}" == "arm64" ]; then
         sed -i 's/image: cirros-0.3.3/image: TestVM/g' tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml \
         samples/ping.yaml
         #We have overlapping IP with the real network
         for filename in tests/opnfv/test_cases/*; do
-            sed -i "s/cidr: '10.0.1.0\/24'/cidr: '10.3.1.0\/24'/g" $filename
+            sed -i "s/cidr: '10.0.1.0\/24'/cidr: '10.3.1.0\/24'/g" "${filename}"
         done
     else
         load_cirros_image
diff --git a/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml
new file mode 100644
index 000000000..6ac1a7523
--- /dev/null
+++ b/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml
@@ -0,0 +1,62 @@
+##############################################################################
+# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+# k8 nosdn nofeature noha daily task suite
+
+schema: "yardstick:suite:0.1"
+
+name: "k8-nosdn-nofeature-noha"
+test_cases_dir: "tests/opnfv/test_cases/"
+test_cases:
+-
+  file_name: opnfv_yardstick_tc002.yaml
+-
+  file_name: opnfv_yardstick_tc005.yaml
+-
+  file_name: opnfv_yardstick_tc010.yaml
+-
+  file_name: opnfv_yardstick_tc011.yaml
+-
+  file_name: opnfv_yardstick_tc012.yaml
+-
+  file_name: opnfv_yardstick_tc014.yaml
+-
+  file_name: opnfv_yardstick_tc037.yaml
+-
+  file_name: opnfv_yardstick_tc055.yaml
+  constraint:
+      installer: compass
+      pod: huawei-pod1
+  task_args:
+      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      "host": "node5.yardstick-TC055"}'
+-
+  file_name: opnfv_yardstick_tc063.yaml
+  constraint:
+      installer: compass
+      pod: huawei-pod1
+  task_args:
+      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      "host": "node5.yardstick-TC063"}'
+-
+  file_name: opnfv_yardstick_tc069.yaml
+-
+  file_name: opnfv_yardstick_tc070.yaml
+-
+  file_name: opnfv_yardstick_tc071.yaml
+-
+  file_name: opnfv_yardstick_tc072.yaml
+-
+  file_name: opnfv_yardstick_tc075.yaml
+  constraint:
+      installer: compass
+      pod: huawei-pod1
+  task_args:
+      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      "host": "node1.LF"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-fdio-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-fdio-ha_daily.yaml
new file mode 100644
index 000000000..c629445e4
--- /dev/null
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-fdio-ha_daily.yaml
@@ -0,0 +1,38 @@
+##############################################################################
+# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+# os-nosdn-fdio-ha daily task suite
+
+schema: "yardstick:suite:0.1"
+
+name: "os-nosdn-fdio-ha"
+test_cases_dir: "tests/opnfv/test_cases/"
+test_cases:
+-
+  file_name: opnfv_yardstick_tc002.yaml
+-
+  file_name: opnfv_yardstick_tc005.yaml
+-
+  file_name: opnfv_yardstick_tc010.yaml
+-
+  file_name: opnfv_yardstick_tc011.yaml
+-
+  file_name: opnfv_yardstick_tc012.yaml
+-
+  file_name: opnfv_yardstick_tc014.yaml
+-
+  file_name: opnfv_yardstick_tc037.yaml
+-
+  file_name: opnfv_yardstick_tc069.yaml
+-
+  file_name: opnfv_yardstick_tc070.yaml
+-
+  file_name: opnfv_yardstick_tc071.yaml
+-
+  file_name: opnfv_yardstick_tc072.yaml
diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-openo-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-openo-ha_daily.yaml
new file mode 100644
index 000000000..49cae7b68
--- /dev/null
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-openo-ha_daily.yaml
@@ -0,0 +1,116 @@
+##############################################################################
+# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+# os nosdn openo ha daily task suite
+
+schema: "yardstick:suite:0.1"
+
+name: "os-nosdn-openo-ha"
+test_cases_dir: "tests/opnfv/test_cases/"
+test_cases:
+-
+    file_name: opnfv_yardstick_tc002.yaml
+-
+    file_name: opnfv_yardstick_tc005.yaml
+-
+    file_name: opnfv_yardstick_tc010.yaml
+-
+    file_name: opnfv_yardstick_tc011.yaml
+-
+    file_name: opnfv_yardstick_tc012.yaml
+-
+    file_name: opnfv_yardstick_tc014.yaml
+-
+    file_name: opnfv_yardstick_tc037.yaml
+-
+    file_name: opnfv_yardstick_tc043.yaml
+    constraint:
+        installer: compass
+        pod: huawei-pod1
+    task_args:
+        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        "host": "node4.LF","target": "node5.LF"}'
+-
+    file_name: opnfv_yardstick_tc045.yaml
+    constraint:
+        installer: fuel
+-
+    file_name: opnfv_yardstick_tc046.yaml
+    constraint:
+        installer: fuel
+-
+    file_name: opnfv_yardstick_tc047.yaml
+    constraint:
+        installer: fuel
+-
+    file_name: opnfv_yardstick_tc048.yaml
+    constraint:
+        installer: fuel
+-
+    file_name: opnfv_yardstick_tc049.yaml
+    constraint:
+        installer: fuel
+-
+    file_name: opnfv_yardstick_tc050.yaml
+    constraint:
+        installer: fuel
+-
+    file_name: opnfv_yardstick_tc051.yaml
+    constraint:
+        installer: fuel
+-
+    file_name: opnfv_yardstick_tc052.yaml
+    constraint:
+        installer: fuel
+-
+    file_name: opnfv_yardstick_tc053.yaml
+    constraint:
+        installer: fuel
+-
+    file_name: opnfv_yardstick_tc055.yaml
+    constraint:
+        installer: compass
+        pod: huawei-pod1
+    task_args:
+        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        "host": "node5.yardstick-TC055"}'
+-
+    file_name: opnfv_yardstick_tc063.yaml
+    constraint:
+        installer: compass
+        pod: huawei-pod1
+    task_args:
+        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        "host": "node5.yardstick-TC063"}'
+-
+    file_name: opnfv_yardstick_tc069.yaml
+-
+    file_name: opnfv_yardstick_tc070.yaml
+-
+    file_name: opnfv_yardstick_tc071.yaml
+-
+    file_name: opnfv_yardstick_tc072.yaml
+-
+    file_name: opnfv_yardstick_tc075.yaml
+    constraint:
+        installer: compass
+        pod: huawei-pod1
+    task_args:
+        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        "host": "node1.LF"}'
+-
+    file_name: opnfv_yardstick_tc027.yaml
+    constraint:
+        installer: compass,fuel
+        pod: huawei-pod1,lf-pod2,ericsson-pod3,ericsson-pod4
+    task_args:
+        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml"}'
+        lf-pod2: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
+        ericsson-pod3: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
+        ericsson-pod4: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l3-fdio-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l3-fdio-noha_daily.yaml
new file mode 100644
index 000000000..3d9efe74b
--- /dev/null
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l3-fdio-noha_daily.yaml
@@ -0,0 +1,38 @@
+##############################################################################
+# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+# os-odl_l3-fdio-noha daily task suite
+
+schema: "yardstick:suite:0.1"
+
+name: "os-odl_l3-fdio-noha"
+test_cases_dir: "tests/opnfv/test_cases/"
+test_cases:
+-
+  file_name: opnfv_yardstick_tc002.yaml
+-
+  file_name: opnfv_yardstick_tc005.yaml
+-
+  file_name: opnfv_yardstick_tc010.yaml
+-
+  file_name: opnfv_yardstick_tc011.yaml
+-
+  file_name: opnfv_yardstick_tc012.yaml
+-
+  file_name: opnfv_yardstick_tc014.yaml
+-
+  file_name: opnfv_yardstick_tc037.yaml
+-
+  file_name: opnfv_yardstick_tc069.yaml
+-
+  file_name: opnfv_yardstick_tc070.yaml
+-
+  file_name: opnfv_yardstick_tc071.yaml
+-
+  file_name: opnfv_yardstick_tc072.yaml
diff --git a/tests/unit/benchmark/contexts/test_node.py b/tests/unit/benchmark/contexts/test_node.py
index 53a8ffa93..4b35ca421 100644
--- a/tests/unit/benchmark/contexts/test_node.py
+++ b/tests/unit/benchmark/contexts/test_node.py
@@ -127,27 +127,23 @@ class NodeContextTestCase(unittest.TestCase):
 
     prefix = 'yardstick.benchmark.contexts.node'
 
-    @mock.patch('{}.NodeContext._execute_script'.format(prefix))
-    def test_deploy(self, execute_script_mock):
+    @mock.patch('{}.NodeContext._dispatch_script'.format(prefix))
+    def test_deploy(self, dispatch_script_mock):
         obj = node.NodeContext()
         obj.env = {
-            'setup': [
-                {'node5': {}}
-            ]
+            'type': 'script'
         }
         obj.deploy()
-        self.assertTrue(execute_script_mock.called)
+        self.assertTrue(dispatch_script_mock.called)
 
-    @mock.patch('{}.NodeContext._execute_script'.format(prefix))
-    def test_undeploy(self, execute_script_mock):
+    @mock.patch('{}.NodeContext._dispatch_script'.format(prefix))
+    def test_undeploy(self, dispatch_script_mock):
         obj = node.NodeContext()
         obj.env = {
-            'teardown': [
-                {'node5': {}}
-            ]
+            'type': 'script'
         }
         obj.undeploy()
-        self.assertTrue(execute_script_mock.called)
+        self.assertTrue(dispatch_script_mock.called)
 
     @mock.patch('{}.ssh.SSH._put_file_shell'.format(prefix))
     @mock.patch('{}.ssh.SSH.execute'.format(prefix))