summaryrefslogtreecommitdiff
path: root/nova/tests/network/test_manager.py
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2014-06-03 11:08:04 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2014-08-19 11:21:23 -0700
commit7d61239dfec85818859f925f47b9d2438b1786d6 (patch)
tree40c579a2f7559231667676512101aeeddd5f2729 /nova/tests/network/test_manager.py
parent231347ebbb1c61976e7bd2bd3734d611d21e0ec0 (diff)
downloadnova-7d61239dfec85818859f925f47b9d2438b1786d6.tar.gz
Use real exceptions for network create and destroy
In order to provide reasonable error messages to the user, we need real exceptions instead of a bunch of random value Errors. Partially-implements blueprint better-support-for-multiple-networks Change-Id: Id725afbdde40cba879608d15de9aa2753a256d10
Diffstat (limited to 'nova/tests/network/test_manager.py')
-rw-r--r--nova/tests/network/test_manager.py22
1 files changed, 20 insertions, 2 deletions
diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py
index 61f8d67afc..22237bed7f 100644
--- a/nova/tests/network/test_manager.py
+++ b/nova/tests/network/test_manager.py
@@ -361,17 +361,35 @@ class FlatNetworkTestCase(test.TestCase):
def test_validate_reserved_start_out_of_range(self):
context_admin = context.RequestContext('testuser', 'testproject',
is_admin=True)
- self.assertRaises(ValueError, self.network.create_networks,
+ self.assertRaises(exception.AddressOutOfRange,
+ self.network.create_networks,
context_admin, 'fake', '192.168.0.0/24', False,
1, 256, allowed_start='192.168.1.10')
def test_validate_reserved_end_invalid(self):
context_admin = context.RequestContext('testuser', 'testproject',
is_admin=True)
- self.assertRaises(ValueError, self.network.create_networks,
+ self.assertRaises(exception.InvalidAddress,
+ self.network.create_networks,
context_admin, 'fake', '192.168.0.0/24', False,
1, 256, allowed_end='invalid')
+ def test_validate_cidr_invalid(self):
+ context_admin = context.RequestContext('testuser', 'testproject',
+ is_admin=True)
+ self.assertRaises(exception.InvalidCidr,
+ self.network.create_networks,
+ context_admin, 'fake', 'invalid', False,
+ 1, 256)
+
+ def test_validate_non_int_size(self):
+ context_admin = context.RequestContext('testuser', 'testproject',
+ is_admin=True)
+ self.assertRaises(exception.InvalidIntValue,
+ self.network.create_networks,
+ context_admin, 'fake', '192.168.0.0/24', False,
+ 1, 'invalid')
+
def test_validate_networks_none_requested_networks(self):
self.network.validate_networks(self.context, None)