From 6f617b9dee9173581e8501dcd3c2f365f9a04f79 Mon Sep 17 00:00:00 2001
From: Michal Polkorab <michal.polkorab@pantheon.sk>
Date: Thu, 9 Jan 2014 08:50:45 +0100
Subject: [PATCH] PortFeatures constructor fix

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
---
 .../MultipartReplyMessageFactory.java         |  4 +--
 .../factories/PortStatusMessageFactory.java   |  6 ++--
 .../MultipartReplyMessageFactoryTest.java     | 36 +++++++++----------
 .../PortStatusMessageFactoryTest.java         | 22 ++++++------
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
index fdaea562..b8672e87 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
@@ -755,8 +755,8 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         final Boolean _autoneg = ((input) & (1<<13)) != 0;
         final Boolean _pause = ((input) & (1<<14)) != 0;
         final Boolean _pauseAsym = ((input) & (1<<15)) != 0;
-        return new PortFeatures(_10mbHd, _10mbFd, _100mbHd, _100mbFd, _1gbHd, _1gbFd, _10gbFd,
-                _40gbFd, _100gbFd, _1tbFd, _other, _copper, _fiber, _autoneg, _pause, _pauseAsym);
+        return new PortFeatures(_100gbFd, _100mbFd, _100mbHd, _10gbFd, _10mbFd, _10mbHd, _1gbFd,
+                _1gbHd, _1tbFd, _40gbFd, _autoneg, _copper, _fiber, _other, _pause, _pauseAsym);
     }
     
     private static MultipartReplyGroupFeaturesCase setGroupFeatures(ByteBuf rawMessage) {
diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactory.java
index 1d193645..db0d52d7 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactory.java
@@ -32,7 +32,6 @@ public class PortStatusMessageFactory implements OFDeserializer<PortStatusMessag
     private static final byte PADDING_IN_PORT_STATUS_HEADER = 7;
     private static final byte PADDING_IN_OFP_PORT_HEADER_1 = 4;
     private static final byte PADDING_IN_OFP_PORT_HEADER_2 = 2;
-    private static final byte MAX_PORT_NAME_LEN = 16;
     
     private PortStatusMessageFactory() {
         // Singleton
@@ -74,6 +73,7 @@ public class PortStatusMessageFactory implements OFDeserializer<PortStatusMessag
     }
 
     private static PortFeatures createPortFeatures(long input){
+        System.out.println("long: " + input);
         final Boolean _10mbHd = ((input) & (1<<0)) != 0;
         final Boolean _10mbFd = ((input) & (1<<1)) != 0;
         final Boolean _100mbHd = ((input) & (1<<2)) != 0;
@@ -90,8 +90,8 @@ public class PortStatusMessageFactory implements OFDeserializer<PortStatusMessag
         final Boolean _autoneg = ((input) & (1<<13)) != 0;
         final Boolean _pause = ((input) & (1<<14)) != 0;
         final Boolean _pauseAsym = ((input) & (1<<15)) != 0;
-        return new PortFeatures(_10mbHd, _10mbFd, _100mbHd, _100mbFd, _1gbHd, _1gbFd, _10gbFd,
-                _40gbFd, _100gbFd, _1tbFd, _other, _copper, _fiber, _autoneg, _pause, _pauseAsym);
+        return new PortFeatures(_100gbFd, _100mbFd, _100mbHd, _10gbFd, _10mbFd, _10mbHd, _1gbFd,
+                _1gbHd, _1tbFd, _40gbFd, _autoneg, _copper, _fiber, _other, _pause, _pauseAsym);
     }
     
     private static PortState createPortState(long input){
diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java
index e3a66171..cc43e50e 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java
@@ -844,9 +844,9 @@ public class MultipartReplyMessageFactoryTest {
         ByteBuf bb2 =  BufferHelper.buildBuffer("00 00 00 41 " + //port config
                                                 "00 00 00 05 " + //port state
                                                 "00 00 00 81 " + //current features
-                                                "00 00 00 81 " + //advertised features
-                                                "00 00 00 81 " + //supported features
-                                                "00 00 00 81 " + //peer features
+                                                "00 00 81 81 " + //advertised features
+                                                "00 00 C1 89 " + //supported features
+                                                "00 00 C5 8D " + //peer features
                                                 "00 00 00 81 " + //curr speed
                                                 "00 00 00 80" //max speed
                                                 );
@@ -868,28 +868,28 @@ public class MultipartReplyMessageFactoryTest {
                 message.getPorts().get(0).getConfig());
         Assert.assertEquals("Wrong portState", new PortState(false, true, true),
                                                message.getPorts().get(0).getState());
-        Assert.assertEquals("Wrong currentFeatures", new PortFeatures(true, false, false, false,
-                                                                      false, false, false, true, 
-                                                                      false, false, false, false, 
+        Assert.assertEquals("Wrong currentFeatures", new PortFeatures(false, false, false, false,
+                                                                      false, true, false, false, 
+                                                                      false, true, false, false, 
                                                                       false, false, false, false), 
                                                   message.getPorts().get(0).getCurrentFeatures());
         Assert.assertEquals("Wrong advertisedFeatures", 
-                             new PortFeatures(true, false, false, false,
-                                              false, false, false, true, 
-                                              false, false, false, false, 
-                                              false, false, false, false), 
+                                            new PortFeatures(true, false, false, false,
+                                                            false, true, false, false, 
+                                                            false, true, false, false, 
+                                                            false, false, false, true), 
                                               message.getPorts().get(0).getAdvertisedFeatures());
         Assert.assertEquals("Wrong supportedFeatures", 
-                             new PortFeatures(true, false, false, false,
-                                              false, false, false, true, 
-                                              false, false, false, false, 
-                                              false, false, false, false), 
+                                            new PortFeatures(true, true, false, false,
+                                                            false, true, false, false, 
+                                                            false, true, false, false, 
+                                                            false, false, true, true), 
                                               message.getPorts().get(0).getSupportedFeatures());
         Assert.assertEquals("Wrong peerFeatures", 
-                             new PortFeatures(true, false, false, false,
-                                              false, false, false, true, 
-                                              false, false, false, false, 
-                                              false, false, false, false), 
+                                            new PortFeatures(true, true, true, false,
+                                                    false, true, false, false, 
+                                                    false, true, false, false, 
+                                                    false, true, true, true), 
                                               message.getPorts().get(0).getPeerFeatures());
         Assert.assertEquals("Wrong currSpeed", 129L, message.getPorts().get(0).getCurrSpeed().longValue());
         Assert.assertEquals("Wrong maxSpeed", 128L, message.getPorts().get(0).getMaxSpeed().longValue());
diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java
index 43923853..accefd27 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java
@@ -41,8 +41,8 @@ public class PortStatusMessageFactoryTest {
                                               "00 00 00 41 " + //port config
                                               "00 00 00 05 " + //port state
                                               "00 00 00 81 " + //current features
-                                              "00 00 00 81 " + //advertised features
-                                              "00 00 00 81 " + //supported features
+                                              "00 00 00 A1 " + //advertised features
+                                              "00 00 00 B1 " + //supported features
                                               "00 00 00 81 " + //peer features
                                               "00 00 00 81 " + //curr speed
                                               "00 00 00 80" //max speed
@@ -57,18 +57,18 @@ public class PortStatusMessageFactoryTest {
         Assert.assertEquals("Wrong name", "s1-eth1", builtByFactory.getName());
         Assert.assertEquals("Wrong portConfig", new PortConfig(false, true, false, true), builtByFactory.getConfig());
         Assert.assertEquals("Wrong portState", new PortState(false, true, true), builtByFactory.getState());
-        Assert.assertEquals("Wrong currentFeatures", new PortFeatures(true, false, false, false,
-                                             false, false, false, true, false, false, false, false, 
+        Assert.assertEquals("Wrong currentFeatures", new PortFeatures(false, false, false, false,
+                                             false, true, false, false, false, true, false, false,
                                              false, false, false, false), builtByFactory.getCurrentFeatures());
-        Assert.assertEquals("Wrong advertisedFeatures", new PortFeatures(true, false, false, false,
-                                             false, false, false, true, false, false, false, false, 
+        Assert.assertEquals("Wrong advertisedFeatures", new PortFeatures(false, false, false, false,
+                                             false, true, true, false, false, true, false, false,
                                              false, false, false, false), builtByFactory.getAdvertisedFeatures());
-        Assert.assertEquals("Wrong supportedFeatures", new PortFeatures(true, false, false, false,
-                                             false, false, false, true, false, false, false, false, 
-                                             false, false, false, false), builtByFactory.getSupportedFeatures());
-        Assert.assertEquals("Wrong peerFeatures", new PortFeatures(true, false, false, false,
-                                             false, false, false, true, false, false, false, false, 
+        Assert.assertEquals("Wrong supportedFeatures", new PortFeatures(false, false, false, false,
+                                             false, true, true, true, false, true, false, false,
                                              false, false, false, false), builtByFactory.getSupportedFeatures());
+        Assert.assertEquals("Wrong peerFeatures", new PortFeatures(false, false, false, false,
+                                                  false, true, false, false, false, true, false, false,
+                                                  false, false, false, false), builtByFactory.getPeerFeatures());
         Assert.assertEquals("Wrong currSpeed", 129L, builtByFactory.getCurrSpeed().longValue());
         Assert.assertEquals("Wrong maxSpeed", 128L, builtByFactory.getMaxSpeed().longValue());
     }
-- 
2.36.6