Bug fix: generate different next objectives for port with multiple vlans
Cleaning up some logs.
Change-Id: I0db119fdbc36ccbd25a382d54d3f9f731f8be1ec
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
index 93dfd0c..aba822b 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
@@ -499,13 +499,13 @@
public int getPortNextObjectiveId(PortNumber portNum, TrafficTreatment treatment,
TrafficSelector meta) {
Integer nextId = portNextObjStore
- .get(new PortNextObjectiveStoreKey(deviceId, portNum, treatment));
+ .get(new PortNextObjectiveStoreKey(deviceId, portNum, treatment, meta));
if (nextId == null) {
- log.trace("getPortNextObjectiveId in device{}: Next objective id "
+ log.debug("getPortNextObjectiveId in device{}: Next objective id "
+ "not found for {} and {} creating", deviceId, portNum);
createGroupFromPort(portNum, treatment, meta);
nextId = portNextObjStore.get(
- new PortNextObjectiveStoreKey(deviceId, portNum, treatment));
+ new PortNextObjectiveStoreKey(deviceId, portNum, treatment, meta));
if (nextId == null) {
log.warn("getPortNextObjectiveId: unable to create next obj"
+ "for dev:{} port:{}", deviceId, portNum);
@@ -812,7 +812,7 @@
TrafficSelector meta) {
int nextId = flowObjectiveService.allocateNextId();
PortNextObjectiveStoreKey key = new PortNextObjectiveStoreKey(
- deviceId, portNum, treatment);
+ deviceId, portNum, treatment, meta);
NextObjective.Builder nextObjBuilder = DefaultNextObjective
.builder().withId(nextId)