diff options
| author | Ryan Lane <rlane@wikimedia.org> | 2011-01-27 12:17:43 +0000 |
|---|---|---|
| committer | Ryan Lane <rlane@wikimedia.org> | 2011-01-27 12:17:43 +0000 |
| commit | c02a587ea03fecde26f49bec52f8d96aa551979a (patch) | |
| tree | 68e236b508d5019812bf7de65fc1a209d0df474f /nova/test.py | |
| parent | fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d (diff) | |
| parent | caca4a1320638b0d806f1854ba8233d941f50e86 (diff) | |
| download | nova-c02a587ea03fecde26f49bec52f8d96aa551979a.tar.gz nova-c02a587ea03fecde26f49bec52f8d96aa551979a.tar.xz nova-c02a587ea03fecde26f49bec52f8d96aa551979a.zip | |
Merge from trunk
Diffstat (limited to 'nova/test.py')
| -rw-r--r-- | nova/test.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/test.py b/nova/test.py index 881baccd5..a12cf9d32 100644 --- a/nova/test.py +++ b/nova/test.py @@ -69,9 +69,10 @@ class TestCase(unittest.TestCase): network_manager.VlanManager().create_networks(ctxt, FLAGS.fixed_range, 5, 16, + FLAGS.fixed_range_v6, FLAGS.vlan_start, FLAGS.vpn_start, - FLAGS.fixed_range_v6) + ) # emulate some of the mox stuff, we can't use the metaclass # because it screws with our generators |