diff options
| -rwxr-xr-x | bin/nova-manage | 15 | ||||
| -rw-r--r-- | nova/tests/test_compute.py | 3 | ||||
| -rw-r--r-- | nova/tests/test_libvirt.py | 3 |
3 files changed, 8 insertions, 13 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index d0246ad9d..66a3b93f1 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -1706,10 +1706,9 @@ class InstanceTypeCommands(object): def _print_instance_types(self, name, val): deleted = ('', ', inactive')[val["deleted"] == 1] print ("%s: Memory: %sMB, VCPUS: %s, Storage: %sGB, FlavorID: %s, " - "Swap: %sMB, RXTX Quota: %sGB, RXTX Cap: %sMB%s") % ( + "Swap: %sMB, RXTX Factor: %s") % ( name, val["memory_mb"], val["vcpus"], val["local_gb"], - val["flavorid"], val["swap"], val["rxtx_quota"], - val["rxtx_cap"], deleted) + val["flavorid"], val["swap"], val["rxtx_factor"]) @args('--name', dest='name', metavar='<name>', help='Name of instance type/flavor') @@ -1721,16 +1720,14 @@ class InstanceTypeCommands(object): @args('--flavor', dest='flavorid', metavar='<flavor id>', help='Flavor ID') @args('--swap', dest='swap', metavar='<swap>', help='Swap') - @args('--rxtx_quota', dest='rxtx_quota', metavar='<rxtx_quota>', - help='rxtx_quota') - @args('--rxtx_cap', dest='rxtx_cap', metavar='<rxtx_cap>', - help='rxtx_cap') + @args('--rxtx_factor', dest='rxtx_factor', metavar='<rxtx_factor>', + help='rxtx_factor') def create(self, name, memory, vcpus, local_gb, flavorid, - swap=0, rxtx_quota=0, rxtx_cap=0): + swap=0, rxtx_factor=1): """Creates instance types / flavors""" try: instance_types.create(name, memory, vcpus, local_gb, - flavorid, swap, rxtx_quota, rxtx_cap) + flavorid, swap, rxtx_factor) except exception.InvalidInput, e: print "Must supply valid parameters to create instance_type" print e 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'] |