commit 25db42ffcbe35c139937f355b8229e620b40af9e
author Andreas Pantelopoulos <andreas@opennetworking.org> Thu Feb 08 12:42:06 2018 -0800
committer Charles Chan <charles@opennetworking.org> Thu Feb 08 21:17:07 2018 +0000
tree cd4128a0ea47b3248f5f19b1eb922497a0fd6666
parent c568c34e0cf85ad860fdfa66c86a93b84d496e08

Bug fix for Ofdpa2 group handler.

When introducing the mplsSwap groups, we affected the pseudowire instantiation.
This is now fixed with this patch.

Change-Id: I6f98c49b954017bb0ea899d5ecc15c5a1b8ba340

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

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java
index f9c9f22..93730c7 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2GroupHandler.java
@@ -300,7 +300,7 @@
 
         }
 
-        if (mplsSwap) {
+        if (mplsSwap && !isPw) {
             log.debug("Creating a MPLS Swap - MPLS Interface - L2 Interface group chain.");
 
             // break up simple next objective to GroupChain objects