commit 47f09c567436d374378d786898391d621333f85e
author Ray Milkey <ray@opennetworking.org> Fri Feb 08 18:51:34 2019 -0800
committer Thomas Vachuska <tom@opennetworking.org> Wed Feb 13 23:17:40 2019 +0000
tree 3aac29728b47a9e5afa34c12833fa50c5bf4b4a9
parent f672231654a4a775662137e8d3a297192f856f5e

Remove deprecated FlowRuleExtPayLoad API

Change-Id: Id20e1e296670f8cc94b23c3fd2272a1c2de3990e

apps/flowanalyzer/src/test/java/org/onosproject/flowanalyzer/FlowAnalyzerTest.java

diff --git a/apps/flowanalyzer/src/test/java/org/onosproject/flowanalyzer/FlowAnalyzerTest.java b/apps/flowanalyzer/src/test/java/org/onosproject/flowanalyzer/FlowAnalyzerTest.java
index 0d725e9..804a27c 100644
--- a/apps/flowanalyzer/src/test/java/org/onosproject/flowanalyzer/FlowAnalyzerTest.java
+++ b/apps/flowanalyzer/src/test/java/org/onosproject/flowanalyzer/FlowAnalyzerTest.java
@@ -25,7 +25,6 @@
 import org.onosproject.net.flow.DefaultTrafficSelector;
 import org.onosproject.net.flow.DefaultTrafficTreatment;
 import org.onosproject.net.flow.FlowRule;
-import org.onosproject.net.flow.FlowRuleExtPayLoad;
 import org.onosproject.net.flow.FlowRuleService;
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
@@ -105,16 +104,30 @@
         TrafficSelector ts = DefaultTrafficSelector.builder().matchInPort(PortNumber.portNumber(inPort)).build();
         TrafficTreatment tt = DefaultTrafficTreatment.builder()
                 .add(Instructions.createOutput(PortNumber.portNumber(outPort))).build();
-        return new DefaultFlowRule(device, ts, tt, 1, new DefaultApplicationId(5000, "of"),
-                                   50000, true, FlowRuleExtPayLoad.flowRuleExtPayLoad(new byte[5]));
+        return DefaultFlowRule.builder()
+            .forDevice(device)
+            .withSelector(ts)
+            .withTreatment(tt)
+            .withPriority(1)
+            .fromApp(new DefaultApplicationId(5000, "of"))
+            .withHardTimeout(50000)
+            .makePermanent()
+            .build();
     }
     public FlowRule genFlow(String d, long outPort) {
         DeviceId device = DeviceId.deviceId(d);
         TrafficSelector ts = DefaultTrafficSelector.builder().build();
         TrafficTreatment tt = DefaultTrafficTreatment.builder()
                 .add(Instructions.createOutput(PortNumber.portNumber(outPort))).build();
-        return new DefaultFlowRule(device, ts, tt, 1, new DefaultApplicationId(5000, "of"),
-                                   50000, true, FlowRuleExtPayLoad.flowRuleExtPayLoad(new byte[5]));
+        return DefaultFlowRule.builder()
+            .forDevice(device)
+            .withSelector(ts)
+            .withTreatment(tt)
+            .withPriority(1)
+            .fromApp(new DefaultApplicationId(5000, "of"))
+            .withHardTimeout(50000)
+            .makePermanent()
+            .build();
     }
 
 }