summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stachowski <peter@tesora.com>2016-05-16 04:20:03 +0000
committerPeter Stachowski <peter@tesora.com>2016-05-16 04:20:03 +0000
commite3ae175d84b6c56d607e84776dd4ce3187c1cbf0 (patch)
tree62c2660815356a8c2da9d1b4866b7d0dc022184d
parent519f7ead61c4c509d9b273ebb3aae66ba80c6773 (diff)
downloadtrove-integration-e3ae175d84b6c56d607e84776dd4ce3187c1cbf0.tar.gz
Add another 'fault' flavor
Apparently there are two code paths for a failure creating a Nova instance. One returns immediatesly and the other takes some time to fail. The case where the initial command to Nova succeeds only to fail later needs another flavor to test it. A new flavor with not enough disk to install the Trove image has been created to test this scenarion. Change-Id: I5d3339e9cbfd6aeb0c3ff6936fefa8dbe9e841f8
-rw-r--r--scripts/conf/test_begin.conf6
-rwxr-xr-xscripts/redstack6
2 files changed, 8 insertions, 4 deletions
diff --git a/scripts/conf/test_begin.conf b/scripts/conf/test_begin.conf
index d6f5c8d..eff96de 100644
--- a/scripts/conf/test_begin.conf
+++ b/scripts/conf/test_begin.conf
@@ -95,5 +95,7 @@
"neutron_enabled": %neutron_enabled%,
"shared_network": "%shared_network%",
"shared_network_subnet": "%shared_network_subnet%",
- "instance_fault_flavor_name": "test.fault-5",
- "instance_fault_eph_flavor_name": "test.eph.fault-5",
+ "instance_fault_1_flavor_name": "test.fault_1-1",
+ "instance_fault_1_eph_flavor_name": "test.eph.fault_1-1",
+ "instance_fault_2_flavor_name": "test.fault_2-5",
+ "instance_fault_2_eph_flavor_name": "test.eph.fault_2-5",
diff --git a/scripts/redstack b/scripts/redstack
index 1800803..7b3684a 100755
--- a/scripts/redstack
+++ b/scripts/redstack
@@ -761,8 +761,10 @@ function add_test_flavors() {
add_flavor 'large' 26 2048 10 1
add_flavor 'large' 27 2048 15 1
- # This should be big enough to cause Nova to fail allocation
- add_flavor 'fault' 35 131072 5 1
+ # This will allow Nova to create an instance, but not enough disk to boot the image
+ add_flavor 'fault_1' 30 512 1 1
+ # This should be enough memory to cause Nova to fail entirely due to too much allocation
+ add_flavor 'fault_2' 31 131072 5 1
}
function cmd_test_init() {