Bug 5895 - Support of Ext109 openflow tcp flag matching

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / util / MatchEntryDeserializerRegistryHelper.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntryDeserializerRegistryHelper.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntryDeserializerRegistryHelper.java
index 102d1f084cb07d790ad201ed93408942fc578d17..96d01c3dc847ba24b6bf35db46881cef25f0b8e8 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntryDeserializerRegistryHelper.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntryDeserializerRegistryHelper.java
@@ -1,47 +1,55 @@
-/*\r
- * Copyright (c) 2013 Pantheon Technologies s.r.o. and others.  All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-package org.opendaylight.openflowjava.protocol.impl.util;\r
-\r
-import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;\r
-import org.opendaylight.openflowjava.protocol.api.extensibility.EnhancedMessageCodeKey;\r
-import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralDeserializer;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntries;\r
-\r
-/**\r
- * @author michal.polkorab\r
- *\r
- */\r
-public class MatchEntryDeserializerRegistryHelper {\r
-\r
-    private short version;\r
-    private DeserializerRegistry registry;\r
-    private int oxmClass;\r
-\r
-    /**\r
-     * @param version wire protocol version\r
-     * @param oxmClass oxm_class that will be used for match entry deserializer\r
-     *  registration\r
-     * @param deserializerRegistry registry to be filled with message deserializers\r
-     */\r
-    public MatchEntryDeserializerRegistryHelper(short version, int oxmClass,\r
-            DeserializerRegistry deserializerRegistry) {\r
-        this.version = version;\r
-        this.oxmClass = oxmClass;\r
-        this.registry = deserializerRegistry;\r
-    }\r
-\r
-    /**\r
-     * Registers match entry deserializer under provided oxmfield ()\r
-     * @param oxmField oxm_field value/code\r
-     * @param deserializer deserializer instance\r
-     */\r
-    public void register(int oxmField, OFGeneralDeserializer deserializer) {\r
-        registry.registerDeserializer(new EnhancedMessageCodeKey(version, oxmClass,\r
-                oxmField, MatchEntries.class), deserializer);\r
-    }\r
-}\r
+/*
+ * Copyright (c) 2013 Pantheon Technologies s.r.o. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.openflowjava.protocol.impl.util;
+
+import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
+import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralDeserializer;
+import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey;
+import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
+
+/**
+ * @author michal.polkorab
+ *
+ */
+public class MatchEntryDeserializerRegistryHelper {
+
+    private short version;
+    private DeserializerRegistry registry;
+    private int oxmClass;
+
+    /**
+     * @param version wire protocol version
+     * @param oxmClass oxm_class that will be used for match entry deserializer
+     *  registration
+     * @param deserializerRegistry registry to be filled with message deserializers
+     */
+    public MatchEntryDeserializerRegistryHelper(short version, int oxmClass,
+            DeserializerRegistry deserializerRegistry) {
+        this.version = version;
+        this.oxmClass = oxmClass;
+        this.registry = deserializerRegistry;
+    }
+
+    /**
+     * Registers match entry deserializer under provided oxmfield ()
+     * @param oxmField oxm_field value/code
+     * @param deserializer deserializer instance
+     */
+    public void register(int oxmField, OFGeneralDeserializer deserializer) {
+        MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(version, oxmClass, oxmField);
+        key.setExperimenterId(null);
+        registry.registerDeserializer(key, deserializer);
+    }
+
+    public void registerExperimenter(int oxmField, long expId, OFGeneralDeserializer deserializer) {
+        MatchEntryDeserializerKey key =
+                new MatchEntryDeserializerKey(version, OxmMatchConstants.EXPERIMENTER_CLASS, oxmField);
+        key.setExperimenterId(expId);
+        registry.registerDeserializer(key, deserializer);
+    }
+}
\ No newline at end of file