| commit | 69b7ae6414f3b5547bf0cf7dac35a069d7f8a561 | [log] [tgz] |
|---|---|---|
| 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 | 4444fb3f69a82da9f48877a46ce0470e0b43eb38 | |
| parent | afac1c61b8dd710dcf765e913fe1be5740067904 [diff] |
[ONOS-7759] Explicitly pop VLAN when a transport VLAN is not required on a spine Change-Id: I656fcdc0077557bd9d843b3fe29fb003efafc03d
diff --git a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java index a569873..1ae24e5 100644 --- a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java +++ b/apps/segmentrouting/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;