To enable odl_l3 and l2gw feature work together

This patch will revert the temporary change done
in Gerrit Review #51460  which was when odl_l3 and
l2gw were not working together.

Change-Id: I0dfcc5adec1b516807f56e92ce5a400f200c6689
Signed-off-by: abbas <abbas.pareedkunju@tcs.com>

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index 5143247648dcf9e108bb19017ec0bd4395eec768..35e23adbefc08191a3f0d046093565dce0416fe4 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -151,18 +151,28 @@ disable_service q-l3
 PUBLIC_INTERFACE=br100
 EOF
 
-if [ -z ${DISABLE_ODL_L3_PLUGIN} ] || [ "${DISABLE_ODL_L3_PLUGIN}" == "no" ]; then
 if [ "${ODL_ML2_BRANCH}" == "stable/mitaka" ]; then
 cat >> ${local_conf_file_name} << EOF
 Q_L3_ENABLED=True
 ODL_L3=${ODL_L3}
+
+EOF
+if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
+cat >> ${local_conf_file_name} << EOF
 [[post-config|\$NEUTRON_CONF]]
 [DEFAULT]
-service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin
+service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin, networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin
 
 EOF
+else
+cat >> ${local_conf_file_name} << EOF
+[[post-config|\$NEUTRON_CONF]]
+[DEFAULT]
+service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin
+EOF
+fi #check for ENABLE_NETWORKING_L2GW
+
 fi #check for ODL_ML2_BRANCH
-fi #check for DISABLE_ODL_L3_PLUGIN
 
 fi #ODL_ENABLE_L3_FWD check
 

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 54231f87c699042112555bb2577431b8b872de88..8cb3235a0145cbcbe4e0829c1f830524222bf359 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1086,10 +1086,6 @@
           name: NETWORKING_L2GW_DRIVER
           default: '{networking-l2gw-repo}'
           description: 'URL to fetch networking-l2gw driver'
-      - string:
-          name: DISABLE_ODL_L3_PLUGIN
-          default: '{disable-odl-l3-service-plugin}'
-          description: 'Disable odl l3 service plugin'
       - string:
           name: CREATE_INITIAL_NETWORKS
           default: '{create-initial-networks}'
@@ -1259,10 +1255,6 @@
           name: NETWORKING_L2GW_DRIVER
           default: '{networking-l2gw-repo}'
           description: 'URL to fetch networking-l2gw driver'
-      - string:
-          name: DISABLE_ODL_L3_PLUGIN
-          default: '{disable-odl-l3-service-plugin}'
-          description: 'Disable odl l3 service plugin'
       - string:
           name: CREATE_INITIAL_NETWORKS
           default: '{create-initial-networks}'

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 682a5836b9b077bcbb7c0ffefd09338afc27d8e1..06f317b753a448d6e3171f8091ef5b6ac205d210 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -77,8 +77,6 @@
 
     enable-networking-l2gw: 'yes'
 
-    disable-odl-l3-service-plugin: 'yes'
-
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest,l2gw-plugin'
 
     security-group-mode: '{sg-mode}'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index f14d610a3bceaf24342f299f1df13c561842b33b..f69f5eac1a08cc44e23910a7cccb1e5fc1e4259a 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -23,7 +23,6 @@
     public-bridge: 'br-physnet1'
     public-physical-network: 'physnet1'
     odl-enable-l3: 'yes'
-    disable-odl-l3-service-plugin: 'no'
     odl-ml2-driver-version: 'v1'
     odl-ml2-port-binding: 'network-topology'
     enable-openstack-plugins: 'networking-odl'