diff options
author | Ewan Mellor <ewan.mellor@citrix.com> | 2011-01-14 15:51:42 +0000 |
---|---|---|
committer | Ewan Mellor <ewan.mellor@citrix.com> | 2011-01-14 15:51:42 +0000 |
commit | b8c45af21d38e476d8f667089fc03b347d7969e2 (patch) | |
tree | e79cd390331ca2053e5432b214ddb826eba87bc5 /nova/test.py | |
parent | c71d5d41bb6e5d7a046a76563eed75a4d6e77e90 (diff) | |
parent | 9fb1e7b1f627b10fda1249754e4bc612d697110c (diff) | |
download | nova-b8c45af21d38e476d8f667089fc03b347d7969e2.tar.gz nova-b8c45af21d38e476d8f667089fc03b347d7969e2.tar.xz nova-b8c45af21d38e476d8f667089fc03b347d7969e2.zip |
Merged with trunk revno 565.
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 db5826c04..5922e4b1c 100644 --- a/nova/test.py +++ b/nova/test.py @@ -156,7 +156,8 @@ class TrialTestCase(trial_unittest.TestCase): FLAGS.fixed_range, 5, 16, FLAGS.vlan_start, - FLAGS.vpn_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 |