commit | d5b9016346ee00f1f539075c2897eb7ed72f07b5 | [log] [tgz] |
---|---|---|
author | psneha <sneha.prem@infosys.com> | Mon Jul 01 05:34:23 2019 -0400 |
committer | Charles Chan <rascov@gmail.com> | Mon Jul 08 15:09:11 2019 -0700 |
tree | e261bef06bd4cbad1ee98e2c724a517f498b570b | |
parent | ce7e72a0f431f8e12a75b4391c8595991a080b3d [diff] |
Do not pop VLAN for traffic that goes to the pair port Note: popVlan is effective to L2 interface group that gets created while creating L2 multicast group. The popVlan has nothing to do with L2 multicast group itself. Change-Id: I63baf88bfd626b19dcfdf654e4e184e48886f7fc
diff --git a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java index ec8a6bd..d4a7430 100644 --- a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java +++ b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java
@@ -1011,7 +1011,7 @@ vlanMulticastNextId = flowObjectiveService.allocateNextId(); addMulticastGroupNextObjectiveId(key, vlanMulticastNextId); vlanMulticastNextObjBuilder.addTreatment( - DefaultTrafficTreatment.builder().popVlan().setOutput(pairPort).build() + DefaultTrafficTreatment.builder().setOutput(pairPort).build() ); } vlanMulticastNextObjBuilder.withId(vlanMulticastNextId);