From 2be9bea97d8b51ba329d993287bba87ab503f20e Mon Sep 17 00:00:00 2001 From: alshabib Date: Mon, 24 Nov 2014 18:26:07 -0500 Subject: [PATCH] adding specified treatments when uninstalling intents Change-Id: I4a200a6df9fce048321846c6df9b9e79457f7dfd --- .../org/onlab/onos/net/intent/impl/PathIntentInstaller.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java index 0bfd6c378a..d655cbe281 100644 --- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java +++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java @@ -123,8 +123,9 @@ public class PathIntentInstaller implements IntentInstaller { while (links.hasNext()) { builder.matchInport(prev.port()); Link link = links.next(); - TrafficTreatment treatment = builder() - .setOutput(link.src().port()).build(); + TrafficTreatment treatment = // if this is the last flow rule, apply the intent's treatments + (links.hasNext() ? builder() : builder(intent.treatment())) + .setOutput(link.src().port()).build(); FlowRule rule = new DefaultFlowRule(link.src().deviceId(), builder.build(), treatment, 123, appId, (short) (intent.id().fingerprint() & 0xffff), 0, true);