commit ad3636a9a1b04f906f175ec06b33f4119ab9a9c1
author jayakumarthazhath <jayakumar.thazhath@infosys.com> Mon Oct 01 00:51:54 2018 +0530
committer Charles Chan <rascov@gmail.com> Thu Oct 04 11:14:21 2018 -0700
tree 902bb4eb84cf8264f6501336301c8c2652c82767
parent 2e33d5538132e0c7996e63197d3e3ce4d3df42e3

Prevent XConnect loop

Change-Id: I65c52342840ebef944a65b8c6f65a33448da59cf

drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java
index 016299c..217595f 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java
@@ -73,6 +73,7 @@
     protected static final int MPLS_L3VPN_SUBTYPE = 0x92000000;
     protected static final int L3_ECMP_TYPE = 0x70000000;
     protected static final int L2_FLOOD_TYPE = 0x40000000;
+    protected static final int L2_MULTICAST_TYPE = 0x30000000;
 
     protected static final int TYPE_MASK = 0x0fffffff;
     protected static final int SUBTYPE_MASK = 0x00ffffff;
@@ -448,6 +449,12 @@
         return new DefaultGroupKey(Ofdpa2Pipeline.appKryo.serialize(hash));
     }
 
+    public static GroupKey l2MulticastGroupKey(VlanId vlanId, DeviceId deviceId) {
+        int hash = Objects.hash(deviceId, vlanId);
+        hash = L2_MULTICAST_TYPE | TYPE_MASK & hash;
+        return new DefaultGroupKey(Ofdpa2Pipeline.appKryo.serialize(hash));
+    }
+
     public static int l2GroupId(VlanId vlanId, long portNum) {
         return L2_INTERFACE_TYPE | (vlanId.toShort() << 16) | (int) portNum;
     }