From 9e77debf51869d3f9777bf9c41935fe9d50d309e Mon Sep 17 00:00:00 2001
From: Adit Sarfaty <asarfaty@vmware.com>
Date: Mon, 26 Mar 2018 09:36:25 +0300
Subject: [PATCH] Use current neutron project for devstack & CI

Change-Id: I43186a466dfff3f3c5dab25efcbe8037dc54f50f
---
 devstack/lib/nsx_common     | 24 ++++++++----------------
 devstack/lib/vmware_nsx_tvd | 16 +---------------
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/devstack/lib/nsx_common b/devstack/lib/nsx_common
index 1a154fbffb..c3bd698aac 100644
--- a/devstack/lib/nsx_common
+++ b/devstack/lib/nsx_common
@@ -29,7 +29,7 @@ function _nsxv_ini_set {
     fi
 }
 
-function nsxv_configure_service {
+function install_neutron_projects {
     # TODO(boden): find a better way to use master branch dependencies in devstack
     sudo rm -rf /usr/local/lib/python2.7/dist-packages/networking_l2gw*
     sudo pip install -e "git+https://git.openstack.org/openstack/networking-l2gw#egg=networking_l2gw"
@@ -45,7 +45,13 @@ function nsxv_configure_service {
     sudo pip install -e "git+https://git.openstack.org/openstack/neutron-vpnaas#egg=neutron_vpnaas"
     sudo rm -rf /usr/local/lib/python2.7/dist-packages/vmware_nsxlib*
     sudo pip install -e "git+https://git.openstack.org/openstack/vmware-nsxlib#egg=vmware_nsxlib"
+    sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron
+    sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron.egg*
+    sudo pip install -e "git+https://git.openstack.org/openstack/neutron#egg=neutron"
+}
 
+function nsxv_configure_service {
+    install_neutron_projects
     if [[ "$NSX_L2GW_DRIVER" != "" ]]; then
         iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_l2gw_driver $NSX_L2GW_DRIVER
     fi
@@ -108,21 +114,7 @@ function _nsxv3_ini_set {
 }
 
 function nsxv3_configure_service {
-    # TODO(boden): find a better way to use master branch dependencies in devstack
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/networking_l2gw*
-    sudo pip install -e "git+https://git.openstack.org/openstack/networking-l2gw#egg=networking_l2gw"
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/networking_sfc*
-    sudo pip install -e "git+https://git.openstack.org/openstack/networking-sfc#egg=networking_sfc"
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_lbaas*
-    sudo pip install -e "git+https://git.openstack.org/openstack/neutron-lbaas#egg=neutron_lbaas"
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_fwaas*
-    sudo pip install -e "git+https://git.openstack.org/openstack/neutron-fwaas#egg=neutron_fwaas"
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_dynamic_routing*
-    sudo pip install -e "git+https://git.openstack.org/openstack/neutron-dynamic-routing#egg=neutron_dynamic_routing"
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_vpnaas*
-    sudo pip install -e "git+https://git.openstack.org/openstack/neutron-vpnaas#egg=neutron_vpnaas"
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/vmware_nsxlib*
-    sudo pip install -e "git+https://git.openstack.org/openstack/vmware-nsxlib#egg=vmware_nsxlib"
+    install_neutron_projects
 
     if [[ $1 == "nsx_v3" ]]; then
         _nsxv3_ini_set default_overlay_tz $DEFAULT_OVERLAY_TZ_UUID "The VMware NSX plugin won't work without a default transport zone."
diff --git a/devstack/lib/vmware_nsx_tvd b/devstack/lib/vmware_nsx_tvd
index 3d3cd3586c..83b19ddb59 100644
--- a/devstack/lib/vmware_nsx_tvd
+++ b/devstack/lib/vmware_nsx_tvd
@@ -112,21 +112,7 @@ function neutron_plugin_create_nova_conf {
 function neutron_plugin_install_agent_packages {
     # VMware NSX Plugin does not run q-agt, but it currently needs dhcp and metadata agents
     _neutron_ovs_base_install_agent_packages
-    # TODO(boden): find a better way to use master branch dependencies in devstack
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/networking_l2gw*
-    sudo pip install -e "git+https://git.openstack.org/openstack/networking-l2gw#egg=networking_l2gw"
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/networking_sfc*
-    sudo pip install -e "git+https://git.openstack.org/openstack/networking-sfc#egg=networking_sfc"
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_lbaas*
-    sudo pip install -e "git+https://git.openstack.org/openstack/neutron-lbaas#egg=neutron_lbaas"
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_fwaas*
-    sudo pip install -e "git+https://git.openstack.org/openstack/neutron-fwaas#egg=neutron_fwaas"
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_dynamic_routing*
-    sudo pip install -e "git+https://git.openstack.org/openstack/neutron-dynamic-routing#egg=neutron_dynamic_routing"
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_vpnaas*
-    sudo pip install -e "git+https://git.openstack.org/openstack/neutron-vpnaas#egg=neutron_vpnaas"
-    sudo rm -rf /usr/local/lib/python2.7/dist-packages/vmware_nsxlib*
-    sudo pip install -e "git+https://git.openstack.org/openstack/vmware-nsxlib#egg=vmware_nsxlib"
+    install_neutron_projects
 }
 
 function neutron_plugin_configure_common {