Skip to content

Commit 58b3ac4

Browse files
Zuulopenstack-gerrit
Zuul
authored and
openstack-gerrit
committed
Merge "Replace MB with MiB"
2 parents 3a8d09e + 80b4286 commit 58b3ac4

File tree

11 files changed

+63
-62
lines changed

11 files changed

+63
-62
lines changed

‎doc/source/cli/nova.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ Boot a new server.
10271027
driver chooses suitable device depending on
10281028
selected bus; note the libvirt driver always
10291029
uses default device names), size=size of the
1030-
block device in MB(for swap) and in GiB(for
1030+
block device in MiB(for swap) and in GiB(for
10311031
other formats) (if omitted, hypervisor driver
10321032
calculates size), format=device will be
10331033
formatted (e.g. swap, ntfs, ...; optional),
@@ -1046,7 +1046,7 @@ Boot a new server.
10461046

10471047
``--swap <swap_size>``
10481048
Create and attach a local swap block device of
1049-
<swap_size> MB.
1049+
<swap_size> MiB.
10501050

10511051
``--ephemeral``
10521052
size=<size>[,format=<format>]
@@ -1334,7 +1334,7 @@ Create a new flavor.
13341334
generated a UUID for the ID.
13351335

13361336
``<ram>``
1337-
Memory size in MB.
1337+
Memory size in MiB.
13381338

13391339
``<disk>``
13401340
Disk size in GiB.
@@ -1348,7 +1348,7 @@ Create a new flavor.
13481348
Ephemeral space size in GiB (default 0).
13491349

13501350
``--swap <swap>``
1351-
Swap space size in MB (default 0).
1351+
Swap space size in MiB (default 0).
13521352

13531353
``--rxtx-factor <factor>``
13541354
RX/TX factor (default 1).
@@ -1430,7 +1430,7 @@ Print a list of available 'flavors' (sizes of servers).
14301430
Filters the flavors by a minimum disk space, in GiB.
14311431

14321432
``--min-ram <min-ram>``
1433-
Filters the flavors by a minimum RAM, in MB.
1433+
Filters the flavors by a minimum RAM, in MiB.
14341434

14351435
``--limit <limit>``
14361436
Maximum number of flavors to display. If limit is

‎novaclient/tests/functional/v2/legacy/test_readonly_nova.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_admin_flavor_acces_list(self):
4949
params='--flavor m1.tiny')
5050

5151
def test_admin_flavor_list(self):
52-
self.assertIn("Memory_MB", self.nova('flavor-list'))
52+
self.assertIn("Memory_MiB", self.nova('flavor-list'))
5353

5454
def test_admin_hypervisor_list(self):
5555
self.nova('hypervisor-list')

‎novaclient/tests/unit/fakes.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ def assert_called(self, method, url, body=None, pos=-1):
5959
self.assert_called('GET', '/flavors/aa1/os-extra_specs')
6060
6161
2. self.run_command(["boot", "--image", "1",
62-
"--flavor", "512 MB Server",
62+
"--flavor", "512 MiB Server",
6363
"--max-count", "3", "server"])
6464
self.assert_called('GET', '/images/1', pos=0)
65-
self.assert_called('GET', '/flavors/512 MB Server', pos=1)
65+
self.assert_called('GET', '/flavors/512 MiB Server', pos=1)
6666
self.assert_called('GET', '/flavors?is_public=None', pos=2)
6767
self.assert_called('GET', '/flavors/2', pos=3)
6868
self.assert_called(

‎novaclient/tests/unit/fixture_data/servers.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def setUp(self):
4343
},
4444
"flavor": {
4545
"id": 1,
46-
"name": "256 MB Server",
46+
"name": "256 MiB Server",
4747
},
4848
"hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",
4949
"status": "BUILD",
@@ -85,7 +85,7 @@ def setUp(self):
8585
},
8686
"flavor": {
8787
"id": 1,
88-
"name": "256 MB Server",
88+
"name": "256 MiB Server",
8989
},
9090
"hostId": "9e107d9d372bb6826bd81d3542a419d6",
9191
"status": "ACTIVE",
@@ -127,7 +127,7 @@ def setUp(self):
127127
"image": "",
128128
"flavor": {
129129
"id": 1,
130-
"name": "256 MB Server",
130+
"name": "256 MiB Server",
131131
},
132132
"hostId": "9e107d9d372bb6826bd81d3542a419d6",
133133
"status": "ACTIVE",

‎novaclient/tests/unit/test_base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TmpObject(object):
4949
def test_resource_lazy_getattr(self):
5050
cs = fakes.FakeClient(api_versions.APIVersion("2.0"))
5151
f = flavors.Flavor(cs.flavors, {'id': 1})
52-
self.assertEqual('256 MB Server', f.name)
52+
self.assertEqual('256 MiB Server', f.name)
5353
cs.assert_called('GET', '/flavors/1')
5454

5555
# Missing stuff still fails after a second get

‎novaclient/tests/unit/v2/fakes.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ def get_servers_detail(self, **kw):
409409
},
410410
"flavor": {
411411
"id": 1,
412-
"name": "256 MB Server",
412+
"name": "256 MiB Server",
413413
},
414414
"hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",
415415
"status": "BUILD",
@@ -450,7 +450,7 @@ def get_servers_detail(self, **kw):
450450
},
451451
"flavor": {
452452
"id": 1,
453-
"name": "256 MB Server",
453+
"name": "256 MiB Server",
454454
},
455455
"hostId": "9e107d9d372bb6826bd81d3542a419d6",
456456
"status": "ACTIVE",
@@ -491,7 +491,7 @@ def get_servers_detail(self, **kw):
491491
"image": "",
492492
"flavor": {
493493
"id": 1,
494-
"name": "256 MB Server",
494+
"name": "256 MiB Server",
495495
},
496496
"hostId": "9e107d9d372bb6826bd81d3542a419d6",
497497
"status": "ACTIVE",
@@ -844,19 +844,19 @@ def get_flavors(self, **kw):
844844

845845
def get_flavors_detail(self, **kw):
846846
flavors = {'flavors': [
847-
{'id': 1, 'name': '256 MB Server', 'ram': 256, 'disk': 10,
847+
{'id': 1, 'name': '256 MiB Server', 'ram': 256, 'disk': 10,
848848
'OS-FLV-EXT-DATA:ephemeral': 10,
849849
'os-flavor-access:is_public': True,
850850
'links': {}},
851-
{'id': 2, 'name': '512 MB Server', 'ram': 512, 'disk': 20,
851+
{'id': 2, 'name': '512 MiB Server', 'ram': 512, 'disk': 20,
852852
'OS-FLV-EXT-DATA:ephemeral': 20,
853853
'os-flavor-access:is_public': False,
854854
'links': {}},
855-
{'id': 4, 'name': '1024 MB Server', 'ram': 1024, 'disk': 10,
855+
{'id': 4, 'name': '1024 MiB Server', 'ram': 1024, 'disk': 10,
856856
'OS-FLV-EXT-DATA:ephemeral': 10,
857857
'os-flavor-access:is_public': True,
858858
'links': {}},
859-
{'id': 'aa1', 'name': '128 MB Server', 'ram': 128, 'disk': 0,
859+
{'id': 'aa1', 'name': '128 MiB Server', 'ram': 128, 'disk': 0,
860860
'OS-FLV-EXT-DATA:ephemeral': 0,
861861
'os-flavor-access:is_public': True,
862862
'links': {}}
@@ -925,16 +925,16 @@ def get_flavors_3(self, **kw):
925925
FAKE_RESPONSE_HEADERS,
926926
{'flavor': {
927927
'id': 3,
928-
'name': '256 MB Server',
928+
'name': '256 MiB Server',
929929
'ram': 256,
930930
'disk': 10,
931931
}},
932932
)
933933

934-
def get_flavors_512_MB_Server(self, **kw):
934+
def get_flavors_512_MiB_Server(self, **kw):
935935
raise exceptions.NotFound('404')
936936

937-
def get_flavors_128_MB_Server(self, **kw):
937+
def get_flavors_128_MiB_Server(self, **kw):
938938
raise exceptions.NotFound('404')
939939

940940
def get_flavors_80645cf4_6ad3_410a_bbc8_6f3e1e291f51(self, **kw):

‎novaclient/tests/unit/v2/test_flavors.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,11 @@ def test_find(self):
122122
f = self.cs.flavors.find(ram=256)
123123
self.assert_request_id(f, fakes.FAKE_REQUEST_ID_LIST)
124124
self.cs.assert_called('GET', '/flavors/detail')
125-
self.assertEqual('256 MB Server', f.name)
125+
self.assertEqual('256 MiB Server', f.name)
126126

127127
f = self.cs.flavors.find(disk=0)
128128
self.assert_request_id(f, fakes.FAKE_REQUEST_ID_LIST)
129-
self.assertEqual('128 MB Server', f.name)
129+
self.assertEqual('128 MiB Server', f.name)
130130

131131
self.assertRaises(exceptions.NotFound, self.cs.flavors.find,
132132
disk=12345)

‎novaclient/tests/unit/v2/test_servers.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,10 @@ def test_find(self):
455455
self.assertEqual('sample-server', server.name)
456456

457457
self.assertRaises(exceptions.NoUniqueMatch, self.cs.servers.find,
458-
flavor={"id": 1, "name": "256 MB Server"})
458+
flavor={"id": 1, "name": "256 MiB Server"})
459459

460-
sl = self.cs.servers.findall(flavor={"id": 1, "name": "256 MB Server"})
460+
sl = self.cs.servers.findall(flavor={"id": 1,
461+
"name": "256 MiB Server"})
461462
self.assert_request_id(sl, fakes.FAKE_REQUEST_ID_LIST)
462463
self.assertEqual([1234, 5678, 9012], [s.id for s in sl])
463464

‎novaclient/tests/unit/v2/test_shell.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,10 +1165,10 @@ def test_boot_with_poll_to_check_VM_state_error(self):
11651165

11661166
def test_boot_named_flavor(self):
11671167
self.run_command(["boot", "--image", FAKE_UUID_1,
1168-
"--flavor", "512 MB Server",
1168+
"--flavor", "512 MiB Server",
11691169
"--max-count", "3", "server"])
11701170
self.assert_called('GET', '/v2/images/' + FAKE_UUID_1, pos=0)
1171-
self.assert_called('GET', '/flavors/512 MB Server', pos=1)
1171+
self.assert_called('GET', '/flavors/512 MiB Server', pos=1)
11721172
self.assert_called('GET', '/flavors?is_public=None', pos=2)
11731173
self.assert_called('GET', '/flavors/2', pos=3)
11741174
self.assert_called(
@@ -1404,15 +1404,15 @@ def test_flavor_show_with_alphanum_id(self):
14041404
self.assert_called_anytime('GET', '/flavors/aa1')
14051405

14061406
def test_flavor_show_by_name(self):
1407-
self.run_command(['flavor-show', '128 MB Server'])
1408-
self.assert_called('GET', '/flavors/128 MB Server', pos=0)
1407+
self.run_command(['flavor-show', '128 MiB Server'])
1408+
self.assert_called('GET', '/flavors/128 MiB Server', pos=0)
14091409
self.assert_called('GET', '/flavors?is_public=None', pos=1)
14101410
self.assert_called('GET', '/flavors/aa1', pos=2)
14111411
self.assert_called('GET', '/flavors/aa1/os-extra_specs', pos=3)
14121412

14131413
def test_flavor_show_by_name_priv(self):
1414-
self.run_command(['flavor-show', '512 MB Server'])
1415-
self.assert_called('GET', '/flavors/512 MB Server', pos=0)
1414+
self.run_command(['flavor-show', '512 MiB Server'])
1415+
self.assert_called('GET', '/flavors/512 MiB Server', pos=0)
14161416
self.assert_called('GET', '/flavors?is_public=None', pos=1)
14171417
self.assert_called('GET', '/flavors/2', pos=2)
14181418
self.assert_called('GET', '/flavors/2/os-extra_specs', pos=3)
@@ -1444,7 +1444,7 @@ def test_flavor_access_add_by_id(self):
14441444
{'addTenantAccess': {'tenant': 'proj2'}})
14451445

14461446
def test_flavor_access_add_by_name(self):
1447-
self.run_command(['flavor-access-add', '512 MB Server', 'proj2'])
1447+
self.run_command(['flavor-access-add', '512 MiB Server', 'proj2'])
14481448
self.assert_called('POST', '/flavors/2/action',
14491449
{'addTenantAccess': {'tenant': 'proj2'}})
14501450

@@ -1454,7 +1454,7 @@ def test_flavor_access_remove_by_id(self):
14541454
{'removeTenantAccess': {'tenant': 'proj2'}})
14551455

14561456
def test_flavor_access_remove_by_name(self):
1457-
self.run_command(['flavor-access-remove', '512 MB Server', 'proj2'])
1457+
self.run_command(['flavor-access-remove', '512 MiB Server', 'proj2'])
14581458
self.assert_called('POST', '/flavors/2/action',
14591459
{'removeTenantAccess': {'tenant': 'proj2'}})
14601460

@@ -2336,8 +2336,8 @@ def test_usage_list(self):
23362336
'start=2000-01-20T00:00:00&' +
23372337
'end=2005-02-01T00:00:00&' +
23382338
'detailed=1')
2339-
# Servers, RAM MB-Hours, CPU Hours, Disk GiB-Hours
2340-
self.assertIn('1 | 25451.76 | 49.71 | 0.00', stdout)
2339+
# Servers, RAM MiB-Hours, CPU Hours, Disk GiB-Hours
2340+
self.assertIn('1 | 25451.76 | 49.71 | 0.00', stdout)
23412341

23422342
def test_usage_list_stitch_together_next_results(self):
23432343
cmd = 'usage-list --start 2000-01-20 --end 2005-02-01'
@@ -2357,8 +2357,8 @@ def test_usage_list_stitch_together_next_results(self):
23572357
'start=2000-01-20T00:00:00&'
23582358
'end=2005-02-01T00:00:00&'
23592359
'marker=%s&detailed=1' % (marker), pos=pos + 1)
2360-
# Servers, RAM MB-Hours, CPU Hours, Disk GiB-Hours
2361-
self.assertIn('2 | 50903.53 | 99.42 | 0.00', stdout)
2360+
# Servers, RAM MiB-Hours, CPU Hours, Disk GiB-Hours
2361+
self.assertIn('2 | 50903.53 | 99.42 | 0.00', stdout)
23622362

23632363
def test_usage_list_no_args(self):
23642364
timeutils.set_time_override(datetime.datetime(2005, 2, 1, 0, 0))
@@ -2377,8 +2377,8 @@ def test_usage(self):
23772377
'/os-simple-tenant-usage/test?' +
23782378
'start=2000-01-20T00:00:00&' +
23792379
'end=2005-02-01T00:00:00')
2380-
# Servers, RAM MB-Hours, CPU Hours, Disk GiB-Hours
2381-
self.assertIn('1 | 25451.76 | 49.71 | 0.00', stdout)
2380+
# Servers, RAM MiB-Hours, CPU Hours, Disk GiB-Hours
2381+
self.assertIn('1 | 25451.76 | 49.71 | 0.00', stdout)
23822382

23832383
def test_usage_stitch_together_next_results(self):
23842384
cmd = 'usage --start 2000-01-20 --end 2005-02-01'
@@ -2397,8 +2397,8 @@ def test_usage_stitch_together_next_results(self):
23972397
'start=2000-01-20T00:00:00&'
23982398
'end=2005-02-01T00:00:00&'
23992399
'marker=%s' % (marker), pos=pos + 1)
2400-
# Servers, RAM MB-Hours, CPU Hours, Disk GiB-Hours
2401-
self.assertIn('2 | 50903.53 | 99.42 | 0.00', stdout)
2400+
# Servers, RAM MiB-Hours, CPU Hours, Disk GiB-Hours
2401+
self.assertIn('2 | 50903.53 | 99.42 | 0.00', stdout)
24022402

24032403
def test_usage_no_tenant(self):
24042404
self.run_command('usage --start 2000-01-20 --end 2005-02-01')

‎novaclient/v2/flavors.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def list(self, detailed=True, is_public=True, marker=None, min_disk=None,
114114
:param marker: Begin returning flavors that appear later in the flavor
115115
list than that represented by this flavor id (optional).
116116
:param min_disk: Filters the flavors by a minimum disk space, in GiB.
117-
:param min_ram: Filters the flavors by a minimum RAM, in MB.
117+
:param min_ram: Filters the flavors by a minimum RAM, in MiB.
118118
:param limit: maximum number of flavors to return (optional).
119119
:param sort_key: Flavors list sort key (optional).
120120
:param sort_dir: Flavors list sort direction (optional).
@@ -183,14 +183,14 @@ def create(self, name, ram, vcpus, disk, flavorid="auto",
183183
"""Create a flavor.
184184
185185
:param name: Descriptive name of the flavor
186-
:param ram: Memory in MB for the flavor
186+
:param ram: Memory in MiB for the flavor
187187
:param vcpus: Number of VCPUs for the flavor
188188
:param disk: Size of local disk in GiB
189189
:param flavorid: ID for the flavor (optional). You can use the reserved
190190
value ``"auto"`` to have Nova generate a UUID for the
191191
flavor in cases where you cannot simply pass ``None``.
192192
:param ephemeral: Ephemeral disk space in GiB.
193-
:param swap: Swap space in MB
193+
:param swap: Swap space in MiB
194194
:param rxtx_factor: RX/TX factor
195195
:param is_public: Whether or not the flavor is public.
196196
:param description: A free form description of the flavor.

0 commit comments

Comments
 (0)