From: Alastair Tse <atse@xensource.com>
Date: Tue, 30 Jan 2007 11:37:18 +0000 (+0000)
Subject: [XEND] Unparsable VLAN numbers should default to -1
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15368^2~37
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9fd37a76223247cfb87c5220942f0c9e9e8390a0;p=xen.git

[XEND] Unparsable VLAN numbers should default to -1

Signed-off-by: Alastair Tse <atse@xensource.com>
---

diff --git a/tools/python/xen/xend/XendNode.py b/tools/python/xen/xend/XendNode.py
index 6a01e958f2..c2e336b345 100644
--- a/tools/python/xen/xend/XendNode.py
+++ b/tools/python/xen/xend/XendNode.py
@@ -125,8 +125,13 @@ class XendNode:
                             # Compatibility hack, can go pretty soon.
                             pif['metrics'] = uuid.createString()
 
+                        try:
+                            pif['VLAN'] = int(pif.get('VLAN', -1))
+                        except (ValueError, TypeError):
+                            pif['VLAN'] = -1
+
                         self._PIF_create(pif['device'], pif['MTU'],
-                                         int(pif['VLAN']),
+                                         pif['VLAN'],
                                          pif['MAC'], network, False, pif_uuid,
                                          pif['metrics'])
                     except NetworkAlreadyConnected, exn:
diff --git a/tools/python/xen/xend/XendPIF.py b/tools/python/xen/xend/XendPIF.py
index 6c8fcae6d6..b028427863 100644
--- a/tools/python/xen/xend/XendPIF.py
+++ b/tools/python/xen/xend/XendPIF.py
@@ -138,8 +138,9 @@ class XendPIF:
             
             rc, _ = _cmd('vconfig add %s %d', self.device, self.vlan)
             if rc != 0:
-                log.error('Could not refresh %s', ifname)
+                log.error('Could not refresh VLAN for interface %s', ifname)
                 return
+            
             log.info('Created network interface %s', ifname)
 
         for brname, nics in bridges.items():