From e5d1d3920652e3959c40a12f3bd999d68066fad1 Mon Sep 17 00:00:00 2001 From: Karthikeyan Krishnan Date: Sat, 2 May 2020 21:30:45 +0530 Subject: [PATCH] Fix for ELAN JUNIT TCs failure Signed-off-by: Karthikeyan Krishnan Change-Id: I37f97428b7c6e54674f901e1a4c66e16c66573be --- .../elanmanager/tests/ElanServiceTest.java | 17 ++++++++--------- .../elanmanager/tests/ElanServiceTestBase.java | 4 ++-- .../tests/utils/BgpManagerTestImpl.java | 4 ++-- .../elanmanager/tests/utils/EvpnTestHelper.java | 16 ++++++++-------- 4 files changed, 20 insertions(+), 21 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 2b19ccddea..91f7c533d2 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 @@ -326,7 +326,7 @@ public class ElanServiceTest extends ElanServiceTestBase { readBgpNetworkFromDS(DPN1IP1)); } -/* @Test public void checkEvpnAdvRT2NewInterface() throws Exception { + @Test public void checkEvpnAdvRT2NewInterface() throws Exception { createElanInstanceAndInterfaceAndAttachEvpn(); // Add Elan interface @@ -335,9 +335,9 @@ public class ElanServiceTest extends ElanServiceTestBase { AssertDataObjects.assertEqualBeans( ExpectedObjects.checkEvpnAdvertiseRoute(ELAN1_SEGMENT_ID, DPN1MAC2, DPN1_TEPIP, DPN1IP2, RD), readBgpNetworkFromDS(DPN1IP2)); - }*/ + } -/* @Test public void checkEvpnWithdrawRT2DelIntf() throws Exception { + @Test public void checkEvpnWithdrawRT2DelIntf() throws Exception { createElanInstanceAndInterfaceAndAttachEvpn(); InstanceIdentifier iid = evpnTestHelper.buildBgpNetworkIid(DPN1IP1); @@ -347,7 +347,7 @@ public class ElanServiceTest extends ElanServiceTestBase { deleteElanInterface(ELAN_INTERFACES.get(ELAN1 + ":" + DPN1MAC1).getLeft()); awaitForDataDelete(LogicalDatastoreType.CONFIGURATION, iid); - }*/ + } /* @Test public void checkEvpnWithdrawRouteDetachEvpn() throws Exception { createElanInstanceAndInterfaceAndAttachEvpn(); @@ -362,7 +362,7 @@ public class ElanServiceTest extends ElanServiceTestBase { awaitForDataDelete(LogicalDatastoreType.CONFIGURATION, evpnTestHelper.buildBgpNetworkIid(DPN1IP2)); }*/ -/* @Test public void checkEvpnInstalDmacFlow() throws Exception { + @Test public void checkEvpnInstalDmacFlow() throws Exception { createElanInstanceAndInterfaceAndAttachEvpn(); addElanInterface(ExpectedObjects.ELAN1, ELAN_INTERFACES.get(ELAN1 + ":" + DPN1MAC2).getLeft(), DPN1IP2); @@ -377,7 +377,7 @@ public class ElanServiceTest extends ElanServiceTestBase { // verify successful installation of DMAC flow for recvd rt2 awaitForData(LogicalDatastoreType.CONFIGURATION, evpnTestHelper.buildMacVrfEntryIid(EVPNRECVMAC1)); awaitForData(LogicalDatastoreType.CONFIGURATION, evpnTestHelper.buildMacVrfEntryIid(EVPNRECVMAC2)); - }*/ + } @Test @Ignore @@ -425,10 +425,9 @@ public class ElanServiceTest extends ElanServiceTestBase { } public Networks readBgpNetworkFromDS(String prefix) throws ReadFailedException { - InstanceIdentifier iid = InstanceIdentifier.builder(Bgp.class) + InstanceIdentifier iid = InstanceIdentifier.create(Bgp.class) .child(NetworksContainer.class) - .child(Networks.class, new NetworksKey(prefix, RD)) - .build(); + .child(Networks.class, new NetworksKey(prefix, RD)); awaitForData(LogicalDatastoreType.CONFIGURATION, iid); return singleTxdataBroker.syncRead(CONFIGURATION, iid); diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java index 2a3fe74f26..6ca6dba0b4 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java @@ -270,11 +270,11 @@ public class ElanServiceTestBase { } void awaitForData(LogicalDatastoreType dsType, InstanceIdentifier iid) { - getAwaiter().until(() -> MDSALUtil.read(dataBroker, dsType, iid).isPresent()); + getAwaiter().until(() -> SingleTransactionDataBroker.syncReadOptional(dataBroker, dsType, iid).isPresent()); } void awaitForDataDelete(LogicalDatastoreType dsType, InstanceIdentifier iid) { - getAwaiter().until(() -> !MDSALUtil.read(dataBroker, dsType, iid).isPresent()); + getAwaiter().until(() -> !SingleTransactionDataBroker.syncReadOptional(dataBroker, dsType, iid).isPresent()); } Flow getFlowWithoutCookie(Flow flow) { diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java index ad8ee04508..de6d0be325 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/BgpManagerTestImpl.java @@ -84,9 +84,9 @@ public abstract class BgpManagerTestImpl implements IBgpManager { } public void withdrawPrefix(String rd, String pfx) { - InstanceIdentifier iid = InstanceIdentifier.builder(Bgp.class) + InstanceIdentifier iid = InstanceIdentifier.create(Bgp.class) .child(NetworksContainer.class) - .child(Networks.class, new NetworksKey(pfx, rd)).build(); + .child(Networks.class, new NetworksKey(pfx, rd)); try { singleTxdataBroker.syncDelete(LogicalDatastoreType.CONFIGURATION, iid); } catch (TransactionCommitFailedException e) { diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java index 7231213d23..20906bbfc1 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java @@ -119,18 +119,18 @@ public class EvpnTestHelper { macEntryBuilder.setMac(macAddress); macEntryBuilder.setDestPrefix(prefix); InstanceIdentifier macEntryId = - InstanceIdentifier.builder(FibEntries.class) + InstanceIdentifier.create(FibEntries.class) .child(VrfTables.class, new VrfTablesKey(rd)) - .child(MacVrfEntry.class, new MacVrfEntryKey(macAddress)).build(); + .child(MacVrfEntry.class, new MacVrfEntryKey(macAddress)); singleTxdataBroker.syncWrite(LogicalDatastoreType.CONFIGURATION, macEntryId, macEntryBuilder.build()); } public void deleteMacVrfEntryToDS(String rd, String macAddress) throws TransactionCommitFailedException { InstanceIdentifier macEntryId = - InstanceIdentifier.builder(FibEntries.class) + InstanceIdentifier.create(FibEntries.class) .child(VrfTables.class, new VrfTablesKey(rd)) - .child(MacVrfEntry.class, new MacVrfEntryKey(macAddress)).build(); + .child(MacVrfEntry.class, new MacVrfEntryKey(macAddress)); singleTxdataBroker.syncDelete(LogicalDatastoreType.CONFIGURATION, macEntryId); } @@ -171,15 +171,15 @@ public class EvpnTestHelper { } public InstanceIdentifier buildMacVrfEntryIid(String mac) { - return InstanceIdentifier.builder(FibEntries.class) + return InstanceIdentifier.create(FibEntries.class) .child(VrfTables.class, new VrfTablesKey(RD)) - .child(MacVrfEntry.class, new MacVrfEntryKey(mac)).build(); + .child(MacVrfEntry.class, new MacVrfEntryKey(mac)); } public InstanceIdentifier buildBgpNetworkIid(String prefix) { - return InstanceIdentifier.builder(Bgp.class) + return InstanceIdentifier.create(Bgp.class) .child(NetworksContainer.class) - .child(Networks.class, new NetworksKey(prefix, RD)).build(); + .child(Networks.class, new NetworksKey(prefix, RD)); } } -- 2.36.6