commit | 67ef2553d4372d2dbfaee8646202c2b36f4eeb0e | [log] [tgz] |
---|---|---|
author | Charles Chan <rascov@gmail.com> | Thu Aug 30 19:49:23 2018 -0700 |
committer | Charles Chan <rascov@gmail.com> | Wed Sep 05 09:39:20 2018 -0700 |
tree | dcc85caf305e51a08476b9c1f669df5b97ceee73 | |
parent | c76685fde20c042e8ffe09ddf51719fa0a0c98d5 [diff] |
Pass metadata in the remove_from_existing operation, just like the add_to_existing case Change-Id: I398296bf6357ac7ee7ec4344c025604e1904ccc6
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 1ffd8e8..02f2b19 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 @@ */ 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