[Xen-changelog] [xen-3.0.5-testing] [XM] Differentiate between VLAN PIFs and normal PIFs in network-show

["Xen patchbot-3.0.5-testing" <patchbot-3.0.5-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Tom Wilkie <tom.wilkie@xxxxxxxxx>
# Date 1177674674 -3600
# Node ID 499e50c3115f0e7fd62bedb083119edb76cdb18c
# Parent  55d7745bd37778afd4c1883aab8a57823826412b
[XM] Differentiate between VLAN PIFs and normal PIFs in network-show

signed-off-by: Tom Wilkie <tom.wilkie@xxxxxxxxx>
---
 tools/python/xen/xm/main.py |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff -r 55d7745bd377 -r 499e50c3115f tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Fri Apr 27 12:49:17 2007 +0100
+++ b/tools/python/xen/xm/main.py       Fri Apr 27 12:51:14 2007 +0100
@@ -2301,11 +2301,19 @@ def xm_network_show(args):
             else:
                 vif = '' 
 
+            if pif:
+                if int(pif['VLAN']) > -1:
+                    pif = '%s.%s' % (pif['device'], pif['VLAN'])
+                else:
+                    pif = pif['device']
+            else:
+                pif = ''
+
             if i == 0:
                 r = {'name_label':network['name_label'],
-                     'vif':vif, 'pif':pif['device']}
+                     'vif':vif, 'pif':pif}
             else:
-                r = {'name_label':'','vif':vif,'pif':pif['device']}
+                r = {'name_label':'', 'vif':vif, 'pif':pif}
 
             print format2 % r
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog