Fix IpConversionUtil.extractIpv4AddressMask()

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / PacketOutConvertorTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
index b3a7bf6ef2a51b88589a010bbd09cfaa40faeb3d..cab39ef81f4108d1ab5609a6337f67f62f7cc95f 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
@@ -20,7 +20,7 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.PacketOutConvertorData;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.XidConvertorData;
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCaseBuilder;
@@ -59,7 +59,8 @@ public class PacketOutConvertorTest {
     }
 
     /**
-     * Test for {@link PacketOutConvertor} with null parameters.
+     * Test for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.PacketOutConvertor}
+     *  with null parameters.
      */
     @Test
     public void toPacketOutInputAllParmNullTest() {
@@ -88,7 +89,7 @@ public class PacketOutConvertorTest {
 
         Short version = (short) 0x04;
         Long xid = null;
-        PacketOutConvertorData data = new PacketOutConvertorData(version);
+        XidConvertorData data = new XidConvertorData(version);
         PacketOutInput message = convert(transmitPacketInput, data);
 
         //FIXME : this has to be fixed along with actions changed in openflowjava
@@ -103,7 +104,7 @@ public class PacketOutConvertorTest {
     }
 
     /**
-     * Test for PacketOutConvertor.
+     * Test for XidConvertorData.
      */
     @Test
     public void toPacketOutInputAllParmTest() {
@@ -117,7 +118,7 @@ public class PacketOutConvertorTest {
         ab.setAction(new OutputActionCaseBuilder().setOutputAction(
                 output.build()).build());
         ab.setOrder(0);
-        ab.setKey(new ActionKey(0));
+        ab.withKey(new ActionKey(0));
 
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action> actionList =
                 new ArrayList<>();
@@ -166,7 +167,7 @@ public class PacketOutConvertorTest {
         BigInteger datapathId = new BigInteger(1, datapathIdByte);
         Long xid = 0xfffffL;
 
-        PacketOutConvertorData data = new PacketOutConvertorData(version);
+        XidConvertorData data = new XidConvertorData(version);
         data.setXid(xid);
         data.setDatapathId(datapathId);
         PacketOutInput message = convert(transmitPacketInput, data);
@@ -220,10 +221,10 @@ public class PacketOutConvertorTest {
 
     private static NodeConnectorRef createNodeConnRef(final String nodeId, final NodeConnectorKey nodeConKey) {
         InstanceIdentifier<NodeConnector> path = InstanceIdentifier
-                .<Nodes>builder(Nodes.class)
-                .<Node, NodeKey>child(Node.class,
+                .builder(Nodes.class)
+                .child(Node.class,
                         new NodeKey(new NodeId(nodeId)))
-                .<NodeConnector, NodeConnectorKey>child(NodeConnector.class,
+                .child(NodeConnector.class,
                         nodeConKey).build();
 
         return new NodeConnectorRef(path);
@@ -238,12 +239,12 @@ public class PacketOutConvertorTest {
     private static NodeRef createNodeRef(final String nodeId) {
         NodeKey key = new NodeKey(new NodeId(nodeId));
         InstanceIdentifier<Node> path = InstanceIdentifier
-                .<Nodes>builder(Nodes.class)
-                .<Node, NodeKey>child(Node.class, key).build();
+                .builder(Nodes.class)
+                .child(Node.class, key).build();
         return new NodeRef(path);
     }
 
-    private PacketOutInput convert(TransmitPacketInput transmitPacketInput, PacketOutConvertorData data) {
+    private PacketOutInput convert(TransmitPacketInput transmitPacketInput, XidConvertorData data) {
         Optional<PacketOutInput> messageOptional = convertorManager.convert(transmitPacketInput, data);
         return messageOptional.orElse(PacketOutConvertor.defaultResult(data.getVersion()));
     }