commit e292336611fb8072d865dfdb35ce6a73630d0341
author Charles Chan <rascov@gmail.com> Thu Aug 30 19:49:23 2018 -0700
committer Carmelo Cascone <carmelo@opennetworking.org> Wed Sep 05 06:30:04 2018 +0000
tree 1df15273378619b3504fe5e5815f49e03e9af53c
parent b2d7bc4ed352577d18f575c30e4f2297411f0fa5

Pass metadata in the remove_from_existing operation, just like the add_to_existing case

Change-Id: I398296bf6357ac7ee7ec4344c025604e1904ccc6

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

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 3fe934c..abfb0d8 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
@@ -408,9 +408,12 @@
      */
     private void removeFromHashedNextObjective(Collection<PortLabel> portLabels,
                                                MacAddress dstMac, Integer nextId) {
+        TrafficSelector.Builder metabuilder = DefaultTrafficSelector.builder();
+        metabuilder.matchVlanId(srManager.getDefaultInternalVlan());
         NextObjective.Builder nextObjBuilder = DefaultNextObjective
                 .builder()
                 .withType(NextObjective.Type.HASHED) //same as original
+                .withMeta(metabuilder.build())
                 .withId(nextId)
                 .fromApp(appId);
         // Create the buckets to be removed