From 0b13832caf657d44cffa51b88993b21e835104ac Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Tue, 16 Jun 2009 17:44:31 +0100
Subject: [PATCH] Fix QueryInstanceData for nic parameters
This CL updates QueryInstanceData to return NICs in the new format (mac,
ip, mode, link) and fixes gnt-instance info to properly display them.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cmdlib.py | 3 ++-
scripts/gnt-instance | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 58318e330..89e14dc3f 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5830,7 +5830,8 @@ class LUQueryInstanceData(NoHooksLU):
"pnode": instance.primary_node,
"snodes": instance.secondary_nodes,
"os": instance.os,
- "nics": [(nic.mac, nic.ip, nic.bridge) for nic in instance.nics],
+ # this happens to be the same format used for hooks
+ "nics": _NICListToTuple(self, instance.nics),
"disks": disks,
"hypervisor": instance.hypervisor,
"network_port": instance.network_port,
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 25d8f94cc..903654d30 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -1158,9 +1158,9 @@ def ShowInstanceConfig(opts, args):
buf.write(" - memory: %dMiB\n" %
instance["be_actual"][constants.BE_MEMORY])
buf.write(" - NICs:\n")
- for idx, (mac, ip, bridge) in enumerate(instance["nics"]):
- buf.write(" - nic/%d: MAC: %s, IP: %s, bridge: %s\n" %
- (idx, mac, ip, bridge))
+ for idx, (mac, ip, mode, link) in enumerate(instance["nics"]):
+ buf.write(" - nic/%d: MAC: %s, IP: %s, mode: %s, link: %s\n" %
+ (idx, mac, ip, mode, link))
buf.write(" Disks:\n")
for idx, device in enumerate(instance["disks"]):
@@ -1388,7 +1388,7 @@ commands = {
"Lists the instances and their status. The available fields are"
" (see the man page for details): status, oper_state, oper_ram,"
" name, os, pnode, snodes, admin_state, admin_ram, disk_template,"
- " ip, mac, bridge, sda_size, sdb_size, vcpus, serial_no,"
+ " ip, mac, mode, link, sda_size, sdb_size, vcpus, serial_no,"
" hypervisor."
" The default field"
" list is (in order): %s." % ", ".join(_LIST_DEF_FIELDS),
--
GitLab