decrease OLM timers in functional tests

- create a custom comment to identify code pieces to modify
- in tox.ini add a custom line to modify the code before building project
- modifiy OLM funcional tests timers
- fix a tox.ini bug in ordm 2.2.1 functional tests profiles

Change-Id: I80109e6738e9424bca175b0fe3f87c75c1c00f9e
JIRA: TRNSPRTPCE-112
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
index b2e04a8f82ade2ec2f53407f5655e4870c8320bb..0bafe5e7a6966ed6fe4e695803590d3fc10974ac 100644 (file)
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
@@ -34,8 +34,8 @@ public final class OlmUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(OlmUtils.class);
     private static long DATABROKER_READ_TIMEOUT_SECONDS = 120;
-    public static long OLM_TIMER_1 = 120000; //nominal value is 120000 - functional test value may be 3000
-    public static long OLM_TIMER_2 = 20000; //nominal value is 20000 - functional test value may be 2000
+    public static long OLM_TIMER_1 = 120000; //#FUNCTESTVAL= 3000;
+    public static long OLM_TIMER_2 = 20000;  //#FUNCTESTVAL= 2000;
     private static final InstanceIdentifier<Topology> NETCONF_TOPO_IID =
         InstanceIdentifier
             .create(NetworkTopology.class)

diff --git a/tests/transportpce_tests/1.2.1/test_olm.py b/tests/transportpce_tests/1.2.1/test_olm.py
index 2ddfe7bc23a73dce3ad4506ef417f4072b977a7a..8a37b4a3581382e6b57a306afcaaf12b6c752b2b 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_olm.py
+++ b/tests/transportpce_tests/1.2.1/test_olm.py
@@ -496,7 +496,8 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"])
-        time.sleep(40)
+        #time.sleep(40)
+        time.sleep(10)
 
     def test_18_servicePath_create_ZToA(self):
         url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl)
@@ -537,7 +538,8 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"])
-        time.sleep(40)
+        #time.sleep(40)
+        time.sleep(10)
 
     def test_19_service_power_setup_XPDRA_XPDRC(self):
         url = "{}/operations/transportpce-olm:service-power-setup".format(self.restconf_baseurl)
@@ -892,7 +894,8 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"])
-        time.sleep(40)
+        #time.sleep(40)
+        time.sleep(10)
 
     def test_34_get_interface_XPDRA_XPDR1_NETWORK2(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRA/yang-ext:mount/"

diff --git a/tests/transportpce_tests/2.2.1/test_olm.py b/tests/transportpce_tests/2.2.1/test_olm.py
index 83d268ac2d512197ff70c1be3026824c2627f867..c04830db2283c7a86fefc20c7db228defd6e2714 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_olm.py
+++ b/tests/transportpce_tests/2.2.1/test_olm.py
@@ -497,7 +497,8 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"])
-        time.sleep(40)
+        #time.sleep(40)
+        time.sleep(10)
 
     def test_18_servicePath_create_ZToA(self):
         url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl)
@@ -538,7 +539,8 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"])
-        time.sleep(40)
+        #time.sleep(40)
+        time.sleep(10)
 
     def test_19_service_power_setup_XPDRA_XPDRC(self):
         url = "{}/operations/transportpce-olm:service-power-setup".format(self.restconf_baseurl)
@@ -893,7 +895,8 @@ class TransportOlmTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"])
-        time.sleep(40)
+        #time.sleep(40)
+        time.sleep(10)
 
     def test_34_get_interface_XPDRA_XPDR1_NETWORK2(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDR-A1/yang-ext:mount/"

diff --git a/tox.ini b/tox.ini
index 64cccb60dd8ea2fef35272f3b39c3c18fb5cd030..01c00b2b82ce9a29aa11ac2509e448474dc5e777 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -15,8 +15,9 @@ deps =
 whitelist_externals = bash
 changedir={toxinidir}/tests
 commands =
-  {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end}: - bash -c "if [ ! `which mvn` ]; then ./installMavenCentOS.sh  ; fi"
-  {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)"
+  {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221}: - bash -c "if [ ! `which mvn` ]; then ./installMavenCentOS.sh  ; fi"
+  {py27,portmapping,topoPortMapping,rspn,topology,olm,end2end,portmapping221,rspn221,topology221,olm221}: - bash -c "sed 's@=.*//#FUNCTESTVAL=@=@g' ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java >/tmp/pivot; mv /tmp/pivot ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java"
+  {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)"
   {py27,portmapping,topoPortMapping,rspn,topology,olm,end2end}: - ./buildHoneynode.sh
   #py27: nosetests --with-xunit transportpce_tests/1.2.1/
   {py27,portmapping}: - nosetests --with-xunit transportpce_tests/1.2.1/test_portmapping.py