Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AETHER-514] Fix the previous patch (PR #100) #114

Merged
merged 2 commits into from
Oct 22, 2020
Merged

[AETHER-514] Fix the previous patch (PR #100) #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98dd9c5
[AETHER-514] Fix the previous patch (PR #100)
pierventre Oct 19, 2020
a19bc2c
Updates ONOS deps and re-add "fail" instruction that was wrongly remo…
pierventre Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SPDX-License-Identifier: Apache-2.0
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
<version>2.2.6</version>
<version>2.2.7-b2</version>
</parent>

<groupId>org.stratumproject</groupId>
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/stratumproject/fabric/tna/behaviour/pipeliner/FabricPipeliner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ public void next(NextObjective obj) {
if (log.isTraceEnabled()) {
log.trace("Objective {}", obj);
}
fail(obj, ObjectiveError.UNSUPPORTED);
return;
}

Expand Down Expand Up @@ -253,6 +254,7 @@ private void processGroups(Objective objective, Collection<GroupDescription> gro
groups.forEach(group -> groupService.setBucketsForGroup(
deviceId, group.appCookie(), group.buckets(),
group.appCookie(), group.appId()));
break;
case REMOVE_FROM_EXISTING:
groups.forEach(group -> groupService.removeBucketsFromGroup(
deviceId, group.appCookie(), group.buckets(),
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/stratumproject/fabric/tna/behaviour/pipeliner/NextObjectiveTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,10 +484,12 @@ private TrafficTreatment getFirstDefaultNextTreatmentIfAny(
}

private boolean isGroupModifyOp(NextObjective obj) {
// If operation is ADD_TO_EXIST or REMOVE_FROM_EXIST, it means we modify
// If operation is ADD_TO_EXIST, REMOVE_FROM_EXIST or MODIFY, it means we modify
// group buckets only, no changes for flow rules.
// FIXME Please note that for MODIFY op this could not apply in future if we extend the scope of MODIFY
return obj.op() == Objective.Operation.ADD_TO_EXISTING ||
obj.op() == Objective.Operation.REMOVE_FROM_EXISTING;
obj.op() == Objective.Operation.REMOVE_FROM_EXISTING ||
obj.op() == Objective.Operation.MODIFY;
}

private boolean isXconnect(NextObjective obj) {
Expand Down