commit 81ddf6fab929d6f42ab9ca17fab8fb556fd3568d
author Charles Chan <rascov@gmail.com> Sun Aug 12 15:19:01 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Mon Aug 13 17:03:47 2018 +0000
tree 8a3f526af8bf7e2b117d2e55121ea4dcb883f6bb
parent 9cd62ecd94a5aa5cdc4fc387f650de8e4e5d93fd

[ONOS-7759] Explicitly pop VLAN when a transport VLAN is not required on a spine

Change-Id: I656fcdc0077557bd9d843b3fe29fb003efafc03d

app/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java

diff --git a/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java b/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
index a569873..1ae24e5 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
@@ -984,10 +984,15 @@
                                     .setMpls(MplsLabel.mplsLabel(edgeLabel));
                         }
                     }
+
+                    // Set VLAN ID for PW transport. Otherwise pop vlan
                     if ((ds.getTypeOfDstSet() == DestinationSet.DestinationSetType.SWAP_NOT_BOS) ||
                          (ds.getTypeOfDstSet() == DestinationSet.DestinationSetType.POP_NOT_BOS)) {
                         tBuilder.setVlanId(srManager.PSEUDOWIRE_VLAN);
+                    } else {
+                        tBuilder.popVlan();
                     }
+
                     tBuilder.setOutput(sp);
                     nextObjBuilder.addTreatment(tBuilder.build());
                     treatmentAdded = true;