commit d13a37bf3c972defe0ab7eabe539c3430f1dc213
author Ray Milkey <ray@onlab.us> Fri Jun 12 11:55:17 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Jun 16 17:03:13 2015 +0000
tree 7b764ef57fb3dc9d7130ebd2b35e93094954242c
parent 93d944c2245255b1fbd31e1cead11430f9ad1e3d

Remove deprecated Flow Rule constructors

Change-Id: I2a078cbfbeb9db4a04ef1c59acde2fb45672a3cf

apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java

diff --git a/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java b/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
index 703ef44..cba1b302 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
@@ -127,11 +127,17 @@
         default:
         }
 
-        TrafficTreatment treatement = tbuilder.build();
+        TrafficTreatment treatment = tbuilder.build();
         TrafficSelector selector = sbuilder.build();
 
-        FlowRule f = new DefaultFlowRule(device.id(), selector,
-                treatement, 100, appId, 600, false);
+        FlowRule f = DefaultFlowRule.builder()
+                .forDevice(device.id())
+                .withSelector(selector)
+                .withTreatment(treatment)
+                .withPriority(100)
+                .fromApp(appId)
+                .makeTemporary(600)
+                .build();
 
         flowRuleService.applyFlowRules(f);
 

apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java

diff --git a/apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java b/apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java
index f64d982..c784c82 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java
@@ -130,8 +130,14 @@
         TrafficTreatment treatement = tbuilder.build();
         TrafficSelector selector = sbuilder.build();
 
-        FlowRule f = new DefaultFlowRule(device.id(), selector,
-                                         treatement, 100, appId, 600, false);
+        FlowRule f = DefaultFlowRule.builder()
+                .forDevice(device.id())
+                .withSelector(selector)
+                .withTreatment(treatement)
+                .withPriority(100)
+                .fromApp(appId)
+                .makeTemporary(600)
+                .build();
 
         flowRuleService.applyFlowRules(f);
     }