Bump upstreams

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / protocol / deserialization / messages / PortMessageDeserializerTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PortMessageDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PortMessageDeserializerTest.java
index e7619d85eb90f0c77960e609893f9769377ce5e0..dc66b6efe3188eec108a013933ecd7ceba48772c 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PortMessageDeserializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PortMessageDeserializerTest.java
@@ -5,7 +5,6 @@
  * 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.deserialization.messages;
 
 import static org.junit.Assert.assertEquals;
@@ -66,7 +65,7 @@ public class PortMessageDeserializerTest extends AbstractDeserializerTest {
         buffer.writeInt(XID);
         buffer.writeInt(PORT);
         buffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_1);
-        buffer.writeBytes(IetfYangUtil.INSTANCE.bytesFor(ADDRESS));
+        buffer.writeBytes(IetfYangUtil.macAddressBytes(ADDRESS));
 
         final int config = ByteBufUtils.fillBitMaskFromMap(ImmutableMap
                 .<Integer, Boolean>builder()
@@ -100,35 +99,35 @@ public class PortMessageDeserializerTest extends AbstractDeserializerTest {
 
         buffer.writeZero(PADDING_IN_PORT_MOD_MESSAGE_3);
 
-        final PortMessage message = (PortMessage) getFactory().deserialize(buffer, EncodeConstants.OF13_VERSION_ID);
+        final PortMessage message = (PortMessage) getFactory().deserialize(buffer, EncodeConstants.OF_VERSION_1_3);
 
         assertEquals(XID, message.getXid().intValue());
         assertEquals(PORT, message.getPortNumber().getUint32().intValue());
         assertEquals(ADDRESS.getValue(), message.getHardwareAddress().getValue());
 
         // Config
-        assertEquals(IS_PORTDOWN, message.getConfiguration().isPORTDOWN());
-        assertEquals(IS_NORECV, message.getConfiguration().isNORECV());
-        assertEquals(IS_NOFWD, message.getConfiguration().isNOFWD());
-        assertEquals(IS_NOPACKETIN, message.getConfiguration().isNOPACKETIN());
+        assertEquals(IS_PORTDOWN, message.getConfiguration().getPORTDOWN());
+        assertEquals(IS_NORECV, message.getConfiguration().getNORECV());
+        assertEquals(IS_NOFWD, message.getConfiguration().getNOFWD());
+        assertEquals(IS_NOPACKETIN, message.getConfiguration().getNOPACKETIN());
 
         // Features
-        assertEquals(IS_10MBHD, message.getAdvertisedFeatures().isTenMbHd());
-        assertEquals(IS_10MBFD, message.getAdvertisedFeatures().isTenMbHd());
-        assertEquals(IS_100MBHD, message.getAdvertisedFeatures().isHundredMbHd());
-        assertEquals(IS_100MBFD, message.getAdvertisedFeatures().isHundredMbFd());
-        assertEquals(IS_1GBHD, message.getAdvertisedFeatures().isOneGbHd());
-        assertEquals(IS_1GBFD, message.getAdvertisedFeatures().isOneGbFd());
-        assertEquals(IS_10GBFD, message.getAdvertisedFeatures().isTenGbFd());
-        assertEquals(IS_40GBFD, message.getAdvertisedFeatures().isFortyGbFd());
-        assertEquals(IS_100GBFD, message.getAdvertisedFeatures().isHundredGbFd());
-        assertEquals(IS_1TBFD, message.getAdvertisedFeatures().isOneTbFd());
-        assertEquals(IS_OTHER, message.getAdvertisedFeatures().isOther());
-        assertEquals(IS_COPPER, message.getAdvertisedFeatures().isCopper());
-        assertEquals(IS_FIBER, message.getAdvertisedFeatures().isFiber());
-        assertEquals(IS_AUTOENG, message.getAdvertisedFeatures().isAutoeng());
-        assertEquals(IS_PAUSE, message.getAdvertisedFeatures().isPause());
-        assertEquals(IS_PAUSE_ASYM, message.getAdvertisedFeatures().isPauseAsym());
+        assertEquals(IS_10MBHD, message.getAdvertisedFeatures().getTenMbHd());
+        assertEquals(IS_10MBFD, message.getAdvertisedFeatures().getTenMbHd());
+        assertEquals(IS_100MBHD, message.getAdvertisedFeatures().getHundredMbHd());
+        assertEquals(IS_100MBFD, message.getAdvertisedFeatures().getHundredMbFd());
+        assertEquals(IS_1GBHD, message.getAdvertisedFeatures().getOneGbHd());
+        assertEquals(IS_1GBFD, message.getAdvertisedFeatures().getOneGbFd());
+        assertEquals(IS_10GBFD, message.getAdvertisedFeatures().getTenGbFd());
+        assertEquals(IS_40GBFD, message.getAdvertisedFeatures().getFortyGbFd());
+        assertEquals(IS_100GBFD, message.getAdvertisedFeatures().getHundredGbFd());
+        assertEquals(IS_1TBFD, message.getAdvertisedFeatures().getOneTbFd());
+        assertEquals(IS_OTHER, message.getAdvertisedFeatures().getOther());
+        assertEquals(IS_COPPER, message.getAdvertisedFeatures().getCopper());
+        assertEquals(IS_FIBER, message.getAdvertisedFeatures().getFiber());
+        assertEquals(IS_AUTOENG, message.getAdvertisedFeatures().getAutoeng());
+        assertEquals(IS_PAUSE, message.getAdvertisedFeatures().getPause());
+        assertEquals(IS_PAUSE_ASYM, message.getAdvertisedFeatures().getPauseAsym());
 
         assertEquals(buffer.readableBytes(), 0);
     }