commit 161ce33e406653e9d2f22007ca98d4de5ef21a02
author Andreas Pantelopoulos <andreas@opennetworking.org> Wed Jan 17 10:03:00 2018 -0800
committer Charles Chan <charles@opennetworking.org> Wed Jan 17 18:25:14 2018 +0000
tree 3f1a2b8f0611dfee902bd6ea78d0aa9389f13b48
parent c41ceb92768e0030f6c4275d44bff8cd45acf180

Fixed VLAN used for l2 intf groups of pseudowires

Change-Id: Ic1af6dfc2b581fb3194f7778e6c7b69d6b85d8a4

apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java

diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
index 2675734..a2048b0 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
@@ -373,7 +373,7 @@
         // We terminate the tunnel
         result = deployPseudoWireTerm(pw.l2Tunnel(),
                                        pw.l2TunnelPolicy().cP2(),
-                                       pw.l2TunnelPolicy().cP2OuterTag(),
+                                       VlanId.NONE,
                                        FWD,
                                       spinePw);
 
@@ -414,7 +414,7 @@
 
         result = deployPseudoWireTerm(pw.l2Tunnel(),
                                        pw.l2TunnelPolicy().cP1(),
-                                       pw.l2TunnelPolicy().cP1OuterTag(),
+                                       VlanId.NONE,
                                        REV,
                                       spinePw);
 
@@ -725,7 +725,7 @@
                     return;
                 }
                 deployPseudoWireTerm(newPw.l2Tunnel(), newPw.l2TunnelPolicy().cP2(),
-                                      newPw.l2TunnelPolicy().cP2OuterTag(), FWD, finalNewPwSpine);
+                                      VlanId.NONE, FWD, finalNewPwSpine);
 
             }
         });
@@ -756,7 +756,7 @@
                 }
                 deployPseudoWireTerm(newPw.l2Tunnel(),
                                       newPw.l2TunnelPolicy().cP1(),
-                                      newPw.l2TunnelPolicy().cP1OuterTag(),
+                                      VlanId.NONE,
                                       REV, finalNewPwSpine);
             }
         });