Enhanced Hwvtep template to supply provision

to enable l2gw services for integration project.

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

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 1edfb4648e04fe9437a004049219c5c9b61a9535..9b588ab3f62d9a17987698bb9e2bab4be28bea4f 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -49,6 +49,10 @@
 
     public-physical-network: 'physnet1'
 
+    enable-networking-l2gw: 'no'
+
+    disable-odl-l3-service-plugin: 'no'
+
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'

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 4e601acf069a0f60c6dbc19ee0d3ac87c8ed0f32..68a75f60d7102099814c25160bb4db737b8e882a 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -80,6 +80,15 @@ LIBVIRT_TYPE=qemu
 
 EOF
 
+if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
+cat >> ${local_conf_file_name} << EOF
+
+enable_plugin networking-l2gw ${NETWORKING_L2GW_DRIVER} ${ODL_ML2_BRANCH}
+NETWORKING_L2GW_SERVICE_DRIVER=L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default
+ENABLED_SERVICES+=,neutron,q-svc,nova,q-meta
+
+EOF
+fi
 
 if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then
     echo "ODL_V2DRIVER=True" >> ${local_conf_file_name}
@@ -136,19 +145,21 @@ ML2_VLAN_RANGES=physnet1
 ODL_PROVIDER_MAPPINGS=${ODL_PROVIDER_MAPPINGS}
 
 disable_service q-l3
-Q_L3_ENABLED=True
-ODL_L3=${ODL_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}
 [[post-config|\$NEUTRON_CONF]]
 [DEFAULT]
 service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin
 
 EOF
 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 ab62ea5dbb785ce5331ffa22c8d2fe755e3b95a2..b97c3f80779df1d583066eccfebddf4f5371f291 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1024,6 +1024,18 @@
             name: PUBLIC_PHYSICAL_NETWORK
             default: '{public-physical-network}'
             description: 'provider physical network used for flat/vlan networks'
+        - string:
+            name: ENABLE_NETWORKING_L2GW
+            default: '{enable-networking-l2gw}'
+            description: 'Enable networking L2gw'
+        - string:
+            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'
     scm:
         - integration-gerrit-scm:
             basedir: 'test'
@@ -1154,6 +1166,18 @@
             name: PUBLIC_PHYSICAL_NETWORK
             default: '{public-physical-network}'
             description: 'provider physical network used for flat/vlan networks'
+        - string:
+            name: ENABLE_NETWORKING_L2GW
+            default: '{enable-networking-l2gw}'
+            description: 'Enable networking L2gw'
+        - string:
+            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'
     scm:
         - integration-gerrit-scm:
             basedir: 'test'

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 437289b6866b0473b37a0db17fa2dd7ea19dd7a6..1a361147a250baf9b47de19a1a8e75b5666bfcdf 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -17,7 +17,7 @@
             enable-haproxy: 'yes'
             install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-openstack.txt'
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
 
     functionality:
         - upstream-transparent:
@@ -78,11 +78,15 @@
 
     odl-enable-l3: 'yes'
 
+    enable-networking-l2gw: 'yes'
+
+    disable-odl-l3-service-plugin: 'yes'
+
     public-bridge: 'br-physnet1'
 
     public-physical-network: 'physnet1'
 
-    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
+    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest,l2gw-plugin'
 
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
 

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 423c6c175af82e375a5e5fb38888c1fce856a41c..54a39f0f0dc8338192aaed637f9e90b844eb2925 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -78,6 +78,10 @@
 
     public-physical-network: 'physnet1'
 
+    enable-networking-l2gw: 'no'
+
+    disable-odl-l3-service-plugin: 'no'
+
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'

diff --git a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
index e8b7a63942a6e3014608cf19254c3638368dc634..4f40004f45d9ec58ba7d7d2edce80ff9ed81070d 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
@@ -61,6 +61,10 @@
 
     public-physical-network: 'physnet1'
 
+    enable-networking-l2gw: 'no'
+
+    disable-odl-l3-service-plugin: 'no'
+
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 6c6a299df22bc1cae001381c7774b9029b62fc37..98c1e30ba607372a7a5ecaa045f458a0c4a3dc70 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -11,6 +11,7 @@
 
     email-recipients: 'jenkins@lists.opendaylight.org'
     odl-ml2-driver-repo: 'https://github.com/openstack/networking-odl'
+    networking-l2gw-repo: 'http://git.openstack.org/openstack/networking-l2gw'
     server-name: 'OpenDaylight'
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
 

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 65bce594ee406834a1d7bc2643bc36f31ce033ee..c6e868d1d05b834c3af6422a3b65821ccd5796a0 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -55,6 +55,10 @@
 
     public-physical-network: 'physnet1'
 
+    enable-networking-l2gw: 'no'
+
+    disable-odl-l3-service-plugin: 'no'
+
     security-group-mode: 'none'
 
     robot-options: ''