commit 42507350182d47e08057fd9d9646e412904425e8
author Ray Milkey <ray@onlab.us> Fri Mar 20 15:16:10 2015 -0700
committer Ray Milkey <ray@onlab.us> Tue Mar 24 18:18:28 2015 +0000
tree 2d3c5c48eba06504d90c71f14ad129a3dce43fb3
parent f845cf6cfdadb36071c219b0cbda38d12dcfdc1c

Remove deprecated instructions() method in the traffic treatment class

Change-Id: I739b35bdcbf9867c639c7b6ca4006f3eeafbb055

core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
index 881961f..6669578 100644
--- a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
@@ -557,11 +557,6 @@
         }
 
         @Override
-        public List<Instruction> instructions() {
-            return null;
-        }
-
-        @Override
         public List<Instruction> deferred() {
             return null;
         }

core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java b/core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java
index 03276941..e8fccde 100644
--- a/core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java
+++ b/core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java
@@ -156,8 +156,8 @@
         OutboundPacket packet = packetService.packets.get(0);
 
         // Check the output port is correct
-        assertEquals(1, packet.treatment().instructions().size());
-        Instruction instruction = packet.treatment().instructions().get(0);
+        assertEquals(1, packet.treatment().immediate().size());
+        Instruction instruction = packet.treatment().immediate().get(0);
         assertTrue(instruction instanceof OutputInstruction);
         OutputInstruction oi = (OutputInstruction) instruction;
         assertEquals(portNum, oi.port());
@@ -225,8 +225,8 @@
         OutboundPacket packet = packetService.packets.get(0);
 
         // Check the output port is correct
-        assertEquals(1, packet.treatment().instructions().size());
-        Instruction instruction = packet.treatment().instructions().get(0);
+        assertEquals(1, packet.treatment().immediate().size());
+        Instruction instruction = packet.treatment().immediate().get(0);
         assertTrue(instruction instanceof OutputInstruction);
         OutputInstruction oi = (OutputInstruction) instruction;
         assertEquals(portNum, oi.port());

core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java b/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
index 09f4f14..5a4eb8b 100644
--- a/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
@@ -503,9 +503,9 @@
     private void verifyPacketOut(Ethernet expected, ConnectPoint outPort,
             OutboundPacket actual) {
         assertArrayEquals(expected.serialize(), actual.data().array());
-        assertEquals(1, actual.treatment().instructions().size());
+        assertEquals(1, actual.treatment().immediate().size());
         assertEquals(outPort.deviceId(), actual.sendThrough());
-        Instruction instruction = actual.treatment().instructions().get(0);
+        Instruction instruction = actual.treatment().immediate().get(0);
         assertTrue(instruction instanceof OutputInstruction);
         assertEquals(outPort.port(), ((OutputInstruction) instruction).port());
     }