commit 5a243d642cae153f25ef31dc798d9411acaeed97
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 848fe85a1ee6b6ac9e6ec49c3b6e8abac1e23c24
parent b3e45a3f981f1cbc653dc88010256f63e217c095

Fixed VLAN used for l2 intf groups of pseudowires

Change-Id: Ic1af6dfc2b581fb3194f7778e6c7b69d6b85d8a4

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

diff --git a/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java b/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
index 2675734..a2048b0 100644
--- a/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
+++ b/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);
             }
         });