Fix for ELAN JUNIT TCs failure

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

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 af515ea9ecfac767de407079ac2976d3e9b9f6df..de6d0be325c04968e69f5d92706c8e0f2e97d648 100644 (file)
--- 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
@@ -12,19 +12,21 @@ import static org.opendaylight.yangtools.testutils.mockito.MoreAnswers.realOrExc
 import java.util.Collections;
 import java.util.List;
 import org.mockito.Mockito;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-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.TransactionCommitFailedException;
 import org.opendaylight.netvirt.bgpmanager.api.IBgpManager;
 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.BgpControlPlaneType;
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.EncapType;
-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.NetworksBuilder;
-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.NetworksBuilder;
+import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.bgp.networkscontainer.NetworksKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.vrfentries.VrfEntry;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,7 +42,7 @@ public abstract class BgpManagerTestImpl implements IBgpManager {
 
     @Override
     public void advertisePrefix(String rd, String macAddress, String prefix, List<String> nextHopList,
-                                VrfEntry.EncapType encapType, long vpnLabel, long l3vni, long l2vni,
+                                VrfEntry.EncapType encapType, Uint32 vpnLabel, Uint32 l3vni, Uint32 l2vni,
                                 String gatewayMac) throws Exception {
         addPrefix(rd, macAddress, prefix, nextHopList,
                 encapType, vpnLabel, l3vni, l2vni, gatewayMac);
@@ -48,29 +50,30 @@ public abstract class BgpManagerTestImpl implements IBgpManager {
 
     @Override
     public void advertisePrefix(String rd, String macAddress, String prefix, String nextHop,
-                                VrfEntry.EncapType encapType, long vpnLabel, long l3vni, long l2vni,
+                                VrfEntry.EncapType encapType, Uint32 vpnLabel, Uint32 l3vni, Uint32 l2vni,
                                 String gatewayMac) throws Exception {
         addPrefix(rd, macAddress, prefix, Collections.singletonList(nextHop), encapType,
                 vpnLabel, l3vni, l2vni, gatewayMac);
     }
 
     public void addPrefix(String rd, String macAddress, String pfx, List<String> nhList,
-                            VrfEntry.EncapType encapType, long lbl, long l3vni, long l2vni, String gatewayMac)
+                            VrfEntry.EncapType encapType, Uint32 lbl, Uint32 l3vni, Uint32 l2vni, String gatewayMac)
                             throws TransactionCommitFailedException {
         for (String nh : nhList) {
             Ipv4Address nexthop = nh != null ? new Ipv4Address(nh) : null;
-            Long label = lbl;
+            Uint32 label = lbl;
             InstanceIdentifier<Networks> iid = InstanceIdentifier.builder(Bgp.class)
+                    .child(NetworksContainer.class)
                     .child(Networks.class, new NetworksKey(pfx, rd)).build();
             NetworksBuilder networksBuilder = new NetworksBuilder().setRd(rd).setPrefixLen(pfx).setNexthop(nexthop)
-                    .setLabel(label).setEthtag(0L);
+                    .setLabel(label).setEthtag(Uint32.ZERO);
             buildVpnEncapSpecificInfo(networksBuilder, encapType, label, l3vni, l2vni, macAddress, gatewayMac);
             singleTxdataBroker.syncWrite(LogicalDatastoreType.CONFIGURATION, iid, networksBuilder.build());
         }
     }
 
-    private static void buildVpnEncapSpecificInfo(NetworksBuilder builder, VrfEntry.EncapType encapType, long label,
-                                                  long l3vni, long l2vni, String macAddress, String gatewayMac) {
+    private static void buildVpnEncapSpecificInfo(NetworksBuilder builder, VrfEntry.EncapType encapType, Uint32 label,
+                                                  Uint32 l3vni, Uint32 l2vni, String macAddress, String gatewayMac) {
         if (encapType.equals(VrfEntry.EncapType.Mplsgre)) {
             builder.setLabel(label).setBgpControlPlaneType(BgpControlPlaneType.PROTOCOLL3VPN)
                     .setEncapType(EncapType.GRE);
@@ -81,8 +84,9 @@ public abstract class BgpManagerTestImpl implements IBgpManager {
     }
 
     public void withdrawPrefix(String rd, String pfx) {
-        InstanceIdentifier<Networks> iid = InstanceIdentifier.builder(Bgp.class)
-                .child(Networks.class, new NetworksKey(pfx, rd)).build();
+        InstanceIdentifier<Networks> iid = InstanceIdentifier.create(Bgp.class)
+                .child(NetworksContainer.class)
+                .child(Networks.class, new NetworksKey(pfx, rd));
         try {
             singleTxdataBroker.syncDelete(LogicalDatastoreType.CONFIGURATION, iid);
         } catch (TransactionCommitFailedException e) {