diff --git a/devstack/lib/nsx_v3_p_common b/devstack/lib/nsx_v3_p_common
index 8722907abf..2e19e15123 100644
--- a/devstack/lib/nsx_v3_p_common
+++ b/devstack/lib/nsx_v3_p_common
@@ -19,6 +19,27 @@
 # Common code for VMware NSXv3 and NSXp plugins which share the same backend
 # --------------------------------------------------------------------------
 
+# Settings previously defined in devstack:lib/neutron-legacy
+NEUTRON_CONF_DIR=/etc/neutron
+export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}
+Q_DHCP_CONF_FILE=$NEUTRON_CONF_DIR/dhcp_agent.ini
+
+# The interface which has connectivity to the NSX Gateway uplink
+NSX_GATEWAY_NETWORK_INTERFACE=${NSX_GATEWAY_NETWORK_INTERFACE:-}
+
+# Override default 'True' in devstack:lib/neutron_plugins/services/l3
+Q_USE_PROVIDERNET_FOR_PUBLIC=False
+
+# Native support from platform
+NATIVE_DHCP_METADATA=${NATIVE_DHCP_METADATA:-True}
+NATIVE_METADATA_ROUTE=${NATIVE_METADATA_ROUTE:-169.254.169.254/31}
+METADATA_PROXY_SHARED_SECRET=${METADATA_PROXY_SHARED_SECRET:-}
+
+# File to store client certificate and PK
+CLIENT_CERT_FILE=${DEST}/data/neutron/client.pem
+
+source $TOP_DIR/lib/neutron_plugins/ovs_base
+
 function is_neutron_ovs_base_plugin {
     # This allows the deployer to decide whether devstack should install OVS.
     # By default, we install OVS, to change this behavior add "OVS_BASE=1" to your localrc file.
@@ -107,3 +128,70 @@ function set_nsx_gateway_network_cidr {
         sudo ip addr add dev $NSX_GATEWAY_NETWORK_INTERFACE $address
     done
 }
+
+function setup_integration_bridge_common {
+    die_if_not_set $LINENO NSX_USER "NSX_USER has not been set!"
+    die_if_not_set $LINENO NSX_PASSWORD "NSX_PASSWORD has not been set!"
+    # Ensure that the OVS params are set for the OVS utils
+    iniset $NEUTRON_CONF DEFAULT ovs_integration_bridge $OVS_BRIDGE
+    iniset $NEUTRON_CONF OVS ovsdb_connection $(_ovsdb_connection)
+    iniset $NEUTRON_CONF OVS ovsdb_interface vsctl
+    _neutron_ovs_base_setup_bridge $OVS_BRIDGE
+    sudo ovs-vsctl set bridge $OVS_BRIDGE external_ids:bridge-id=nsx-managed
+    sudo ovs-vsctl set-manager $(_ovsdb_connection)
+}
+
+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
+}
+
+function _version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
+
+function neutron_plugin_configure_common_v3 {
+    Q_PLUGIN_CONF_PATH=etc/neutron/plugins/vmware
+    Q_PLUGIN_CONF_FILENAME=nsx.ini
+    Q_PLUGIN_SRC_CONF_PATH=vmware-nsx/etc
+    VMWARE_NSX_DIR=vmware-nsx
+    # Uses oslo config generator to generate sample configuration file
+    (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
+    sudo install -d -o $STACK_USER $NEUTRON_CONF_DIR/policy.d
+    cp -vr $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy.d/* $NEUTRON_CONF_DIR/policy.d/
+    Q_PLUGIN_CLASS=$1
+}
+
+function neutron_plugin_configure_debug_command {
+    sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE
+    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge "$PUBLIC_BRIDGE"
+}
+
+function neutron_plugin_configure_dhcp_agent {
+    setup_integration_bridge
+    iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True
+    iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True
+    iniset $Q_DHCP_CONF_FILE DEFAULT ovs_use_veth True
+    iniset $Q_DHCP_CONF_FILE DEFAULT ovs_integration_bridge $OVS_BRIDGE
+    iniset $Q_DHCP_CONF_FILE OVS ovsdb_connection $(_ovsdb_connection)
+    iniset $Q_DHCP_CONF_FILE OVS ovsdb_interface vsctl
+}
+
+function neutron_plugin_setup_interface_driver {
+    local conf_file=$1
+    iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver
+}
+
+function neutron_plugin_check_adv_test_requirements {
+    is_service_enabled q-dhcp && return 0
+}
+
+function _ovsdb_connection_common {
+    NSX_POLICY_IP=$1
+    NSX_VER=$(curl -1 -s -k -u "$NSX_USER:$NSX_PASSWORD" -H 'Accept: application/json' https://$NSX_POLICY_IP/api/v1/node | python -c  'import sys, json; print json.load(sys.stdin)["node_version"][:5]')
+    if [ $(_version $NSX_VER) -ge $(_version 1.1.0) ]; then
+        echo "unix:/var/run/vmware/nsx-agent/nsxagent_ovsdb.sock"
+    else
+        echo "tcp:127.0.0.1:6632"
+    fi
+}
diff --git a/devstack/lib/vmware_nsx_p b/devstack/lib/vmware_nsx_p
index 09706b0a53..b29c448f34 100644
--- a/devstack/lib/vmware_nsx_p
+++ b/devstack/lib/vmware_nsx_p
@@ -17,149 +17,29 @@
 #    under the License.
 
 
-# Neutron VMware NSX plugin
-# -------------------------
-
-# Settings previously defined in devstack:lib/neutron-legacy
-NEUTRON_CONF_DIR=/etc/neutron
-export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}
-Q_DHCP_CONF_FILE=$NEUTRON_CONF_DIR/dhcp_agent.ini
-
-# The interface which has connectivity to the NSX Gateway uplink
-NSX_GATEWAY_NETWORK_INTERFACE=${NSX_GATEWAY_NETWORK_INTERFACE:-}
-
-# Override default 'True' in devstack:lib/neutron_plugins/services/l3
-Q_USE_PROVIDERNET_FOR_PUBLIC=False
-
-# Native support from platform
-NATIVE_DHCP_METADATA=${NATIVE_DHCP_METADATA:-True}
-NATIVE_METADATA_ROUTE=${NATIVE_METADATA_ROUTE:-169.254.169.254/31}
-METADATA_PROXY_SHARED_SECRET=${METADATA_PROXY_SHARED_SECRET:-}
+# Neutron VMware NSX Policy plugin
+# --------------------------------
 
 # Save trace setting
 NSX_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
-# File to store client certificate and PK
-CLIENT_CERT_FILE=${DEST}/data/neutron/client.pem
-
-source $TOP_DIR/lib/neutron_plugins/ovs_base
 dir=${GITDIR['vmware-nsx']}/devstack
 source $dir/lib/nsx_common
 source $dir/lib/nsx_v3_p_common
 
-
-function _version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
-
 function _ovsdb_connection {
     managers=(${NSX_POLICY//,/ })
-    NSX_POLICY_IP=${managers[0]}
-    NSX_VER=$(curl -1 -s -k -u "$NSX_USER:$NSX_PASSWORD" -H 'Accept: application/json' https://$NSX_POLICY_IP/api/v1/node | python -c  'import sys, json; print json.load(sys.stdin)["node_version"][:5]')
-    if [ $(_version $NSX_VER) -ge $(_version 1.1.0) ]; then
-        echo "unix:/var/run/vmware/nsx-agent/nsxagent_ovsdb.sock"
-    else
-        echo "tcp:127.0.0.1:6632"
-    fi
+    _ovsdb_connection ${managers[0]}
 }
 
 function setup_integration_bridge {
     die_if_not_set $LINENO NSX_POLICY "NSX_POLICY has not been set!"
-    die_if_not_set $LINENO NSX_USER "NSX_USER has not been set!"
-    die_if_not_set $LINENO NSX_PASSWORD "NSX_PASSWORD has not been set!"
-    # Ensure that the OVS params are set for the OVS utils
-    iniset $NEUTRON_CONF DEFAULT ovs_integration_bridge $OVS_BRIDGE
-    iniset $NEUTRON_CONF OVS ovsdb_connection $(_ovsdb_connection)
-    iniset $NEUTRON_CONF OVS ovsdb_interface vsctl
-    _neutron_ovs_base_setup_bridge $OVS_BRIDGE
-    sudo ovs-vsctl set bridge $OVS_BRIDGE external_ids:bridge-id=nsx-managed
-    sudo ovs-vsctl set-manager $(_ovsdb_connection)
-}
-
-function is_neutron_ovs_base_plugin {
-    # This allows the deployer to decide whether devstack should install OVS.
-    # By default, we install OVS, to change this behavior add "OVS_BASE=1" to your localrc file.
-    # Note: Any KVM compute must have OVS installed on it.
-    return ${OVS_BASE:-0}
-}
-
-function neutron_plugin_create_nova_conf {
-    if [[ "$VIRT_DRIVER" != 'vsphere' ]]; then
-        # if n-cpu or octavia is enabled, then setup integration bridge
-        if is_service_enabled n-cpu || is_service_enabled octavia ; then
-            setup_integration_bridge
-            if is_service_enabled n-cpu ; then
-                iniset $NOVA_CONF neutron ovs_bridge $OVS_BRIDGE
-            fi
-        fi
-    fi
-    # if n-api is enabled, then setup the metadata_proxy_shared_secret
-    if is_service_enabled n-api; then
-        iniset $NOVA_CONF neutron service_metadata_proxy True
-        if [[ "$NATIVE_DHCP_METADATA" == "True" ]]; then
-            iniset $NOVA_CONF neutron metadata_proxy_shared_secret $METADATA_PROXY_SHARED_SECRET
-            if [[ "$METADATA_PROXY_USE_HTTPS" == "True" ]]; then
-                iniset $NOVA_CONF DEFAULT enabled_ssl_apis metadata
-                if [[ "$METADATA_PROXY_CERT_FILE" != "" ]]; then
-                    iniset $NOVA_CONF wsgi ssl_cert_file $METADATA_PROXY_CERT_FILE
-                fi
-                if [[ "$METADATA_PROXY_PRIV_KEY_FILE" != "" ]]; then
-                    iniset $NOVA_CONF wsgi ssl_key_file $METADATA_PROXY_PRIV_KEY_FILE
-                fi
-            fi
-        fi
-    fi
-    # if n-api-meta is enabled, then setup https on n-api-meta
-    if is_service_enabled n-api-meta; then
-        if [[ "$NATIVE_DHCP_METADATA" == "True" && "$METADATA_PROXY_USE_HTTPS" == "True" ]]; then
-            inidelete $NOVA_METADATA_UWSGI_CONF uwsgi http
-            https=":8775,$METADATA_PROXY_CERT_FILE,$METADATA_PROXY_PRIV_KEY_FILE"
-            iniset $NOVA_METADATA_UWSGI_CONF uwsgi https $https
-        fi
-    fi
-}
-
-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
+    setup_integration_bridge_common
 }
 
 function neutron_plugin_configure_common {
-    Q_PLUGIN_CONF_PATH=etc/neutron/plugins/vmware
-    Q_PLUGIN_CONF_FILENAME=nsx.ini
-    Q_PLUGIN_SRC_CONF_PATH=vmware-nsx/etc
-    VMWARE_NSX_DIR=vmware-nsx
-    # Uses oslo config generator to generate sample configuration file
-    (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
-    sudo install -d -o $STACK_USER $NEUTRON_CONF_DIR/policy.d
-    cp -vr $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy.d/* $NEUTRON_CONF_DIR/policy.d/
-    Q_PLUGIN_CLASS="vmware_nsxp"
-}
-
-function neutron_plugin_configure_debug_command {
-    sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE
-    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge "$PUBLIC_BRIDGE"
-}
-
-function neutron_plugin_configure_dhcp_agent {
-    setup_integration_bridge
-    iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True
-    iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True
-    iniset $Q_DHCP_CONF_FILE DEFAULT ovs_use_veth True
-    iniset $Q_DHCP_CONF_FILE DEFAULT ovs_integration_bridge $OVS_BRIDGE
-    iniset $Q_DHCP_CONF_FILE OVS ovsdb_connection $(_ovsdb_connection)
-    iniset $Q_DHCP_CONF_FILE OVS ovsdb_interface vsctl
-}
-
-function neutron_plugin_configure_l3_agent {
-    # VMware NSX plugin does not run L3 agent
-    die $LINENO "q-l3 should not be executed with VMware NSX plugin!"
-}
-
-function neutron_plugin_configure_plugin_agent {
-    # VMware NSX plugin does not run L2 agent
-    die $LINENO "q-agt must not be executed with VMware NSX plugin!"
+    neutron_plugin_configure_common_v3 "vmware_nsxp"
 }
 
 function neutron_plugin_configure_service {
@@ -167,15 +47,6 @@ function neutron_plugin_configure_service {
     iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_extension_drivers vmware_nsxp_dns
 }
 
-function neutron_plugin_setup_interface_driver {
-    local conf_file=$1
-    iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver
-}
-
-function neutron_plugin_check_adv_test_requirements {
-    is_service_enabled q-dhcp && return 0
-}
-
 function nsxp_configure_service {
     install_neutron_projects
     if [[ "$DEFAULT_TIER0_ROUTER_UUID" != "" ]]; then
diff --git a/devstack/lib/vmware_nsx_v3 b/devstack/lib/vmware_nsx_v3
index a16b2235fe..1aa1f8ad9c 100644
--- a/devstack/lib/vmware_nsx_v3
+++ b/devstack/lib/vmware_nsx_v3
@@ -20,113 +20,33 @@
 # Neutron VMware NSX plugin
 # -------------------------
 
-# Settings previously defined in devstack:lib/neutron-legacy
-NEUTRON_CONF_DIR=/etc/neutron
-export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}
-Q_DHCP_CONF_FILE=$NEUTRON_CONF_DIR/dhcp_agent.ini
-
-# The interface which has connectivity to the NSX Gateway uplink
-NSX_GATEWAY_NETWORK_INTERFACE=${NSX_GATEWAY_NETWORK_INTERFACE:-}
-
-# Override default 'True' in devstack:lib/neutron_plugins/services/l3
-Q_USE_PROVIDERNET_FOR_PUBLIC=False
-
-# Native support from platform
-NATIVE_DHCP_METADATA=${NATIVE_DHCP_METADATA:-True}
-NATIVE_METADATA_ROUTE=${NATIVE_METADATA_ROUTE:-169.254.169.254/31}
-METADATA_PROXY_SHARED_SECRET=${METADATA_PROXY_SHARED_SECRET:-}
-
 # Save trace setting
 NSX_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
-# File to store client certificate and PK
-CLIENT_CERT_FILE=${DEST}/data/neutron/client.pem
-
-source $TOP_DIR/lib/neutron_plugins/ovs_base
 dir=${GITDIR['vmware-nsx']}/devstack
 source $dir/lib/nsx_common
 source $dir/lib/nsx_v3_p_common
 
-
-function _version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
-
 function _ovsdb_connection {
     managers=(${NSX_MANAGER//,/ })
-    NSX_MGR_IP=${managers[0]}
-    NSX_VER=$(curl -1 -s -k -u "$NSX_USER:$NSX_PASSWORD" -H 'Accept: application/json' https://$NSX_MGR_IP/api/v1/node | python -c  'import sys, json; print json.load(sys.stdin)["node_version"][:5]')
-    if [ $(_version $NSX_VER) -ge $(_version 1.1.0) ]; then
-        echo "unix:/var/run/vmware/nsx-agent/nsxagent_ovsdb.sock"
-    else
-        echo "tcp:127.0.0.1:6632"
-    fi
+    _ovsdb_connection ${managers[0]}
 }
 
 function setup_integration_bridge {
     die_if_not_set $LINENO NSX_MANAGER "NSX_MANAGER has not been set!"
-    die_if_not_set $LINENO NSX_USER "NSX_USER has not been set!"
-    die_if_not_set $LINENO NSX_PASSWORD "NSX_PASSWORD has not been set!"
-    # Ensure that the OVS params are set for the OVS utils
-    iniset $NEUTRON_CONF DEFAULT ovs_integration_bridge $OVS_BRIDGE
-    iniset $NEUTRON_CONF OVS ovsdb_connection $(_ovsdb_connection)
-    iniset $NEUTRON_CONF OVS ovsdb_interface vsctl
-    _neutron_ovs_base_setup_bridge $OVS_BRIDGE
-    sudo ovs-vsctl set bridge $OVS_BRIDGE external_ids:bridge-id=nsx-managed
-    sudo ovs-vsctl set-manager $(_ovsdb_connection)
-}
-
-
-
-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
+    setup_integration_bridge_common
 }
 
 function neutron_plugin_configure_common {
-    Q_PLUGIN_CONF_PATH=etc/neutron/plugins/vmware
-    Q_PLUGIN_CONF_FILENAME=nsx.ini
-    Q_PLUGIN_SRC_CONF_PATH=vmware-nsx/etc
-    VMWARE_NSX_DIR=vmware-nsx
-    # Uses oslo config generator to generate sample configuration file
-    (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
-    sudo install -d -o $STACK_USER $NEUTRON_CONF_DIR/policy.d
-    cp -vr $DEST/$Q_PLUGIN_SRC_CONF_PATH/policy.d/* $NEUTRON_CONF_DIR/policy.d/
-    Q_PLUGIN_CLASS="vmware_nsxv3"
+    neutron_plugin_configure_common_v3 "vmware_nsxv3"
 }
 
-function neutron_plugin_configure_debug_command {
-    sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE
-    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge "$PUBLIC_BRIDGE"
-}
-
-function neutron_plugin_configure_dhcp_agent {
-    setup_integration_bridge
-    iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True
-    iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True
-    iniset $Q_DHCP_CONF_FILE DEFAULT ovs_use_veth True
-    iniset $Q_DHCP_CONF_FILE DEFAULT ovs_integration_bridge $OVS_BRIDGE
-    iniset $Q_DHCP_CONF_FILE OVS ovsdb_connection $(_ovsdb_connection)
-    iniset $Q_DHCP_CONF_FILE OVS ovsdb_interface vsctl
-}
-
-
 function neutron_plugin_configure_service {
     nsxv3_configure_service nsx_v3
     iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_extension_drivers vmware_nsxv3_dns
 }
 
-function neutron_plugin_setup_interface_driver {
-    local conf_file=$1
-    iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver
-}
-
-function neutron_plugin_check_adv_test_requirements {
-    is_service_enabled q-dhcp && return 0
-}
-
-
 function init_vmware_nsx_v3 {
     if (is_service_enabled q-svc || is_service_enabled neutron-api) && [[ "$NATIVE_DHCP_METADATA" == "True" ]]; then
         if ! is_set DHCP_PROFILE_UUID; then