Commit b5ef2316 authored by Guido Trotter's avatar Guido Trotter
Browse files

ShowInstanceConfig: show max and min memory



The old "memory" value is kept as maxmem, for now, for
retrocompatibility.
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 3fa222b4
......@@ -1217,8 +1217,16 @@ def ShowInstanceConfig(opts, args):
buf.write(" - VCPUs: %s\n" %
compat.TryToRoman(instance["be_actual"][constants.BE_VCPUS],
convert=opts.roman_integers))
buf.write(" - maxmem: %sMiB\n" %
compat.TryToRoman(instance["be_actual"][constants.BE_MAXMEM],
convert=opts.roman_integers))
buf.write(" - minmem: %sMiB\n" %
compat.TryToRoman(instance["be_actual"][constants.BE_MINMEM],
convert=opts.roman_integers))
# deprecated "memory" value, kept for one version for compatibility
# TODO(ganeti 2.7) remove.
buf.write(" - memory: %sMiB\n" %
compat.TryToRoman(instance["be_actual"][constants.BE_MEMORY],
compat.TryToRoman(instance["be_actual"][constants.BE_MAXMEM],
convert=opts.roman_integers))
buf.write(" - NICs:\n")
for idx, (ip, mac, mode, link) in enumerate(instance["nics"]):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment