diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-06-27 23:21:52 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-06-27 23:21:52 -0700 |
| commit | a0cb58ad4f821bc2ca1d07f2da5c07866ba92783 (patch) | |
| tree | 73ad161ef3ae55e8b812c5572c44273793760dbe | |
| parent | 6a97550633a0ec266be08f8cba4f8d515778c4f2 (diff) | |
| parent | 8a2f1763cbadd47f6ce26467ac9f82bc9b436d2a (diff) | |
| download | nova-a0cb58ad4f821bc2ca1d07f2da5c07866ba92783.tar.gz nova-a0cb58ad4f821bc2ca1d07f2da5c07866ba92783.tar.xz nova-a0cb58ad4f821bc2ca1d07f2da5c07866ba92783.zip | |
Merge branch 'master' into fixrbac
| -rw-r--r-- | nova/compute/linux_net.py | 2 | ||||
| -rw-r--r-- | nova/volume/storage.py | 2 | ||||
| -rw-r--r-- | smoketests/smoketest.py | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/nova/compute/linux_net.py b/nova/compute/linux_net.py index 14d7a1275..0bd5ce007 100644 --- a/nova/compute/linux_net.py +++ b/nova/compute/linux_net.py @@ -76,7 +76,7 @@ def bridge_create(net): if not device_exists(net['bridge_name']): logging.debug("Starting Bridge inteface for %s network", (net['vlan'])) execute("sudo brctl addbr %s" % (net['bridge_name'])) - # execute("sudo brctl setfd %s 0" % (net.bridge_name)) + execute("sudo brctl setfd %s 0" % (net.bridge_name)) # execute("sudo brctl setageing %s 10" % (net.bridge_name)) execute("sudo brctl stp %s off" % (net['bridge_name'])) execute("sudo brctl addif %s vlan%s" % (net['bridge_name'], net['vlan'])) diff --git a/nova/volume/storage.py b/nova/volume/storage.py index 1401aef1d..9c58358bd 100644 --- a/nova/volume/storage.py +++ b/nova/volume/storage.py @@ -90,7 +90,7 @@ class BlockStore(object): #TODO: aggregate the state of the system pass - @validate.rangetest(size=(0, 100)) + @validate.rangetest(size=(0, 1000)) def create_volume(self, size, user_id, project_id): """ Creates an exported volume (fake or real), diff --git a/smoketests/smoketest.py b/smoketests/smoketest.py index 26e167c8f..f7794a0ff 100644 --- a/smoketests/smoketest.py +++ b/smoketests/smoketest.py @@ -509,6 +509,10 @@ class VolumeTests(NovaTestCase): conn = self.connection_for(test_username) self.assertTrue(conn.delete_volume(data['volume_id'])) + def test_009_volume_size_must_be_int(self): + conn = self.connection_for(test_username) + self.assertRaises(Exception, conn.create_volume, 'foo', ZONE) + def test_999_tearDown(self): global data conn = self.connection_for(test_username) |