diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-14 00:54:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-14 00:54:47 +0000 |
| commit | 5e6ae0822097f379ee2ee623c4e6213f1d930bf8 (patch) | |
| tree | 8ca22ac19e4447bc373fb7d21760ef76e723cdf0 /nova/tests | |
| parent | 0514bc9d5e92ed0eb6671349e8ff37d7f58aab85 (diff) | |
| parent | bfee1661f6e3d2ef842a8bd347726a09ba25f9df (diff) | |
Merge "Follow-on to I665f402f to convert rxtx_quota to rxtx_factor in nova-manage and a couple of tests."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_compute.py | 3 | ||||
| -rw-r--r-- | nova/tests/test_libvirt.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 0527ff456..883ee0173 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -163,8 +163,7 @@ class BaseTestCase(test.TestCase): inst['local_gb'] = '20' inst['flavorid'] = '1' inst['swap'] = '2048' - inst['rxtx_quota'] = 100 - inst['rxtx_cap'] = 200 + inst['rxtx_factor'] = 1 inst.update(params) return db.instance_type_create(context, inst)['id'] diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index c6fb5c348..61524e0cb 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -1615,8 +1615,7 @@ class NWFilterTestCase(test.TestCase): inst['local_gb'] = '20' inst['flavorid'] = '1' inst['swap'] = '2048' - inst['rxtx_quota'] = 100 - inst['rxtx_cap'] = 200 + inst['rxtx_factor'] = 1 inst.update(params) return db.instance_type_create(context, inst)['id'] |