diff --git a/doc/source/reference/api/index.rst b/doc/source/reference/api/index.rst index 0d2938347..e332c3647 100644 --- a/doc/source/reference/api/index.rst +++ b/doc/source/reference/api/index.rst @@ -82,11 +82,11 @@ Then call methods on its managers:: >>> nova.flavors.list() [, , - , - , - , - , - ] + , + , + , + , + ] >>> fl = nova.flavors.find(ram=512) >>> nova.servers.create("my-server", flavor=fl) diff --git a/novaclient/base.py b/novaclient/base.py index 1b2c590ce..3bf61856b 100644 --- a/novaclient/base.py +++ b/novaclient/base.py @@ -501,7 +501,7 @@ class BootingManagerWithFind(ManagerWithFind): for device_name, mapping in block_device_mapping.items(): # # The mapping is in the format: - # :[]:[]:[] + # :[]:[]:[] # bdm_dict = {'device_name': device_name} diff --git a/novaclient/tests/functional/v2/legacy/test_servers.py b/novaclient/tests/functional/v2/legacy/test_servers.py index 5980e94f5..aa812bb20 100644 --- a/novaclient/tests/functional/v2/legacy/test_servers.py +++ b/novaclient/tests/functional/v2/legacy/test_servers.py @@ -61,7 +61,7 @@ class TestServersBootNovaClient(base.ClientTestBase): def test_boot_server_with_legacy_bdm(self): # bdm v1 format - # ::: + # ::: # params = (type, size, delete-on-terminate) params = ('', '', '1') self._boot_server_with_legacy_bdm(bdm_params=params) diff --git a/novaclient/tests/unit/v2/test_shell.py b/novaclient/tests/unit/v2/test_shell.py index dfa798b85..37b7f48d4 100644 --- a/novaclient/tests/unit/v2/test_shell.py +++ b/novaclient/tests/unit/v2/test_shell.py @@ -2051,7 +2051,7 @@ class ShellTest(utils.TestCase): 'start=2000-01-20T00:00:00&' + 'end=2005-02-01T00:00:00&' + 'detailed=1') - # Servers, RAM MB-Hours, CPU Hours, Disk GB-Hours + # Servers, RAM MB-Hours, CPU Hours, Disk GiB-Hours self.assertIn('1 | 25451.76 | 49.71 | 0.00', stdout) def test_usage_list_stitch_together_next_results(self): @@ -2072,7 +2072,7 @@ class ShellTest(utils.TestCase): 'start=2000-01-20T00:00:00&' 'end=2005-02-01T00:00:00&' 'marker=%s&detailed=1' % (marker), pos=pos + 1) - # Servers, RAM MB-Hours, CPU Hours, Disk GB-Hours + # Servers, RAM MB-Hours, CPU Hours, Disk GiB-Hours self.assertIn('2 | 50903.53 | 99.42 | 0.00', stdout) def test_usage_list_no_args(self): @@ -2092,7 +2092,7 @@ class ShellTest(utils.TestCase): '/os-simple-tenant-usage/test?' + 'start=2000-01-20T00:00:00&' + 'end=2005-02-01T00:00:00') - # Servers, RAM MB-Hours, CPU Hours, Disk GB-Hours + # Servers, RAM MB-Hours, CPU Hours, Disk GiB-Hours self.assertIn('1 | 25451.76 | 49.71 | 0.00', stdout) def test_usage_stitch_together_next_results(self): @@ -2112,7 +2112,7 @@ class ShellTest(utils.TestCase): 'start=2000-01-20T00:00:00&' 'end=2005-02-01T00:00:00&' 'marker=%s' % (marker), pos=pos + 1) - # Servers, RAM MB-Hours, CPU Hours, Disk GB-Hours + # Servers, RAM MB-Hours, CPU Hours, Disk GiB-Hours self.assertIn('2 | 50903.53 | 99.42 | 0.00', stdout) def test_usage_no_tenant(self): diff --git a/novaclient/v2/flavors.py b/novaclient/v2/flavors.py index c4b6e40ce..89884bae1 100644 --- a/novaclient/v2/flavors.py +++ b/novaclient/v2/flavors.py @@ -184,11 +184,11 @@ class FlavorManager(base.ManagerWithFind): :param name: Descriptive name of the flavor :param ram: Memory in MB for the flavor :param vcpus: Number of VCPUs for the flavor - :param disk: Size of local disk in GB + :param disk: Size of local disk in GiB :param flavorid: ID for the flavor (optional). You can use the reserved value ``"auto"`` to have Nova generate a UUID for the flavor in cases where you cannot simply pass ``None``. - :param ephemeral: Ephemeral disk space in GB. + :param ephemeral: Ephemeral disk space in GiB. :param swap: Swap space in MB :param rxtx_factor: RX/TX factor :param is_public: Whether or not the flavor is public. diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py index 6b21c4880..20298b689 100644 --- a/novaclient/v2/shell.py +++ b/novaclient/v2/shell.py @@ -599,7 +599,7 @@ def _boot(cs, args): action='append', default=[], help=_("Block device mapping in the format " - "=:::.")) + "=:::.")) @utils.arg( '--block-device', metavar="key1=value1[,key2=value2...]", @@ -621,7 +621,7 @@ def _boot(cs, args): "depending on selected bus; note the libvirt driver always " "uses default device names), " "size=size of the block device in MB(for swap) and in " - "GB(for other formats) " + "GiB(for other formats) " "(if omitted, hypervisor driver calculates size), " "format=device will be formatted (e.g. swap, ntfs, ...; optional), " "bootindex=integer used for ordering the boot disks " @@ -651,7 +651,7 @@ def _boot(cs, args): "depending on selected bus; note the libvirt driver always " "uses default device names), " "size=size of the block device in MB(for swap) and in " - "GB(for other formats) " + "GiB(for other formats) " "(if omitted, hypervisor driver calculates size), " "format=device will be formatted (e.g. swap, ntfs, ...; optional), " "bootindex=integer used for ordering the boot disks " @@ -680,7 +680,7 @@ def _boot(cs, args): "depending on selected bus; note the libvirt driver always " "uses default device names), " "size=size of the block device in MB(for swap) and in " - "GB(for other formats) " + "GiB(for other formats) " "(if omitted, hypervisor driver calculates size), " "format=device will be formatted (e.g. swap, ntfs, ...; optional), " "bootindex=integer used for ordering the boot disks " @@ -708,7 +708,7 @@ def _boot(cs, args): "depending on selected bus; note the libvirt driver always " "uses default device names), " "size=size of the block device in MB(for swap) and in " - "GB(for other formats) " + "GiB(for other formats) " "(if omitted, hypervisor driver calculates size), " "format=device will be formatted (e.g. swap, ntfs, ...; optional), " "bootindex=integer used for ordering the boot disks " @@ -727,7 +727,7 @@ def _boot(cs, args): metavar="size=[,format=]", action='append', default=[], - help=_("Create and attach a local ephemeral block device of GB " + help=_("Create and attach a local ephemeral block device of GiB " "and format it to .")) @utils.arg( '--hint', @@ -1130,11 +1130,11 @@ def do_flavor_show(cs, args): @utils.arg( 'disk', metavar='', - help=_("Disk size in GB.")) + help=_("Disk size in GiB.")) @utils.arg( '--ephemeral', metavar='', - help=_("Ephemeral space size in GB (default 0)."), + help=_("Ephemeral space size in GiB (default 0)."), default=0) @utils.arg( 'vcpus', @@ -2939,7 +2939,7 @@ def do_usage_list(cs, args): """List usage data for all tenants.""" dateformat = "%Y-%m-%d" rows = ["Tenant ID", "Servers", "RAM MB-Hours", "CPU Hours", - "Disk GB-Hours"] + "Disk GiB-Hours"] now = timeutils.utcnow() @@ -3007,7 +3007,7 @@ def do_usage_list(cs, args): def do_usage(cs, args): """Show usage data for a single tenant.""" dateformat = "%Y-%m-%d" - rows = ["Servers", "RAM MB-Hours", "CPU Hours", "Disk GB-Hours"] + rows = ["Servers", "RAM MB-Hours", "CPU Hours", "Disk GiB-Hours"] now = timeutils.utcnow()