summaryrefslogtreecommitdiff
path: root/tempest/api
diff options
context:
space:
mode:
authorRichard Winters <riwinter@cisco.com>2015-03-04 13:18:03 -0500
committerRichard Winters <riwinter@cisco.com>2015-03-04 13:34:35 -0500
commit0363a17cffe85bba9d1b553344eacff95950a493 (patch)
tree85dc75c9ea9cc655bb93a02cf7944c09113c2e72 /tempest/api
parentd731482f3e4044017be8109d85b2be7e9486b00e (diff)
downloadtempest-0363a17cffe85bba9d1b553344eacff95950a493.tar.gz
Update test to fail instead of skip if floating pool is already allocated
The FloatingIPsBulkAdminTestJSON skips instead of fail if the pool is already configured. This patch updates the test to fail when the floating pool is found to be already configured. Change-Id: Iee5317c174c9abfc3514b6833d35e17969b15693 Closes-Bug: #1401280
Diffstat (limited to 'tempest/api')
-rw-r--r--tempest/api/compute/admin/test_floating_ips_bulk.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tempest/api/compute/admin/test_floating_ips_bulk.py b/tempest/api/compute/admin/test_floating_ips_bulk.py
index 7ca081aa0..aa71665fe 100644
--- a/tempest/api/compute/admin/test_floating_ips_bulk.py
+++ b/tempest/api/compute/admin/test_floating_ips_bulk.py
@@ -17,6 +17,7 @@ import netaddr
from tempest.api.compute import base
from tempest import config
+from tempest import exceptions
from tempest import test
CONF = config.CONF
@@ -47,7 +48,7 @@ class FloatingIPsBulkAdminTestJSON(base.BaseV2ComputeAdminTest):
msg = ("Configured unallocated floating IP range is already "
"allocated. Configure the correct unallocated range "
"as 'floating_ip_range'")
- raise cls.skipException(msg)
+ raise exceptions.InvalidConfiguration(msg)
return
def _delete_floating_ips_bulk(self, ip_range):