commit feb95f16329e3729be7aec1a0c898670d0b3c929
author Yoonseon Han <yoonseon@onlab.us> Wed Aug 24 16:37:46 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Aug 29 19:19:13 2016 +0000
tree 6ae07c7ee0209582e499dae98ff1bc582103ba84
parent c218bfaa7c8b2d25d620e9ee92839528748bd778

Just a copy from FlowObjectiveAdapter of org.onosproject.sfc.util.
Now, FlowObjectiveAdapter is not exposed to external applications.
So, each App developer has to define own FlowObjectiveService in their test code.

I removed the previous copy in sfc package.
FlowObjectiveAdaptor is renamed into FlowObjectiveServiceAdaptor

Change-Id: I25545669eea3a73deebaf2a6f2c46e2ff2890b34

apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/installer/impl/SfcFlowRuleInstallerImplTest.java

diff --git a/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/installer/impl/SfcFlowRuleInstallerImplTest.java b/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/installer/impl/SfcFlowRuleInstallerImplTest.java
index 61ad4e8..5d60870 100644
--- a/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/installer/impl/SfcFlowRuleInstallerImplTest.java
+++ b/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/installer/impl/SfcFlowRuleInstallerImplTest.java
@@ -58,13 +58,13 @@
 import org.onosproject.net.flow.criteria.PortCriterion;
 import org.onosproject.net.flow.instructions.Instruction;
 import org.onosproject.net.flow.instructions.Instructions.OutputInstruction;
+import org.onosproject.net.flowobjective.FlowObjectiveServiceAdapter;
 import org.onosproject.net.flowobjective.FlowObjectiveService;
 import org.onosproject.net.flowobjective.ForwardingObjective;
 import org.onosproject.net.host.HostService;
 import org.onosproject.net.host.HostServiceAdapter;
 import org.onosproject.net.provider.ProviderId;
 import org.onosproject.sfc.util.FlowClassifierAdapter;
-import org.onosproject.sfc.util.FlowObjectiveAdapter;
 import org.onosproject.sfc.util.MockDriverHandler;
 import org.onosproject.sfc.util.PortPairAdapter;
 import org.onosproject.sfc.util.PortPairGroupAdapter;
@@ -113,7 +113,7 @@
 
 public class SfcFlowRuleInstallerImplTest {
 
-    FlowObjectiveService flowObjectiveService = new FlowObjectiveAdapter();
+    FlowObjectiveService flowObjectiveService = new FlowObjectiveServiceAdapter();
     DeviceService deviceService = new DeviceServiceAdapter(createPortList());
 
     HostService hostService = new HostServiceAdapter();
@@ -401,7 +401,7 @@
 
         flowRuleInstaller.installLoadBalancedFlowRules(portChain, fiveTuple, nshSpiId);
 
-        ForwardingObjective forObj = ((FlowObjectiveAdapter) flowObjectiveService).forwardingObjective();
+        ForwardingObjective forObj = ((FlowObjectiveServiceAdapter) flowObjectiveService).forwardingObjective();
 
         // Check for Selector
         assertThat(forObj.selector().getCriterion(Criterion.Type.IN_PORT), instanceOf(PortCriterion.class));