From: Ethan Jackson <ethan@nicira.com>
Date: Thu, 20 Jan 2011 01:57:08 +0000 (-0800)
Subject: xenserver: Fix interface reconfigure crash when setting fail_mode.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2875f43a2de6e3d8c31b63601aa136c64a1053e;p=openvswitch

xenserver: Fix interface reconfigure crash when setting fail_mode.

Interface reconfigure can crash when setting fail_mode if an
expected other_config setting is not set.
---

diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
index a3d4bd24..22201ae2 100644
--- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
+++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
@@ -334,7 +334,7 @@ def configure_datapath(pif):
     pool = db().get_pool_record()
 
     if pool:
-        fail_mode = pool['other_config']['vswitch-controller-fail-mode']
+        fail_mode = pool['other_config'].get('vswitch-controller-fail-mode')
     else:
         fail_mode = 'standalone'