From 5b6148dc4d46adfe2311b8c254598745e930c5a5 Mon Sep 17 00:00:00 2001 From: Lorand Jakab Date: Tue, 20 Dec 2016 11:40:28 +0200 Subject: [PATCH] IT: Add constant for sleep time In addition, decrease sleep time for the multi-site tests from 2 seconds to 1 second, to avoid the following type intermittent errors: Failed tests: MappingServiceIntegrationTest.testMultiSite:414->testMultiSiteScenarioA:687 SMR contained Eid [_address=Ipv4PrefixBinary [_ipv4AddressBinary=Ipv4AddressBinary [_value=[-64, 0, 1, 1]], _ipv4MaskLength=32, augmentation=[]], _addressType=class org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv4PrefixBinaryAfi, _virtualNetworkId=InstanceIdType [_value=2], augmentation=[]] which wasn't expected. AND Failed tests: MappingServiceIntegrationTest.testMultiSite:415->testMultiSiteScenarioB:802 SMR contained Eid [_address=Ipv4PrefixBinary [_ipv4AddressBinary=Ipv4AddressBinary [_value=[-64, 0, 2, 5]], _ipv4MaskLength=32, augmentation=[]], _addressType=class org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv4PrefixBinaryAfi, _virtualNetworkId=InstanceIdType [_value=2], augmentation=[]] which wasn't expected. Change-Id: I551e1f6ba60fc54ab259a419cd8c5ce97eaa1ba9 Signed-off-by: Lorand Jakab --- .../MappingServiceIntegrationTest.java | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java index a706f25f1..53adba593 100644 --- a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java +++ b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java @@ -172,6 +172,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { public static final String ODL = "org.opendaylight.controller"; public static final String YANG = "org.opendaylight.yangtools"; + private static final int MULTI_SITE_SLEEP_TIME = 1; private static final int MAX_NOTIFICATION_RETRYS = 20; private static final MappingAuthkey NULL_AUTH_KEY = new MappingAuthkeyBuilder().setKeyType(0).build(); @@ -660,7 +661,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { multiSiteScenario.storeSouthboundMappings(false, SITE_A, SITE_B, SITE_C, SITE_D4, SITE_D5); multiSiteScenario.storeNorthMappingSrcDst(SITE_B, SITE_C); multiSiteScenario.storeNorthMappingNegative(SITE_C, Action.Drop); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.assertPingWorks(SITE_A, 5, SITE_B, 4); multiSiteScenario.assertPingWorks(SITE_B, 5, SITE_C, 4); multiSiteScenario.assertPingFails(SITE_A, 1, SITE_C, 4); @@ -670,7 +671,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { // 1) 192.0.2.5/32 // 2) 192.0.1.1/32 multiSiteScenario.storeNorthMappingSrcDst(SITE_A, SITE_C); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B.getHost(5), SITE_A.getHost(1)); multiSiteScenario.assertPingWorks(SITE_A, 5, SITE_C, 4); multiSiteScenario.assertPingWorks(SITE_B, 5, SITE_C, 4); @@ -683,7 +684,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { // 3) 192.0.1.5/32 // 4) 192.0.4.5/32 multiSiteScenario.deleteNorthMappingNegative(SITE_C); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B.getHost(5), SITE_A.getHost(1), SITE_A .getHost(5), SITE_D4.getHost(5)); @@ -693,7 +694,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { // following action should trigger generatting of SMR messages: // 1) 192.0.4.5/32 multiSiteScenario.storeNorthMappingSrcDst(SITE_B, SITE_C_RLOC_10); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_D4.getHost(5)); //way of testing ping - get RLOC for mapping src-dst and compare it with awaited value doesn't test //that ping won't be successfull @@ -704,7 +705,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { // 1) 192.0.4.5/32 // 2) 192.0.2.5/32 multiSiteScenario.storeNorthMappingNegative(SITE_C, Action.Drop); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_D4.getHost(5), SITE_B.getHost(5)); multiSiteScenario.assertPingFails(SITE_D4, 5, SITE_C, 4); @@ -713,7 +714,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { //TEST CASE 7 multiSiteScenario.deleteNorthMapingSrcDst(SITE_A, SITE_C); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); // following action should trigger generatting of SMR messages: // 1) 192.0.4.5/32 // 2) 192.0.2.5/32 @@ -726,7 +727,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { // 2) 192.0.2.5/32 // 3) 192.0.5.5/32 multiSiteScenario.storeNorthMappingSrcDst(SITE_B, SITE_C); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_D5.getHost(5), SITE_D4.getHost(5), SITE_B.getHost(5)); @@ -741,7 +742,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { // 3) 192.0.5.5/32 // 4) 192.0.1.1/32 multiSiteScenario.deleteNorthMapingSrcDst(SITE_B, SITE_C); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_D5.getHost(5), SITE_D4.getHost(5), SITE_B.getHost(5), SITE_A.getHost(1)); @@ -756,7 +757,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { // 3) 192.0.5.5/32 // 4) 192.0.1.1/32 multiSiteScenario.deleteNorthMappingNegative(SITE_C); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_D5.getHost(5), SITE_D4.getHost(5), SITE_B.getHost(5), SITE_A.getHost(1)); @@ -789,7 +790,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { multiSiteScenario.storeNorthMappingIpPrefix(SITE_A_SB); multiSiteScenario.storeNorthMappingIpPrefix(SITE_B_SB); multiSiteScenario.storeNorthMappingIpPrefix(SITE_C_WP_50_2_SB, SITE_D_WP_50_2_SB); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.assertPingWorks(SITE_A_SB, 5, SITE_C_WP_50_2_SB, 4, SITE_D_WP_50_2_SB); multiSiteScenario.assertPingWorks(SITE_B_SB, 5, SITE_C_WP_50_2_SB, 4, SITE_D_WP_50_2_SB); @@ -798,14 +799,14 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { // 1) 192.0.2.5/32 // 2) 192.0.1.5/32 multiSiteScenario.storeNorthMappingSrcDst(SITE_A_SB, SITE_C_WP_50_2_SB, SITE_D_WP_50_2_SB); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B_SB.getHost(5), SITE_A_SB.getHost(5)); // following action should trigger generatting of SMR messages: // 1) 192.0.2.5/32 // 2) 192.0.1.5/32 multiSiteScenario.storeNorthMappingNegative(SITE_C_SB, Action.Drop); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B_SB.getHost(5), SITE_A_SB.getHost(5)); multiSiteScenario.assertPingWorks(SITE_A_SB, 5, SITE_C_WP_50_2_SB, 4, SITE_D_WP_50_2_SB); @@ -817,13 +818,13 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { // 1) 192.0.2.5/32 // 2) 192.0.1.5/32 multiSiteScenario.storeNorthMappingSrcDst(SITE_A_SB, SITE_C_WP_50_2_SB); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B_SB.getHost(5), SITE_A_SB.getHost(5)); multiSiteScenario.assertPingWorks(SITE_A_SB, 5, SITE_C_WP_50_2_SB, 4); //TEST CASE 4 multiSiteScenario.storeNorthMappingSrcDst(SITE_B_SB, SITE_C_WP_50_2_SB, SITE_D_WP_50_2_SB); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); // following action should trigger generatting of SMR messages: // 1) 192.0.2.5/32 // 2) 192.0.1.5/32 @@ -832,7 +833,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { //TEST CASE 5 multiSiteScenario.deleteSouthboundMappings(SITE_D_DELETE_SB); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); // following action should trigger generatting of SMR messages: // 1) 192.0.2.5/32 // 2) 192.0.1.5/32 @@ -842,14 +843,14 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { //TEST CASE 6 multiSiteScenario.deleteNorthMapingSrcDst(SITE_A_SB, SITE_C_WP_50_2_SB); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); // following action should trigger generatting of SMR messages: // 1) 192.0.2.5/32 // 2) 192.0.1.5/32 multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B_SB.getHost(5), SITE_A_SB.getHost(5)); multiSiteScenario.deleteNorthMapingSrcDst(SITE_B_SB, SITE_C_WP_50_2_SB); - sleepForSeconds(2); + sleepForSeconds(MULTI_SITE_SLEEP_TIME); multiSiteScenario.assertPingFails(SITE_B_SB, 5, SITE_C_WP_50_2_SB, 4); socketReader.stopReading(); -- 2.36.6