Improve LXD scenario support

JIRA: FUNCTEST-268

Change-Id: I8c8a3eff4a7e94b963c0307010a60723dc13a537
Signed-off-by: boucherv <valentin.boucher@orange.com>

diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml
index fb4103d..33495ed 100644 (file)
--- a/ci/config_functest.yaml
+++ b/ci/config_functest.yaml
@@ -50,6 +50,7 @@ general:
 
 healthcheck:
     disk_image: /home/opnfv/functest/data/cirros-0.3.4-x86_64-disk.img
+    disk_format: qcow2
 
 vping:
     ping_timeout:   200

diff --git a/ci/config_patch.yaml b/ci/config_patch.yaml
index 467a83c..4994d49 100644 (file)
--- a/ci/config_patch.yaml
+++ b/ci/config_patch.yaml
@@ -7,3 +7,4 @@ lxd:
 
     healthcheck:
         disk_image: /home/opnfv/functest/data/cirros-0.3.4-x86_64-lxc.tar.gz
+        disk_format: raw
\ No newline at end of file

diff --git a/ci/testcases.yaml b/ci/testcases.yaml
index 47d544b..aec9971 100644 (file)
--- a/ci/testcases.yaml
+++ b/ci/testcases.yaml
@@ -47,7 +47,7 @@ tiers:
                     2) Connectivity between 2 instances over a private network.
                 dependencies:
                     installer: ''
-                    scenario: ''
+                    scenario: '^((?!lxd).)*$'
 
             -
                 name: tempest_smoke_serial

diff --git a/testcases/OpenStack/healthcheck/healthcheck.sh b/testcases/OpenStack/healthcheck/healthcheck.sh
index 2449ac9..996aadc 100755 (executable)
--- a/testcases/OpenStack/healthcheck/healthcheck.sh
+++ b/testcases/OpenStack/healthcheck/healthcheck.sh
@@ -120,6 +120,7 @@ info "...Keystone OK!"
 info "Testing Glance API..."
 #################################
 disk_img=$(cat ${YAML_FILE} | shyaml get-value healthcheck.disk_image 2> /dev/null || true)
+disk_format=$(cat ${YAML_FILE} | shyaml get-value healthcheck.disk_format 2> /dev/null || true)
 kernel_img=$(cat ${YAML_FILE} | shyaml get-value healthcheck.kernel_image 2> /dev/null || true)
 ramdisk_img=$(cat ${YAML_FILE} | shyaml get-value healthcheck.ramdisk_image 2> /dev/null || true)
 extra_properties=$(cat ${YAML_FILE} | shyaml get-value healthcheck.extra_properties 2> /dev/null || true)
@@ -151,10 +152,10 @@ fi
 
 debug "image extra_properties=${extra_properties}"
 
-eval glance image-create --name ${image_1} --disk-format qcow2 --container-format bare \
+eval glance image-create --name ${image_1} --disk-format ${disk_format} --container-format bare \
              ${extra_opts} < ${disk_img}
 debug "image '${image_1}' created."
-eval glance image-create --name ${image_2} --disk-format qcow2 --container-format bare \
+eval glance image-create --name ${image_2} --disk-format ${disk_format} --container-format bare \
              ${extra_opts} < ${disk_img}
 debug "image '${image_2}' created."
 info "... Glance OK!"