Add util to get NXM register mask for elan-tag/vpn-id

Add reg3 and reg7 to NxMatchRegister keys

Change-Id: Icb10aaea0fe5faeeafe117bb2b519e3e3f276842
Signed-off-by: Tali <tali.ben-meir@hpe.com>

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/MetaDataUtil.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/MetaDataUtil.java
index a766ffe1e00d6f9aa5a01e4e303aa9ac037e50a5..05761f0375b4765df364b549ce0aaaa88443ab2e 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/MetaDataUtil.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/MetaDataUtil.java
@@ -133,4 +133,11 @@ public class MetaDataUtil {
         return METADATA_MASK_LPORT_TAG.shiftRight(32).longValue();
     }
 
+    public static long getElanMaskForReg() {
+        return METADATA_MASK_SERVICE.shiftRight(24).longValue();
+    }
+
+    public static long getVpnIdMaskForReg() {
+        return METADATA_MASK_VRFID.shiftRight(1).longValue();
+    }
 }

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchRegister.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchRegister.java
index 386f885ec63f31bf9c8d5265ac9b66f2313ea2c6..f464ea0f5d4541daf653da5a00ecb63a6dffe33c 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchRegister.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchRegister.java
@@ -9,14 +9,19 @@ package org.opendaylight.genius.mdsalutil.nxmatches;
 
 import com.google.common.collect.ImmutableBiMap;
 import java.util.Map;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg3;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg4;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg5;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg6;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg7;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlowBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmNxReg3Key;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmNxReg4Key;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmNxReg5Key;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmNxReg6Key;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmNxReg7Key;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.reg.grouping.NxmNxReg;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.reg.grouping.NxmNxRegBuilder;
 
@@ -27,9 +32,11 @@ public class NxMatchRegister extends NxMatchInfoHelper<NxmNxReg, NxmNxRegBuilder
     private static final Map<Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match
             .rev140421.NxmNxReg>, Class<? extends ExtensionKey>> KEYS =
             ImmutableBiMap.of(
+                    NxmNxReg3.class, NxmNxReg3Key.class,
                     NxmNxReg4.class, NxmNxReg4Key.class,
                     NxmNxReg5.class, NxmNxReg5Key.class,
-                    NxmNxReg6.class, NxmNxReg6Key.class
+                    NxmNxReg6.class, NxmNxReg6Key.class,
+                    NxmNxReg7.class, NxmNxReg7Key.class
                     );
 
     private final Class<