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 <robert.varga@pantheon.tech>

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 4c6ae1e00d88f2720c7767c3af156bb667160b13..4c3fe7985bbeb787f885b3cd9c2f1c4f57416cf0 100644 (file)
--- 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<LogicalSwitches> 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);