More OFP test conversions

Use various tricks to get rid of warnings, mostly BindingMap.

Change-Id: I6e3273567bc207ab0d265d68afbbdbed6a36987e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializerTest.java
index b55a880909447eb9a2a36efb8ac347648e36aba8..358b3ad900b8dc47dce6b626f2d88e855e8ca4e8 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializerTest.java
@@ -9,16 +9,15 @@ package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.ta
 
 import static org.junit.Assert.assertEquals;
 
-import com.google.common.collect.ImmutableList;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldMiss;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldMissBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 public class ApplySetfieldMissTablePropertySerializerTest extends AbstractTablePropertySerializerTest {
     @Test
@@ -27,13 +26,10 @@ public class ApplySetfieldMissTablePropertySerializerTest extends AbstractTableP
                 .setApplySetfieldMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight
                         .table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.setfield.miss
                         .ApplySetfieldMissBuilder()
-                        .setSetFieldMatch(ImmutableList
-                                .<SetFieldMatch>builder()
-                                .add(new SetFieldMatchBuilder()
+                        .setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder()
                                         .setMatchType(ArpOp.class)
                                         .setHasMask(false)
-                                        .build())
-                                .build())
+                                        .build()))
                         .build())
                 .build();
 

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializerTest.java
index 057251cd6b42345f3f557cb152a66e634257469c..becc6c1c3162e824df9fe0017c5531da6842477b 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldTablePropertySerializerTest.java
@@ -9,16 +9,15 @@ package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.ta
 
 import static org.junit.Assert.assertEquals;
 
-import com.google.common.collect.ImmutableList;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfield;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 public class ApplySetfieldTablePropertySerializerTest extends AbstractTablePropertySerializerTest {
     @Test
@@ -27,13 +26,10 @@ public class ApplySetfieldTablePropertySerializerTest extends AbstractTablePrope
                 .setApplySetfield(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature
                         .prop.type.table.feature.prop.type.apply.setfield
                         .ApplySetfieldBuilder()
-                        .setSetFieldMatch(ImmutableList
-                                .<SetFieldMatch>builder()
-                                .add(new SetFieldMatchBuilder()
+                        .setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder()
                                         .setMatchType(ArpOp.class)
                                         .setHasMask(false)
-                                        .build())
-                                .build())
+                                        .build()))
                         .build())
                 .build();
 

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializerTest.java
index 6e9d37e04f40b8a6669b48b0309a88f75b87dc6f..1d800538aeb141a661fce585db92c0ca26b396c0 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializerTest.java
@@ -9,16 +9,15 @@ package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.ta
 
 import static org.junit.Assert.assertEquals;
 
-import com.google.common.collect.ImmutableList;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldMiss;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldMissBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 public class WriteSetfieldMissTablePropertySerializerTest extends AbstractTablePropertySerializerTest {
     @Test
@@ -27,13 +26,10 @@ public class WriteSetfieldMissTablePropertySerializerTest extends AbstractTableP
                 .setWriteSetfieldMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight
                         .table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.setfield.miss
                         .WriteSetfieldMissBuilder()
-                        .setSetFieldMatch(ImmutableList
-                                .<SetFieldMatch>builder()
-                                .add(new SetFieldMatchBuilder()
+                        .setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder()
                                         .setMatchType(ArpOp.class)
                                         .setHasMask(false)
-                                        .build())
-                                .build())
+                                        .build()))
                         .build())
                 .build();
 

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/matchfield/MatchFieldSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/matchfield/MatchFieldSerializerTest.java
index 9d805a5cdd1de392c729e4ffd24345ac34e69f5d..740c59facf6dcfd96894e0a55493e169307a1ec3 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/matchfield/MatchFieldSerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/matchfield/MatchFieldSerializerTest.java
@@ -5,12 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.tablefeatures.matchfield;
 
 import static org.junit.Assert.assertEquals;
 
-import com.google.common.collect.ImmutableList;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
@@ -57,187 +55,62 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDs
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.match.MatchSetfieldBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 public class MatchFieldSerializerTest extends AbstractTablePropertySerializerTest {
     @Test
     public void testSerialize() {
         final Match property = new MatchBuilder()
-                .setMatchSetfield(new MatchSetfieldBuilder()
-                        .setSetFieldMatch(ImmutableList
-                                .<SetFieldMatch>builder()
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(ArpOp.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(ArpSha.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(ArpSpa.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(ArpTha.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(ArpTpa.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(EthDst.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(EthSrc.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(EthType.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Icmpv4Code.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Icmpv4Type.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Icmpv6Code.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Icmpv6Type.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(InPhyPort.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(InPort.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(IpDscp.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(IpEcn.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(IpProto.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Ipv4Dst.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Ipv4Src.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Ipv6Dst.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Ipv6Exthdr.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Ipv6Flabel.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Ipv6NdSll.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Ipv6NdTarget.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Ipv6NdTll.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Ipv6Src.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(Metadata.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(MplsBos.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(MplsLabel.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(MplsTc.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(PbbIsid.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(SctpDst.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(SctpSrc.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(TcpDst.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(TcpFlags.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(TcpSrc.class)
-                                        .setHasMask(true)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(TunnelId.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(UdpDst.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(UdpSrc.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(VlanPcp.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(VlanVid.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .build())
-                        .build())
-                .build();
+            .setMatchSetfield(new MatchSetfieldBuilder()
+                .setSetFieldMatch(BindingMap.ordered(
+                    new SetFieldMatchBuilder().setMatchType(ArpOp.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(ArpSha.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(ArpSpa.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(ArpTha.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(ArpTpa.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(EthDst.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(EthSrc.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(EthType.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Icmpv4Code.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Icmpv4Type.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Icmpv6Code.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Icmpv6Type.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(InPhyPort.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(InPort.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(IpDscp.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(IpEcn.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(IpProto.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Ipv4Dst.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Ipv4Src.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Ipv6Dst.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Ipv6Exthdr.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Ipv6Flabel.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Ipv6NdSll.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Ipv6NdTarget.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Ipv6NdTll.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Ipv6Src.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(Metadata.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(MplsBos.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(MplsLabel.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(MplsTc.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(PbbIsid.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(SctpDst.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(SctpSrc.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(TcpDst.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(TcpFlags.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(TcpSrc.class).setHasMask(true).build(),
+                    new SetFieldMatchBuilder().setMatchType(TunnelId.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(UdpDst.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(UdpSrc.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(VlanPcp.class).setHasMask(false).build(),
+                    new SetFieldMatchBuilder().setMatchType(VlanVid.class).setHasMask(false).build()))
+                .build())
+            .build();
 
         assertProperty(property, out -> {
             assertEquals(out.readUnsignedShort(), OxmMatchConstants.OPENFLOW_BASIC_CLASS);

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/MultipartRequestOnTheFlyCallbackTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/MultipartRequestOnTheFlyCallbackTest.java
index ffa967c964b20496b78b1700d2d663ec5045acc6..b033ceecef6aa765d90e9dd843b3f6f7f7cb4a28 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/MultipartRequestOnTheFlyCallbackTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/MultipartRequestOnTheFlyCallbackTest.java
@@ -66,6 +66,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.flow._case.multipart.reply.flow.FlowStatsBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -223,7 +224,7 @@ public class MultipartRequestOnTheFlyCallbackTest {
         final FlowCapableNodeBuilder flowNodeBuilder = new FlowCapableNodeBuilder();
         final TableBuilder tableDataBld = new TableBuilder();
         tableDataBld.setId(tableId);
-        flowNodeBuilder.setTable(Collections.singletonList(tableDataBld.build()));
+        flowNodeBuilder.setTable(BindingMap.of(tableDataBld.build()));
         final Optional<FlowCapableNode> flowNodeOpt = Optional.of(flowNodeBuilder.build());
 
         multipartRequestOnTheFlyCallback.onSuccess(mpReplyMessage.build());

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtilsTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtilsTest.java
index b1fd15711368544090f4b84ffec28f5965504a93..b02043fceb9649dd6c7934eb510a3ac79d0137ab 100755 (executable)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtilsTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtilsTest.java
@@ -130,6 +130,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.f
 import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint64;
@@ -421,7 +422,7 @@ public class StatisticsGatheringUtilsTest {
         final TableBuilder tableDataBld = new TableBuilder();
         tableDataBld.setId(Uint8.ZERO);
         final FlowCapableNodeBuilder flowNodeBuilder = new FlowCapableNodeBuilder();
-        flowNodeBuilder.setTable(Collections.singletonList(tableDataBld.build()));
+        flowNodeBuilder.setTable(BindingMap.of(tableDataBld.build()));
         final Optional<FlowCapableNode> flowNodeOpt = Optional.of(flowNodeBuilder.build());
         doReturn(FluentFutures.immediateFluentFuture(flowNodeOpt)).when(readTx)
             .read(LogicalDatastoreType.OPERATIONAL, nodePath);
@@ -538,7 +539,7 @@ public class StatisticsGatheringUtilsTest {
         final TableBuilder tableDataBld = new TableBuilder();
         tableDataBld.setId(Uint8.ZERO);
         final FlowCapableNodeBuilder flowNodeBuilder = new FlowCapableNodeBuilder();
-        flowNodeBuilder.setTable(Collections.singletonList(tableDataBld.build()));
+        flowNodeBuilder.setTable(BindingMap.of(tableDataBld.build()));
         final Optional<FlowCapableNode> flowNodeOpt = Optional.of(flowNodeBuilder.build());
         doReturn(FluentFutures.immediateFluentFuture(flowNodeOpt)).when(readTx)
             .read(LogicalDatastoreType.OPERATIONAL, nodePath);