From d6d415e872eb129b97530c01afaf467f53af617d Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Mon, 28 Jan 2008 11:51:47 +0000
Subject: [PATCH] Add option for the number of VCPUs in instance listing
Reviewed-by: ultrotter
---
lib/cmdlib.py | 4 +++-
scripts/gnt-instance | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 7e48df80b..ced3c33c4 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2403,7 +2403,7 @@ class LUQueryInstances(NoHooksLU):
_CheckOutputFields(static=["name", "os", "pnode", "snodes",
"admin_state", "admin_ram",
"disk_template", "ip", "mac", "bridge",
- "sda_size", "sdb_size"],
+ "sda_size", "sdb_size", "vcpus"],
dynamic=self.dynamic_fields,
selected=self.op.output_fields)
@@ -2479,6 +2479,8 @@ class LUQueryInstances(NoHooksLU):
val = None
else:
val = disk.size
+ elif field == "vcpus":
+ val = instance.vcpus
else:
raise errors.ParameterError(field)
iout.append(val)
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 88e138e88..fd54f7ce7 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -176,7 +176,7 @@ def ListInstances(opts, args):
"oper_state": "Status", "admin_ram": "Configured_memory",
"oper_ram": "Memory", "disk_template": "Disk_template",
"ip": "IP Address", "mac": "MAC Address",
- "bridge": "Bridge",
+ "bridge": "Bridge", "vcpus": "VCPUs",
"sda_size": "Disk/0", "sdb_size": "Disk/1"}
else:
headers = None
@@ -186,7 +186,7 @@ def ListInstances(opts, args):
else:
unitfields = None
- numfields = ["admin_ram", "oper_ram", "sda_size", "sdb_size"]
+ numfields = ["admin_ram", "oper_ram", "sda_size", "sdb_size", "vcpus"]
# change raw values to nicer strings
for row in output:
--
GitLab