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...

diff --git a/xenserver/etc_xapi.d_plugins_vswitch-cfg-update b/xenserver/etc_xapi.d_plugins_vswitch-cfg-update
index a15dba01405858ac3b361bd012d4c8a11a3748ab..783e414315c2b4895c1a1aa9f9fe83bf110fb1d3 100755 (executable)
--- 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 a9a8cc893cddb1d00c0c39fe04b38948c787c6ad..ccfd32f12cf138f32b976fa4a8ea93bdfc176b0d 100644 (file)
--- 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))