X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fdeserialization%2Ffactories%2FOF10PortStatusMessageFactory.java;h=9c3b72e71cce1462fadc39f0402b20e4503239c9;hb=07de1ed897da9d7dc70c6d550f38c59339ed751e;hp=e7036ed82df975aea57a82ffa8535da3feba5eb0;hpb=87150bd287f792c118e906ffb8e9593a83f50c9e;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java
index e7036ed8..9c3b72e7 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java
@@ -11,13 +11,11 @@ package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 import io.netty.buffer.ByteBuf;
 
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
-import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.openflowjava.protocol.impl.util.OpenflowUtils;
+import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfigV10;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeaturesV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortReason;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortStateV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessageBuilder;
 
@@ -31,7 +29,7 @@ public class OF10PortStatusMessageFactory implements OFDeserializer<PortStatusMe
 
     @Override
     public PortStatusMessage deserialize(ByteBuf rawMessage) {
-        PortStatusMessageBuilder builder = new PortStatusMessageBuilder(); 
+        PortStatusMessageBuilder builder = new PortStatusMessageBuilder();
         builder.setVersion((short) EncodeConstants.OF10_VERSION_ID);
         builder.setXid(rawMessage.readUnsignedInt());
         builder.setReason(PortReason.forValue(rawMessage.readUnsignedByte()));
@@ -40,57 +38,17 @@ public class OF10PortStatusMessageFactory implements OFDeserializer<PortStatusMe
         return builder.build();
     }
 
-    private static PortStateV10 createPortState(long input){
-        final Boolean _linkDown = ((input) & (1<<0)) != 0;
-        final Boolean _blocked = ((input) & (1<<1)) != 0;
-        final Boolean _live = ((input) & (1<<2)) != 0;
-        final Boolean _stpListen = ((input) & (0<<8)) != 0;
-        final Boolean _stpLearn = ((input) & (1<<8)) != 0;
-        final Boolean _stpForward = ((input) & (1<<9)) != 0; // equals 2 << 8
-        final Boolean _stpBlock = (((input) & (1<<9)) != 0) && (((input) & (1<<8)) != 0); // equals 3 << 8
-        final Boolean _stpMask = ((input) & (1<<10)) != 0; // equals 4 << 8
-        return new PortStateV10(_blocked, _linkDown, _live, _stpBlock, _stpForward, _stpLearn, _stpListen, _stpMask);
-    }
-    
-    private static PortConfigV10 createPortConfig(long input){
-        final Boolean _portDown = ((input) & (1<<0)) != 0;
-        final Boolean _noStp = ((input) & (1<<1)) != 0;
-        final Boolean _noRecv = ((input) & (1<<2)) != 0;
-        final Boolean _noRecvStp = ((input) & (1<<3)) != 0;
-        final Boolean _noFlood = ((input) & (1<<4)) != 0;
-        final Boolean _noFwd  = ((input) & (1<<5)) != 0;
-        final Boolean _noPacketIn = ((input) & (1<<6)) != 0;
-        return new PortConfigV10(_noFlood, _noFwd, _noPacketIn, _noRecv, _noRecvStp, _noStp, _portDown);
-    }
-    
-    private static PortFeaturesV10 createPortFeatures(long input){
-        final Boolean _10mbHd = ((input) & (1<<0)) != 0;
-        final Boolean _10mbFd = ((input) & (1<<1)) != 0;
-        final Boolean _100mbHd = ((input) & (1<<2)) != 0;
-        final Boolean _100mbFd = ((input) & (1<<3)) != 0;
-        final Boolean _1gbHd = ((input) & (1<<4)) != 0;
-        final Boolean _1gbFd = ((input) & (1<<5)) != 0;
-        final Boolean _10gbFd = ((input) & (1<<6)) != 0;
-        final Boolean _copper = ((input) & (1<<7)) != 0;
-        final Boolean _fiber = ((input) & (1<<8)) != 0;
-        final Boolean _autoneg = ((input) & (1<<9)) != 0;
-        final Boolean _pause = ((input) & (1<<10)) != 0;
-        final Boolean _pauseAsym = ((input) & (1<<11)) != 0;
-        return new PortFeaturesV10(_100mbFd, _100mbHd, _10gbFd, _10mbFd, _10mbHd,
-                _1gbFd, _1gbHd, _autoneg, _copper, _fiber, _pause, _pauseAsym);
-    }
-    
     private static void deserializePort(ByteBuf rawMessage, PortStatusMessageBuilder builder) {
         builder.setPortNo((long) rawMessage.readUnsignedShort());
         byte[] address = new byte[EncodeConstants.MAC_ADDRESS_LENGTH];
         rawMessage.readBytes(address);
         builder.setHwAddr(new MacAddress(ByteBufUtils.macAddressToString(address)));
         builder.setName(ByteBufUtils.decodeNullTerminatedString(rawMessage, EncodeConstants.MAX_PORT_NAME_LENGTH));
-        builder.setConfigV10(createPortConfig(rawMessage.readUnsignedInt()));
-        builder.setStateV10(createPortState(rawMessage.readUnsignedInt()));
-        builder.setCurrentFeaturesV10(createPortFeatures(rawMessage.readUnsignedInt()));
-        builder.setAdvertisedFeaturesV10(createPortFeatures(rawMessage.readUnsignedInt()));
-        builder.setSupportedFeaturesV10(createPortFeatures(rawMessage.readUnsignedInt()));
-        builder.setPeerFeaturesV10(createPortFeatures(rawMessage.readUnsignedInt()));
+        builder.setConfigV10(OpenflowUtils.createPortConfig(rawMessage.readUnsignedInt()));
+        builder.setStateV10(OpenflowUtils.createPortState(rawMessage.readUnsignedInt()));
+        builder.setCurrentFeaturesV10(OpenflowUtils.createPortFeatures(rawMessage.readUnsignedInt()));
+        builder.setAdvertisedFeaturesV10(OpenflowUtils.createPortFeatures(rawMessage.readUnsignedInt()));
+        builder.setSupportedFeaturesV10(OpenflowUtils.createPortFeatures(rawMessage.readUnsignedInt()));
+        builder.setPeerFeaturesV10(OpenflowUtils.createPortFeatures(rawMessage.readUnsignedInt()));
     }
-}
+}
\ No newline at end of file