commit 0c71fc29a13545572ecf8eb5e56c20f9086ce009
author Zuul <zuul@review.opendev.org> Thu May 14 12:33:41 2020 +0000
committer Gerrit Code Review <review@openstack.org> Thu May 14 12:33:41 2020 +0000
tree 43afdf596ea2553b95ccb314c2c88d4052c4f55a
parent e67ebd83d935488f8b53bf4ae314fd8e40fb29a5
parent abda8712a4da68d79b4c051cec1dfe5774aaf7f3

Merge "test_server_rescue.py should use CONF.volume.volume_size"

tempest/api/compute/servers/test_server_rescue.py

diff --git a/tempest/api/compute/servers/test_server_rescue.py b/tempest/api/compute/servers/test_server_rescue.py
index 3fa859e..17cd443 100644
--- a/tempest/api/compute/servers/test_server_rescue.py
+++ b/tempest/api/compute/servers/test_server_rescue.py
@@ -198,7 +198,7 @@
         block_device_mapping_v2 = [{
             "boot_index": "0",
             "source_type": "blank",
-            "volume_size": "1",
+            "volume_size": CONF.volume.volume_size,
             "destination_type": "volume"}]
         server_id, rescue_image_id = self._create_server_and_rescue_image(
             hw_rescue_device='disk', hw_rescue_bus='virtio',
@@ -210,7 +210,7 @@
         block_device_mapping_v2 = [{
             "boot_index": "0",
             "source_type": "image",
-            "volume_size": "1",
+            "volume_size": CONF.volume.volume_size,
             "uuid": CONF.compute.image_ref,
             "destination_type": "volume"}]
         server_id, rescue_image_id = self._create_server_and_rescue_image(
@@ -226,7 +226,7 @@
         block_device_mapping_v2 = [{
             "boot_index": "0",
             "source_type": "snapshot",
-            "volume_size": "1",
+            "volume_size": CONF.volume.volume_size,
             "uuid": snapshot_id,
             "destination_type": "volume"}]
         server_id, rescue_image_id = self._create_server_and_rescue_image(