commit ca94bcf5eacbe84242c7759e13b72cd09e289bcc
author Carmelo Cascone <carmelo@opennetworking.org> Fri Oct 27 14:16:59 2017 -0700
committer Carmelo Cascone <carmelo@opennetworking.org> Mon Oct 30 16:53:37 2017 +0000
tree ae33ab93cd107300ff4fb91c4173bb468efb0544
parent b211b87829f92ad0494fa1a6a176e00feed05b4b

ONOS-7058 Refactored default pipeconfs in new pipelines directory

- Minimal refactoring of P4 programs
- Removed symlinks to BMv2 JSON/P4Info
- Bumped p4c commit (which fixes known parser bug)
- Renamed "default" pipeconf to "basic" (ONOS-6818)

Change-Id: I319f8b142ab22dba9b15457e28cd62d17f78a423

core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java b/core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java
index 1982d7f..2630cdd 100644
--- a/core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java
@@ -23,10 +23,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.onlab.util.ItemNotFoundException;
-import org.onosproject.bmv2.model.Bmv2PipelineModelParser;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.behaviour.Pipeliner;
-import org.onosproject.net.behaviour.PipelinerAdapter;
 import org.onosproject.net.config.Config;
 import org.onosproject.net.config.ConfigApplyDelegate;
 import org.onosproject.net.config.ConfigFactory;
@@ -46,22 +44,23 @@
 import org.onosproject.net.driver.DriverProvider;
 import org.onosproject.net.driver.DriverService;
 import org.onosproject.net.driver.DriverServiceAdapter;
-import org.onosproject.net.pi.model.DefaultPiPipeconf;
 import org.onosproject.net.pi.model.PiPipeconf;
 import org.onosproject.net.pi.model.PiPipeconfId;
 import org.onosproject.net.pi.model.PiPipelineInterpreter;
 import org.onosproject.net.pi.runtime.PiPipeconfConfig;
+import org.onosproject.pipelines.basic.PipeconfLoader;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 
 /**
@@ -69,11 +68,6 @@
  */
 public class PiPipeconfManagerTest {
 
-    private static final String PIPECONF_ID = "org.project.pipeconf.default";
-    private static final String BMV2_JSON_PATH = "/org/onosproject/net/pi/impl/default.json";
-
-    private final URL bmv2JsonConfigUrl = this.getClass().getResource(BMV2_JSON_PATH);
-
     private static final DeviceId DEVICE_ID = DeviceId.deviceId("test:test");
     private static final String BASE_DRIVER = "baseDriver";
     private static final Set<Class<? extends Behaviour>> EXPECTED_BEHAVIOURS =
@@ -105,11 +99,7 @@
     @Before
     public void setUp() throws IOException {
         piPipeconfService = new PiPipeconfManager();
-        piPipeconf = DefaultPiPipeconf.builder()
-                .withId(new PiPipeconfId(PIPECONF_ID))
-                .withPipelineModel(Bmv2PipelineModelParser.parse(bmv2JsonConfigUrl))
-                .addBehaviour(Pipeliner.class, PipelinerAdapter.class)
-                .build();
+        piPipeconf = PipeconfLoader.BASIC_PIPECONF;
         completeDriverName = BASE_DRIVER + ":" + piPipeconf.id();
         piPipeconfService.cfgService = cfgService;
         piPipeconfService.driverService = driverService;