From 418c773e14a9ed829a7c56b7e114dd7a928d19f8 Mon Sep 17 00:00:00 2001
From: Tong Liu <tongl@vmware.com>
Date: Mon, 15 May 2017 15:32:16 +0000
Subject: [PATCH] Use vmware_nsx aliases for neutron core plugins

With commit baef191d1f5b26119e098d4ae72fb032f5a79d0e, we have
defined aliases for different version of vmware_nsx plugins. Now,
if we don't provide alias during devstack setup, neutron failed
to come up with the following error
"NoMatches: No 'neutron.core_plugins' driver found, looking for
'vmware_nsx.plugin.NsxV3Plugin'"

This patch changes Q_PLUGIN_CLASS to vmware_nsx aliases. So that
the core_plugins in neutron conf will use that to load.

Change-Id: Ibaa1caf4dc7ad14d5f7e3e43ca5173e6474f9451
---
 devstack/lib/vmware_dvs    | 2 +-
 devstack/lib/vmware_nsx    | 2 +-
 devstack/lib/vmware_nsx_v  | 2 +-
 devstack/lib/vmware_nsx_v3 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/devstack/lib/vmware_dvs b/devstack/lib/vmware_dvs
index c0ed655fe9..d6038cc995 100644
--- a/devstack/lib/vmware_dvs
+++ b/devstack/lib/vmware_dvs
@@ -69,7 +69,7 @@ function neutron_plugin_configure_common {
     mkdir -p /$Q_PLUGIN_CONF_PATH
     cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/nsx.ini.sample /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
     Q_DB_NAME="neutron_nsx"
-    Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxDvsPlugin"
+    Q_PLUGIN_CLASS="vmware_dvs"
 }
 
 function neutron_plugin_configure_debug_command {
diff --git a/devstack/lib/vmware_nsx b/devstack/lib/vmware_nsx
index 7b445cb644..40dbcf0109 100644
--- a/devstack/lib/vmware_nsx
+++ b/devstack/lib/vmware_nsx
@@ -71,7 +71,7 @@ function neutron_plugin_configure_common {
     (cd $DEST/$VMWARE_NSX_DIR && exec ./tools/generate_config_file_samples.sh)
     mkdir -p /$Q_PLUGIN_CONF_PATH
     cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/nsx.ini.sample /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
-    Q_PLUGIN_CLASS="neutron.plugins.vmware.plugin.NsxPlugin"
+    Q_PLUGIN_CLASS="vmware_nsx"
 }
 
 function neutron_plugin_configure_debug_command {
diff --git a/devstack/lib/vmware_nsx_v b/devstack/lib/vmware_nsx_v
index 7518741e57..cf23f5466b 100644
--- a/devstack/lib/vmware_nsx_v
+++ b/devstack/lib/vmware_nsx_v
@@ -59,7 +59,7 @@ function neutron_plugin_configure_common {
     cp -v $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy/routers.json $NEUTRON_CONF_DIR/policy.d
     cp -v $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy/network-gateways.json $NEUTRON_CONF_DIR/policy.d
     Q_DB_NAME="neutron_nsx"
-    Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxVPlugin"
+    Q_PLUGIN_CLASS="vmware_nsxv"
 }
 
 function neutron_plugin_configure_debug_command {
diff --git a/devstack/lib/vmware_nsx_v3 b/devstack/lib/vmware_nsx_v3
index 0f490c3fbc..b7aadb0efc 100644
--- a/devstack/lib/vmware_nsx_v3
+++ b/devstack/lib/vmware_nsx_v3
@@ -124,7 +124,7 @@ function neutron_plugin_configure_common {
     sudo install -d -o $STACK_USER $NEUTRON_CONF_DIR/policy.d
     cp -v $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy/routers.json $NEUTRON_CONF_DIR/policy.d
     cp -v $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy/network-gateways.json $NEUTRON_CONF_DIR/policy.d
-    Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxV3Plugin"
+    Q_PLUGIN_CLASS="vmware_nsxv3"
 }
 
 function neutron_plugin_configure_debug_command {