OpenStack Compute (nova)

Merge lp:~vishvananda/nova/fix-swap-manage into lp:~hudson-openstack/nova/trunk

  1. fix-swap-manage
  2. Merge into trunk
Proposed by Vish Ishaya
Status: Merged
Approved by: Jesse Andrews
Approved revision: 1604
Merged at revision: 1605
Proposed branch: lp:~vishvananda/nova/fix-swap-manage
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
bin/nova-manage (+1/-1)
To merge this branch: bzr merge lp:~vishvananda/nova/fix-swap-manage
Reviewer Review Type Date Requested Status
Jesse Andrews (community) Approve
Christopher MacGown (community) Approve
Devin Carlen (community) Approve
Mark McLoughlin (community) Approve
Review via email: mp+76181@code.launchpad.net

Description of the change

Fix the display of swap units in nova manage.

To post a comment you must log in.
Revision history for this message
Mark McLoughlin (markmc) wrote :

lgtm

There doesn't seem to be a lot of places where the semantics are clear, except e.g. libvirt/connection.py:

  swap_mb = inst_type['swap']

Updating the docs for the --swap arg to 'nova-manage instance_type create' would help

review: Approve
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve
Revision history for this message
Christopher MacGown (0x44) :
review: Approve
Revision history for this message
Jesse Andrews (anotherjesse) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/nova-manage'
2--- bin/nova-manage 2011-09-20 06:50:27 +0000
3+++ bin/nova-manage 2011-09-20 10:11:42 +0000
4@@ -1692,7 +1692,7 @@
5 def _print_instance_types(self, name, val):
6 deleted = ('', ', inactive')[val["deleted"] == 1]
7 print ("%s: Memory: %sMB, VCPUS: %s, Storage: %sGB, FlavorID: %s, "
8- "Swap: %sGB, RXTX Quota: %sGB, RXTX Cap: %sMB%s") % (
9+ "Swap: %sMB, RXTX Quota: %sGB, RXTX Cap: %sMB%s") % (
10 name, val["memory_mb"], val["vcpus"], val["local_gb"],
11 val["flavorid"], val["swap"], val["rxtx_quota"],
12 val["rxtx_cap"], deleted)