From 15f0ac63943809329f765fd371d85aaa3eba2390 Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Mon, 18 May 2009 17:08:47 -0700 Subject: [PATCH] xen: Fix a missed xapi plugin from the Nicira brand stripping Missed a xapi plugin during the rebranding. This adds that and fixes a couple of case-senstive variable issues. Ugh, need to figure out how to make local Xen RPM builds... --- xenserver/etc_xapi.d_plugins_vswitch-cfg-update | 2 +- xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xenserver/etc_xapi.d_plugins_vswitch-cfg-update b/xenserver/etc_xapi.d_plugins_vswitch-cfg-update index a15dba01..783e4143 100755 --- a/xenserver/etc_xapi.d_plugins_vswitch-cfg-update +++ b/xenserver/etc_xapi.d_plugins_vswitch-cfg-update @@ -44,7 +44,7 @@ def update(session, args): raise XenAPIPlugin.Failure("MORE_THAN_ONE_POOL_FOR_HOST", []) pool = session.xenapi.pool.get_record(pools[0]) try: - controller = pool["other_config"]["niciraController"] + controller = pool["other_config"]["vSwitchController"] except KeyError, e: controller = "" currentController = vswitchCurrentController() diff --git a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py index a9a8cc89..ccfd32f1 100644 --- a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py +++ b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py @@ -90,7 +90,7 @@ class VSwitchControllerDialogue(Dialogue): self.hostsInPool = 0 self.hostsUpdated = 0 - self.controller = data.GetPoolForThisHost().get("other_config", {}).get("vswitchController", "") + self.controller = data.GetPoolForThisHost().get("other_config", {}).get("vSwitchController", "") choiceDefs = [ ChoiceDef(Lang("Set pool-wide controller"), @@ -201,7 +201,7 @@ class VSwitchControllerDialogue(Dialogue): def SetController(self, ip): self.hostsInPool = 0 self.hostsUpdated = 0 - Task.Sync(lambda s: self._modifyPoolConfig(s, "vswitchController", ip)) + Task.Sync(lambda s: self._modifyPoolConfig(s, "vSwitchController", ip)) # Should be done asynchronously, maybe with an external script? Task.Sync(lambda s: self._updateActiveServers(s)) -- 2.30.2