From e3d4fc606e2dafb7d694b3ac755545c7c6f662e0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 15 May 2019 09:36:59 +0200 Subject: [PATCH] Fix verifyL2gwPreProvisioning() test This test was not synchronizing on ELAN creation, leading to OLFE. Add a proper sync point. Change-Id: I6dd82203f408a9061bacf3a885746ce2a2cfd7b1 Signed-off-by: Robert Varga --- .../netvirt/elanmanager/tests/ElanServiceTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java index 4c6ae1e00d..4c3fe7985b 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java @@ -12,10 +12,8 @@ import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastor import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.OPERATIONAL; import com.google.common.base.Optional; - import java.util.List; import javax.inject.Inject; - import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -160,6 +158,7 @@ public class ElanServiceTest extends ElanServiceTestBase { .network.topology.rev131021.network.topology.topology.Node.class) .augmentation(HwvtepGlobalAugmentation.class) .child(LogicalSwitches.class).build(), cacheProvider) { + @Override protected void added(InstanceIdentifier path, LogicalSwitches dataObject) { new Thread(() -> { try { @@ -475,6 +474,8 @@ public class ElanServiceTest extends ElanServiceTestBase { public void verifyL2gwPreProvisioning() throws Exception { createElanInstance(ExpectedObjects.ELAN1, ExpectedObjects.ELAN1_SEGMENT_ID); + awaitForElanTag(ExpectedObjects.ELAN1); + addElanInterface(ExpectedObjects.ELAN1, ELAN_INTERFACES.get(ELAN1 + ":" + DPN1MAC1).getLeft(), DPN1IP1); singleTxdataBroker.syncDelete(OPERATIONAL, TOR1_NODE_IID); -- 2.36.6