From 67ef2553d4372d2dbfaee8646202c2b36f4eeb0e Mon Sep 17 00:00:00 2001
From: Charles Chan <rascov@gmail.com>
Date: Thu, 30 Aug 2018 19:49:23 -0700
Subject: [PATCH] Pass metadata in the remove_from_existing operation, just
 like the add_to_existing case

Change-Id: I398296bf6357ac7ee7ec4344c025604e1904ccc6
---
 .../segmentrouting/grouphandler/DefaultGroupHandler.java       | 3 +++
 1 file changed, 3 insertions(+)

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 1ffd8e8a07..02f2b1974f 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
@@ -409,9 +409,12 @@ public class DefaultGroupHandler {
      */
     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