From: Alon Kochba <alonko@hpe.com>
Date: Tue, 18 Apr 2017 09:50:27 +0000 (+0300)
Subject: Job to test conntrack based SNAT
X-Git-Tag: release/carbon~133
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=258253ac6a9255b39bc4b995011f49a4c5dd7e0d;p=releng%2Fbuilder.git

Job to test conntrack based SNAT

Change-Id: Ie18fe2683d05929946484bfb16c049436ed5cfeb
Signed-off-by: Alon Kochba <alonko@hpe.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 a1f70a0fa..7d3e7963c 100644
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -814,6 +814,7 @@ pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude \
     -v NUM_OPENSTACK_SITES:${NUM_OPENSTACK_SITES} \
     -v NUM_OS_SYSTEM:${NUM_OPENSTACK_SYSTEM} \
     -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} \
+    -v ODL_SNAT_MODE:${ODL_SNAT_MODE} \
     -v ODL_STREAM:${DISTROSTREAM} \
     -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
     -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_1_IP} \
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index e9487cf1f..bc95b5d64 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1103,6 +1103,10 @@
           name: ODL_SFC_DRIVER
           default: '{odl-sfc-driver}'
           description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+      - string:
+          name: ODL_SNAT_MODE
+          default: '{odl-snat-mode}'
+          description: 'The SNAT mode to be configured - options are conntrack/controller.'
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
@@ -1284,6 +1288,10 @@
           name: ODL_SFC_DRIVER
           default: '{odl-sfc-driver}'
           description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+      - string:
+          name: ODL_SNAT_MODE
+          default: '{odl-snat-mode}'
+          description: 'The SNAT mode to be configured - options are conntrack/controller.'
 
     scm:
       - integration-gerrit-scm:
diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 633b13d76..7bd7e551c 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -27,6 +27,10 @@
       - upstream-stateful:
           schedule: ''
           sg-mode: 'stateful'
+      - upstream-stateful-snat-conntrack:
+          schedule: ''
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
       - upstream-learn:
           schedule: ''
           sg-mode: 'learn'
diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index bd300d716..c2df3cd8b 100644
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -37,6 +37,7 @@
     security-group-mode: 'none'
     tenant-network-type: 'vxlan'
     odl-sfc-driver: 'odl'
+    odl-snat-mode: 'controller'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''