Set ovsdb inactivity_timeout to 30s

JIRA: OPNFLWPLUG-1007
Change-Id: I44e3450fe12c6439013d2a0b9249651f4e360d04
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/csit/configplans/netvirt-1node-openstack.txt b/csit/configplans/netvirt-1node-openstack.txt
index c2bcdd8c18f91b8dd2951bb1d78cbb84d03b5dd4..0e32f80b125ea2f00291f5f48b4b388cd4116adb 100644 (file)
--- a/csit/configplans/netvirt-1node-openstack.txt
+++ b/csit/configplans/netvirt-1node-openstack.txt
@@ -1,6 +1,8 @@
 # Place the scripts in run order:
+# netvirt-1node-openstack-tempest.txt is linked to this file
 integration/test/csit/scripts/set_sg_mode.sh
 integration/test/csit/scripts/set_federation_rabbit.sh
 integration/test/csit/scripts/set_snat_mode.sh
 integration/test/csit/scripts/disable_ofp_stats.sh
 integration/test/csit/scripts/set_itm_direct_tunnels.sh
+integration/test/csit/scripts/set_ovsdb_inactivity_probe.sh

diff --git a/csit/configplans/netvirt-3node-openstack.txt b/csit/configplans/netvirt-3node-openstack.txt
index 926929f793ce0fa8fb03a755e15605c05166171b..281e26fd61dbc3c35e6be472e1870d4d08b12a75 100644 (file)
--- a/csit/configplans/netvirt-3node-openstack.txt
+++ b/csit/configplans/netvirt-3node-openstack.txt
@@ -1,6 +1,8 @@
 # Place the scripts in run order:
+# netvirt-3node-openstack-tempest.txt is linked to this file
 integration/test/csit/scripts/set_sg_mode.sh
 integration/test/csit/scripts/set_federation_rabbit.sh
 integration/test/csit/scripts/set_snat_mode.sh
 integration/test/csit/scripts/disable_ofp_stats.sh
 integration/test/csit/scripts/set_transaction_debugging.sh
+integration/test/csit/scripts/set_ovsdb_inactivity_probe.sh

diff --git a/csit/scripts/set_ovsdb_inactivity_probe.sh b/csit/scripts/set_ovsdb_inactivity_probe.sh
new file mode 100644 (file)
index 0000000..766deed
--- /dev/null
+++ b/csit/scripts/set_ovsdb_inactivity_probe.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+cat > ${WORKSPACE}/set_ovsdb_inactivity_probe.sh <<EOF
+    export CONFFILE=\`find /tmp/${BUNDLEFOLDER} -name "*elanmanager*config.xml"\`
+    cp \$CONFFILE /tmp/${BUNDLEFOLDER}/etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml
+    sed -i "/  <\!--/d" /tmp/${BUNDLEFOLDER}/etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml
+    sed -i "/  -->/d" /tmp/${BUNDLEFOLDER}/etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml
+    sed -i "s/<controller-max-backoff>5000<\/controller-max-backoff>/<controller-max-backoff>5000<\/controller-max-backoff>/" /tmp/${BUNDLEFOLDER}/etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml
+    sed -i "s/<controller-inactivity-probe>5000<\/controller-inactivity-probe>/<controller-inactivity-probe>30000<\/controller-inactivity-probe>/" /tmp/${BUNDLEFOLDER}/etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml
+    cat /tmp/${BUNDLEFOLDER}/etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml
+
+EOF
+
+echo "Copying and running running elanmanager config script on ODL Controller(s)"
+for i in `seq 1 ${NUM_ODL_SYSTEM}`
+do
+        CONTROLLERIP=ODL_SYSTEM_${i}_IP
+        echo "Setting ovsdb inactivity_probe to 30s on ${!CONTROLLERIP}"
+        scp ${WORKSPACE}/set_ovsdb_inactivity_probe.sh ${!CONTROLLERIP}:/tmp/
+        ssh ${!CONTROLLERIP} 'bash /tmp/set_ovsdb_inactivity_probe.sh'
+done