@@ -295,7 +295,6 @@ function configure_tempest {

     fi

     if [ "$VIRT_DRIVER" = "xenserver" ]; then

         iniset $TEMPEST_CONFIG image disk_formats "ami,ari,aki,vhd,raw,iso"

-        iniset $TEMPEST_CONFIG scenario img_disk_format vhd

     fi

     # Image Features

@@ -407,12 +406,20 @@ function configure_tempest {

     fi

     # Scenario

-    SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES/images/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}

+    if [ "$VIRT_DRIVER" = "xenserver" ]; then

+        SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES}

+        SCENARIO_IMAGE_FILE="cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.vhd.tgz"

+        iniset $TEMPEST_CONFIG scenario img_disk_format vhd

+        iniset $TEMPEST_CONFIG scenario img_container_format ovf

+    else

+        SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES/images/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}

+        SCENARIO_IMAGE_FILE="cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img"

+    fi

     iniset $TEMPEST_CONFIG scenario img_dir $SCENARIO_IMAGE_DIR

+    iniset $TEMPEST_CONFIG scenario img_file $SCENARIO_IMAGE_FILE

     iniset $TEMPEST_CONFIG scenario ami_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-blank.img"

     iniset $TEMPEST_CONFIG scenario ari_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initrd"

     iniset $TEMPEST_CONFIG scenario aki_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-vmlinuz"

-    iniset $TEMPEST_CONFIG scenario img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img"

     # Validation

     iniset $TEMPEST_CONFIG validation run_validation ${TEMPEST_RUN_VALIDATION:-False}