adapting to OFLibrary change

Change-Id: I77de3e01d7d5005e6d09f8acdb8f7171d198458c
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java
index feb383b8638d53510a36ed5da3db72694fa17891..d207f0133e788251e892762c12f4b41b66afe1af 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java
@@ -32,8 +32,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.Upd
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.MatchEntries;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowMod;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.flow.mod.Match;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.flow.mod.MatchBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.match.grouping.Match;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.match.grouping.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java
index e1f8e41149bfa129056007105c1713609e79cceb..84fc8bb82ee59af48053dad9f82e9898fb3ab012 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java
@@ -28,6 +28,7 @@ import org.opendaylight.openflowplugin.openflow.md.core.plan.SwitchTestEvent;
 import org.opendaylight.openflowplugin.openflow.md.core.session.SessionContext;
 import org.opendaylight.openflowplugin.openflow.md.queue.PopListener;
 import org.opendaylight.openflowplugin.openflow.md.queue.QueueKeeperLightImpl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.Capabilities;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ErrorType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.HelloElementType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures;
@@ -204,7 +205,7 @@ public class ConnectionConductorImplTest {
         getFeaturesOutputBuilder.setBuffers(4L);
         getFeaturesOutputBuilder.setReserved(0L);
         getFeaturesOutputBuilder.setTables((short) 2);
-        getFeaturesOutputBuilder.setCapabilities(84L);
+        getFeaturesOutputBuilder.setCapabilities(createCapabilities(84));
 
         eventPlan.add(0, EventFactory.createDefaultRpcResponseEvent(44,
                 EventFactory.DEFAULT_VERSION, getFeaturesOutputBuilder));
@@ -244,7 +245,7 @@ public class ConnectionConductorImplTest {
         getFeaturesOutputBuilder.setBuffers(4L);
         getFeaturesOutputBuilder.setReserved(0L);
         getFeaturesOutputBuilder.setTables((short) 2);
-        getFeaturesOutputBuilder.setCapabilities(84L);
+        getFeaturesOutputBuilder.setCapabilities(createCapabilities(84));
 
         eventPlan.add(0, EventFactory.createDefaultRpcResponseEvent(45,
                 EventFactory.DEFAULT_VERSION, getFeaturesOutputBuilder));
@@ -358,7 +359,7 @@ public class ConnectionConductorImplTest {
         getFeaturesOutputBuilder.setBuffers(4L);
         getFeaturesOutputBuilder.setReserved(0L);
         getFeaturesOutputBuilder.setTables((short) 2);
-        getFeaturesOutputBuilder.setCapabilities(84L);
+        getFeaturesOutputBuilder.setCapabilities(createCapabilities(84));
         eventPlan.add(0, EventFactory.createDefaultRpcResponseEvent(44,
           EventFactory.DEFAULT_VERSION, getFeaturesOutputBuilder));
         execute(true);
@@ -424,7 +425,7 @@ public class ConnectionConductorImplTest {
         getFeaturesOutputBuilder.setBuffers(4L);
         getFeaturesOutputBuilder.setReserved(0L);
         getFeaturesOutputBuilder.setTables((short) 2);
-        getFeaturesOutputBuilder.setCapabilities(84L);
+        getFeaturesOutputBuilder.setCapabilities(createCapabilities(84));
         eventPlan.add(0, EventFactory.createDefaultRpcResponseEvent(44,
           EventFactory.DEFAULT_VERSION, getFeaturesOutputBuilder));
         execute(true);
@@ -469,7 +470,7 @@ public class ConnectionConductorImplTest {
         getFeaturesOutputBuilder.setBuffers(4L);
         getFeaturesOutputBuilder.setReserved(0L);
         getFeaturesOutputBuilder.setTables((short) 2);
-        getFeaturesOutputBuilder.setCapabilities(84L);
+        getFeaturesOutputBuilder.setCapabilities(createCapabilities(84));
         eventPlan.add(0, EventFactory.createDefaultRpcResponseEvent(44,
           EventFactory.DEFAULT_VERSION, getFeaturesOutputBuilder));
         execute(true);
@@ -756,11 +757,27 @@ public class ConnectionConductorImplTest {
         getFeaturesOutputBuilder.setBuffers(4L);
         getFeaturesOutputBuilder.setReserved(0L);
         getFeaturesOutputBuilder.setTables((short) 2);
-        getFeaturesOutputBuilder.setCapabilities(84L);
+        getFeaturesOutputBuilder.setCapabilities(createCapabilities(84));
 
         return getFeaturesOutputBuilder;
     }
 
+    /**
+     * @return
+     */
+    private static Capabilities createCapabilities(long input) {
+        final Boolean FLOW_STATS = (input & (1 << 0)) != 0;
+        final Boolean TABLE_STATS = (input & (1 << 1)) != 0;
+        final Boolean PORT_STATS = (input & (1 << 2)) != 0;
+        final Boolean GROUP_STATS = (input & (1 << 3)) != 0;
+        final Boolean IP_REASM = (input & (1 << 5)) != 0;
+        final Boolean QUEUE_STATS = (input & (1 << 6)) != 0;
+        final Boolean PORT_BLOCKED = (input & (1 << 8)) != 0;
+        Capabilities capabilities = new Capabilities(FLOW_STATS, GROUP_STATS, IP_REASM,
+                PORT_BLOCKED, PORT_STATS, QUEUE_STATS, TABLE_STATS);
+        return capabilities;
+    }
+    
     public class ExperimenterMessageService implements IMDMessageListener {
         @Override
         public void receive(SwitchConnectionDistinguisher cookie, SessionContext sw, DataObject msg) {