Fix for ELAN JUNIT TCs failure

[netvirt.git] / elanmanager / impl / src / test / java / org / opendaylight / netvirt / elanmanager / tests / utils / EvpnTestHelper.java

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 4e5d44a8f2b64f102658619343e20713c2523e6f..20906bbfc1078930d719b46dd5ace372a1484686 100644 (file)
--- 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
@@ -19,17 +19,18 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.commons.lang3.StringUtils;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
+import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
 import org.opendaylight.netvirt.elanmanager.api.ElanHelper;
 import org.opendaylight.netvirt.elanmanager.tests.ExpectedObjects;
 import org.opendaylight.netvirt.fibmanager.api.FibHelper;
 import org.opendaylight.netvirt.fibmanager.api.RouteOrigin;
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.Bgp;
-import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.bgp.Networks;
-import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.bgp.NetworksKey;
+import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.bgp.NetworksContainer;
+import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.bgp.networkscontainer.Networks;
+import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.bgp.networkscontainer.NetworksKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.EvpnAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.EvpnAugmentationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstance;
@@ -118,18 +119,18 @@ public class EvpnTestHelper  {
         macEntryBuilder.setMac(macAddress);
         macEntryBuilder.setDestPrefix(prefix);
         InstanceIdentifier<MacVrfEntry> 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<MacVrfEntry> 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);
     }
@@ -170,14 +171,15 @@ public class EvpnTestHelper  {
     }
 
     public InstanceIdentifier<MacVrfEntry> 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<Networks> buildBgpNetworkIid(String prefix)  {
-        return InstanceIdentifier.builder(Bgp.class)
-                .child(Networks.class, new NetworksKey(prefix, RD)).build();
+        return InstanceIdentifier.create(Bgp.class)
+                .child(NetworksContainer.class)
+                .child(Networks.class, new NetworksKey(prefix, RD));
     }
 
 }