WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] Merge

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1177667677 -3600
# Node ID 6548dadab8d5a4887d5cb24dfdbcc344fdced309
# Parent  7f5a804d8a6874f19096057e6bbbca9429bba73c
# Parent  80c458bb1b6d0eaa1456514fe134b14271fb4e16
Merge
---
 tools/python/xen/xend/XendNode.py |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff -r 7f5a804d8a68 -r 6548dadab8d5 tools/python/xen/xend/XendNode.py
--- a/tools/python/xen/xend/XendNode.py Fri Apr 27 10:54:00 2007 +0100
+++ b/tools/python/xen/xend/XendNode.py Fri Apr 27 10:54:37 2007 +0100
@@ -141,7 +141,10 @@ class XendNode:
         saved_networks = self.state_store.load_state('network')
         if saved_networks:
             for net_uuid, network in saved_networks.items():
-                XendNetwork.recreate(network, net_uuid)
+                try:
+                    XendNetwork.recreate(network, net_uuid)
+                except CreateUnspecifiedAttributeError:
+                    log.warn("Error recreating network %s", net_uuid)
                 
         # Next discover any existing bridges and check
         # they are not already configured
@@ -161,8 +164,11 @@ class XendNode:
         saved_pifs = self.state_store.load_state('pif')
         if saved_pifs:
             for pif_uuid, pif in saved_pifs.items():
-                XendPIF.recreate(pif, pif_uuid)
- 
+                try:
+                    XendPIF.recreate(pif, pif_uuid)
+                except CreateUnspecifiedAttributeError:
+                    log.warn("Error recreating PIF %s", pif_uuid)
+        
         # Next discover any existing PIFs and check
         # they are not already configured
         configured_pifs = [XendAPIStore.get(
@@ -217,7 +223,10 @@ class XendNode:
         saved_pbds = self.state_store.load_state('pbd')
         if saved_pbds:
             for pbd_uuid, pbd_cfg in saved_pbds.items():
-                XendPBD.recreate(pbd_uuid, pbd_cfg)
+                try:
+                    XendPBD.recreate(pbd_uuid, pbd_cfg)
+                except CreateUnspecifiedAttributeError:
+                    log.warn("Error recreating PBD %s", pbd_uuid) 
 
 ##    def network_destroy(self, net_uuid):
  ##       del self.networks[net_uuid]

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

<Prev in Thread] Current Thread [Next in Thread>