NETVIRT-1599: Add support for group-add-mod-enabled parm

We have a flag group-add-mod-enabled in /etc/opendaylight/
datastore/initial/config/default-openflow-connection-config.xml
which needs to be enabled for upgrade scripts. Once we wipe ODL
data and then connect back the switch, this flag will enable the
ONFT_BUNDLE_ADD_MESSAGE to be accepted by the openvswitch.

Signed-off-by: Srinivas Rachakonda <srinivas.rachakonda@gmail.com>
Change-Id: Id76f61ed7feab9b6c5150582f04b90fdd3e62cc7
Signed-off-by: Srinivas Rachakonda <srinivas.rachakonda@gmail.com>

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 2edafdf1bd99f4ae9cb456e6b9dd88de2d1a2d74..9d15e9118b6577d23fd2e8b3248f1322c9a81e81 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -61,6 +61,7 @@
     tenant-network-type: 'vxlan'
     odl-sfc-driver: 'odl'
     odl-snat-mode: 'controller'
+    group-add-mod-enabled: 'false'
     enable-itm-direct-tunnels: 'false'
     openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
     os-cmb-cnt: 1

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index 204362b187361a9221871df795d952e66bf0697e..f16a93a0ea52f4deb90cbb5c73434de55386a045 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -495,6 +495,7 @@ CREATE_INITIAL_NETWORKS: ${CREATE_INITIAL_NETWORKS}
 LBAAS_SERVICE_PROVIDER: ${LBAAS_SERVICE_PROVIDER}
 ODL_SFC_DRIVER: ${ODL_SFC_DRIVER}
 ODL_SNAT_MODE: ${ODL_SNAT_MODE}
+GROUP_ADD_MOD_ENABLED: ${GROUP_ADD_MOD_ENABLED}
 
 EOF
 }

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 81afad6b154f82c15f8c9bf7606917fa1646b2e4..67c264550cf5e5ef92db4d32934c3ab04cd928ad 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -1178,6 +1178,7 @@ for suite in ${SUITES}; do
     -v NUM_OS_SYSTEM:"${NUM_OPENSTACK_SYSTEM}" \
     -v NUM_TOOLS_SYSTEM:"${NUM_TOOLS_SYSTEM}" \
     -v ODL_SNAT_MODE:"${ODL_SNAT_MODE}" \
+    -v GROUP_ADD_MOD_ENABLED:"${GROUP_ADD_MOD_ENABLED}" \
     -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 84f8fc6771e5c8c05867729e1fb0b0092da152d9..3e958d0901d961aca6bda8848e8c0ee8fb078780 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1228,6 +1228,10 @@
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: GROUP_ADD_MOD_ENABLED
+          default: '{group-add-mod-enabled}'
+          description: 'The Group add mod enabled mode to be configured - options are true/false.'
       - string:
           name: OVS_INSTALL
           default: '{ovs-install}'
@@ -1449,6 +1453,10 @@
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: GROUP_ADD_MOD_ENABLED
+          default: '{group-add-mod-enabled}'
+          description: 'The Group add mod enabled mode to be configured - options are true/false.'
       - string:
           name: OVS_INSTALL
           default: '{ovs-install}'
@@ -1650,6 +1658,10 @@
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: GROUP_ADD_MOD_ENABLED
+          default: '{group-add-mod-enabled}'
+          description: 'The Group add mod enabled mode to be configured - options are true/false.'
       - string:
           name: OVS_INSTALL
           default: '{ovs-install}'
@@ -1874,6 +1886,10 @@
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: GROUP_ADD_MOD_ENABLED
+          default: '{group-add-mod-enabled}'
+          description: 'The Group add mod enabled mode to be configured - options are true/false.'
       - string:
           name: OVS_INSTALL
           default: '{ovs-install}'
@@ -2085,6 +2101,10 @@
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: GROUP_ADD_MOD_ENABLED
+          default: '{group-add-mod-enabled}'
+          description: 'The Group add mod enabled mode to be configured - options are true/false.'
 
     scm:
       - integration-gerrit-scm:
@@ -2209,3 +2229,7 @@
           name: ODL_SNAT_MODE
           default: '{odl-snat-mode}'
           description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: GROUP_ADD_MOD_ENABLED
+          default: '{group-add-mod-enabled}'
+          description: 'The Group add mod enabled mode to be configured - options are true/false.'

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index 9dbe3bbccc9b84587316146bb0572d2cdd630446..d1fba9185bcab0c850b76c80567cf512200eae4f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -21,6 +21,7 @@
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
+    group-add-mod-enabled: 'true'
     odl_system_flavor: odl-highcpu-8
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4