commit bd7f4b389cffd201dccb8f08901334d78ab5b678
author Thomas Vachuska <tom@onlab.us> Thu Dec 04 20:54:55 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Dec 05 05:05:46 2014 +0000
tree 31493401d7093e484ba6fdcb5f9539974ff7b8f6
parent ab98466b10d5df036d492b50296db4886bca5e7f

Adding parametrization of the reactive forwarding app.

Change-Id: Ib54bd080f17ab8f755035ea3642bd385d9b5c35d

apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java

diff --git a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
index 0678ccf..2178247 100644
--- a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
+++ b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
@@ -80,9 +80,9 @@
 
     private ApplicationId appId;
 
-    @Property(name = "enabled", boolValue = true,
-              label = "Enable forwarding; default is true")
-    private boolean isEnabled = true;
+    @Property(name = "packetOutOnly", boolValue = false,
+            label = "Enable packet-out only forwarding; default is false")
+    private boolean packetOutOnly = false;
 
     @Activate
     public void activate() {
@@ -102,16 +102,13 @@
     @Modified
     public void modified(ComponentContext context) {
         Dictionary properties = context.getProperties();
-        String flag = (String) properties.get("enabled");
+        String flag = (String) properties.get("packetOutOnly");
         if (flag != null) {
             boolean enabled = flag.equals("true");
-            if (isEnabled != enabled) {
-                isEnabled = enabled;
-                if (!isEnabled) {
-                    flowRuleService.removeFlowRulesById(appId);
-                }
-                log.info("Reconfigured. Forwarding is {}",
-                         isEnabled ? "enabled" : "disabled");
+            if (packetOutOnly != enabled) {
+                packetOutOnly = enabled;
+                log.info("Reconfigured. Packet-out only forwarding is {}",
+                         packetOutOnly ? "enabled" : "disabled");
             }
         }
     }
@@ -125,7 +122,7 @@
         public void process(PacketContext context) {
             // Stop processing if the packet has been handled, since we
             // can't do any more to it.
-            if (!isEnabled || context.isHandled()) {
+            if (context.isHandled()) {
                 return;
             }
 
@@ -230,22 +227,23 @@
     private void installRule(PacketContext context, PortNumber portNumber) {
         // We don't yet support bufferids in the flowservice so packet out first.
         packetOut(context, portNumber);
+        if (!packetOutOnly) {
+            // Install the flow rule to handle this type of message from now on.
+            Ethernet inPkt = context.inPacket().parsed();
+            TrafficSelector.Builder builder = DefaultTrafficSelector.builder();
+            builder.matchEthType(inPkt.getEtherType())
+                    .matchEthSrc(inPkt.getSourceMAC())
+                    .matchEthDst(inPkt.getDestinationMAC())
+                    .matchInport(context.inPacket().receivedFrom().port());
 
-        // Install the flow rule to handle this type of message from now on.
-        Ethernet inPkt = context.inPacket().parsed();
-        TrafficSelector.Builder builder = DefaultTrafficSelector.builder();
-        builder.matchEthType(inPkt.getEtherType())
-                .matchEthSrc(inPkt.getSourceMAC())
-                .matchEthDst(inPkt.getDestinationMAC())
-                .matchInport(context.inPacket().receivedFrom().port());
+            TrafficTreatment.Builder treat = DefaultTrafficTreatment.builder();
+            treat.setOutput(portNumber);
 
-        TrafficTreatment.Builder treat = DefaultTrafficTreatment.builder();
-        treat.setOutput(portNumber);
+            FlowRule f = new DefaultFlowRule(context.inPacket().receivedFrom().deviceId(),
+                                             builder.build(), treat.build(), PRIORITY, appId, TIMEOUT, false);
 
-        FlowRule f = new DefaultFlowRule(context.inPacket().receivedFrom().deviceId(),
-                                         builder.build(), treat.build(), PRIORITY, appId, TIMEOUT, false);
-
-        flowRuleService.applyFlowRules(f);
+            flowRuleService.applyFlowRules(f);
+        }
     }
 
 }