14 files changed, 36 insertions, 16 deletions
diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index 2d0db83bd..9e5e61edf 100755
--- a/tests/ci/clean_images.sh
+++ b/tests/ci/clean_images.sh
@@ -19,7 +19,7 @@ cleanup()
         return
     fi
 
-    for image in $(openstack image list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \
+    for image in $(openstack image list | grep -e cirros-0.3.5 -e yardstick-image -e Ubuntu-14.04 \
         | awk '{print $2}'); do
         echo "Deleting image $image..."
         openstack image delete $image || true
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index 7f929bdc4..4be51fd15 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -155,7 +155,7 @@ load_cirros_image()
     echo
     echo "========== Loading cirros cloud image =========="
 
-    local image_file=/home/opnfv/images/cirros-0.3.3-x86_64-disk.img
+    local image_file=/home/opnfv/images/cirros-0.3.5-x86_64-disk.img
 
     EXTRA_PARAMS=""
     # VPP requires guest memory to be backed by large pages
@@ -168,7 +168,7 @@ load_cirros_image()
         --container-format bare \
         ${EXTRA_PARAMS} \
         --file ${image_file} \
-        cirros-0.3.3)
+        cirros-0.3.5)
     echo "$output"
 
     CIRROS_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}')
@@ -245,7 +245,7 @@ main()
     load_yardstick_image
     if [ "${YARD_IMG_ARCH}" == "arm64" ]; then
         sed -i 's/image: {{image}}/image: TestVM/g' tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
-        sed -i 's/image: cirros-0.3.3/image: TestVM/g' samples/ping.yaml
+        sed -i 's/image: cirros-0.3.5/image: TestVM/g' 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}"
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
index 21aa3ee7b..1de573d83 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
@@ -13,7 +13,7 @@ description: >
     Yardstick TC002 config file;
     measure network latency using ping;
 
-{% set image = image or "cirros-0.3.3" %}
+{% set image = image or "cirros-0.3.5" %}
 scenarios:
 {% for i in range(2) %}
 -
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
index 246967541..cad6c591c 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
@@ -12,6 +12,8 @@ schema: "yardstick:task:0.1"
 description: >
     Test case for TC045 :Control node Openstack service down - neutron server.
 
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
 scenarios:
 -
   type: ServiceHA
@@ -48,5 +50,5 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+  file: {{file}}
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
index 397d05133..38b475451 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
@@ -12,6 +12,8 @@ schema: "yardstick:task:0.1"
 description: >
     Test case for TC046 :Control node Openstack service down - keystone.
 
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
 scenarios:
 -
   type: ServiceHA
@@ -48,4 +50,4 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+  file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
index ffae96b88..53df7c64b 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
@@ -12,6 +12,8 @@ schema: "yardstick:task:0.1"
 description: >
     Test case for TC047 :Control node Openstack service down - glance api.
 
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
 scenarios:
 -
   type: ServiceHA
@@ -48,4 +50,4 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+  file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
index 7ebca4d99..7457f9392 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
@@ -12,6 +12,8 @@ schema: "yardstick:task:0.1"
 description: >
     Test case for TC048 :Control node Openstack service down - cinder api.
 
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
 scenarios:
 -
   type: ServiceHA
@@ -48,5 +50,5 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+  file: {{file}}
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
index 679e78265..e55345ae2 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
@@ -12,6 +12,8 @@ schema: "yardstick:task:0.1"
 description: >
     Test case for TC049 :Control node Openstack service down - swift proxy.
 
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
 scenarios:
 -
   type: ServiceHA
@@ -48,4 +50,4 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+  file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
index 4bb995036..b1dc31e90 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
@@ -13,6 +13,8 @@ description: >
     Test case for TC050 :OpenStack Controller Node Network High Availability;
     This test case is written by new scenario-based HA testing framework.
 
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
 scenarios:
   -
     type: "GeneralHA"
@@ -146,4 +148,4 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+  file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
index e8cc81745..cf2b51548 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
@@ -13,6 +13,8 @@ description: >
     Test case for TC051 :OpenStack Controller Node CPU Overload High Availability;
     This test case is written by new scenario-based HA testing framework.
 
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
 scenarios:
   -
     type: "GeneralHA"
@@ -97,4 +99,4 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+  file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
index a95e5415b..6e060b15d 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
@@ -13,6 +13,8 @@ description: >
     Test case for TC052 :OpenStack Controller Node Disk I/O Block High Availability;
     This test case is written by new scenario-based HA testing framework.
 
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
 scenarios:
   -
     type: "GeneralHA"
@@ -86,4 +88,4 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+  file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
index ff479f9e1..b6bbb8966 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
@@ -13,6 +13,8 @@ description: >
     Test case for TC053 :Openstack Controller Load Balance Service High Availability;
     This test case is written by new scenario-based HA testing framework.
 
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
 scenarios:
   -
     type: "GeneralHA"
@@ -68,4 +70,4 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+  file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
index c87d3b9fe..2d51a96cc 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
@@ -13,6 +13,8 @@ description: >
     Test case for TC054 :OpenStack VIP Master Node abnormally shutdown High Availability;
     This test case is written by new scenario-based HA testing framework.
 
+{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+
 scenarios:
   -
     type: "GeneralHA"
@@ -120,4 +122,4 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+  file: {{file}}
diff --git a/tests/unit/benchmark/contexts/test_model.py b/tests/unit/benchmark/contexts/test_model.py
index a4b7d81ef..6ae4e6dac 100644
--- a/tests/unit/benchmark/contexts/test_model.py
+++ b/tests/unit/benchmark/contexts/test_model.py
@@ -12,8 +12,8 @@
 # Unittest for yardstick.benchmark.contexts.model
 
 from __future__ import absolute_import
-import mock
 import unittest
+import mock
 
 from yardstick.benchmark.contexts import model