summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stachowski <peter@tesora.com>2016-05-11 06:36:13 +0000
committerPeter Stachowski <peter@tesora.com>2016-05-11 21:28:50 +0000
commit519f7ead61c4c509d9b273ebb3aae66ba80c6773 (patch)
treeaafd4533185dbf31f33ae6686acba5d41a24f1ee
parentccc33811cf6e06fa9878c60bc5e77b1ac534f115 (diff)
downloadtrove-integration-519f7ead61c4c509d9b273ebb3aae66ba80c6773.tar.gz
Add 'fault' flavor to test persisting an error msg
In order to test that error messages are now persisted, a method of guaranteeing that a Trove create command will fail is needed. The simplest way to do that is to attempt to allocate more resources from Nova than it has available. To this effect, a 'fault' flavor has been added. Also bumped up the disk on mariadb to handle more operating systems. Change-Id: I32a5ed229988f047db44183c71f0462fa6f1990d
-rw-r--r--scripts/conf/mariadb.conf8
-rw-r--r--scripts/conf/test_begin.conf2
-rwxr-xr-xscripts/redstack3
3 files changed, 9 insertions, 4 deletions
diff --git a/scripts/conf/mariadb.conf b/scripts/conf/mariadb.conf
index eac3c57..0e29d11 100644
--- a/scripts/conf/mariadb.conf
+++ b/scripts/conf/mariadb.conf
@@ -1,6 +1,6 @@
- "instance_flavor_name": "test.small-3",
- "instance_bigger_flavor_name": "test.small-3.resize",
- "instance_eph_flavor_name": "test.eph.small-3",
- "instance_bigger_eph_flavor_name": "test.eph.small-3.resize",
+ "instance_flavor_name": "test.small-4",
+ "instance_bigger_flavor_name": "test.small-4.resize",
+ "instance_eph_flavor_name": "test.eph.small-4",
+ "instance_bigger_eph_flavor_name": "test.eph.small-4.resize",
"trove_volume_support": true,
"trove_volume_size": 1,
diff --git a/scripts/conf/test_begin.conf b/scripts/conf/test_begin.conf
index ddced02..d6f5c8d 100644
--- a/scripts/conf/test_begin.conf
+++ b/scripts/conf/test_begin.conf
@@ -95,3 +95,5 @@
"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",
diff --git a/scripts/redstack b/scripts/redstack
index ce66058..1800803 100755
--- a/scripts/redstack
+++ b/scripts/redstack
@@ -760,6 +760,9 @@ function add_test_flavors() {
add_flavor 'large' 25 2048 5 1
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
}
function cmd_test_init() {