LGTM, thanks!
On Tue, Feb 19, 2013 at 3:45 PM, Dimitris Aragiorgis <[email protected]>wrote: > In case a NIC is not inside a network then netinfo None. Thus > netinfo["name"] fails. > > Signed-off-by: Dimitris Aragiorgis <[email protected]> > --- > lib/client/gnt_instance.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py > index f223566..d8cd332 100644 > --- a/lib/client/gnt_instance.py > +++ b/lib/client/gnt_instance.py > @@ -1178,9 +1178,12 @@ def ShowInstanceConfig(opts, args): > # TODO(ganeti 2.7) rework the NICs as well > buf.write(" - NICs:\n") > for idx, (ip, mac, mode, link, _, netinfo) in > enumerate(instance["nics"]): > + network_name = None > + if netinfo: > + network_name = netinfo["name"] > buf.write(" - nic/%d: MAC: %s, IP: %s," > " mode: %s, link: %s, network: %s\n" % > - (idx, mac, ip, mode, link, netinfo["name"])) > + (idx, mac, ip, mode, link, network_name)) > buf.write(" Disk template: %s\n" % instance["disk_template"]) > buf.write(" Disks:\n") > > -- > 1.7.10.4 > > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.10 (GNU/Linux) > > iQEcBAEBCAAGBQJRI5AKAAoJEMk10sCdtK5j/cIH/2R+f+1BHSkqEZRPQabcxZZ8 > TZvY0lDiy1BTBnhZlmAFClkc9jTXvmexUvS2doIT2iPgAsPSE8ksebO/XWJaLIbf > vRV2WQ5iJ/lbBje0/v+1yAtiUSbOcDHVV7hbYYAy+0k/Bi2/wiCCIHHxVV4jiFvP > 3XAS2dj/zjbg76c7hwMuCX9hK3y4mS+9IbGvVyAviFhvP/sAKVT9Z7dV+N0Z1k8C > HULfXvAtQWfsqm4iJO0GTy2Ko1dgZcJtZZp91HFAaN7ghWA1TAFW/ubj0ls5P7uR > KnTK5xgmVt+9malEEQdlCTyDNyH5K8AinGRbD77PROxcVCTQnFB2VNRf6EkSv10= > =w3Ff > -----END PGP SIGNATURE----- > >
