commit 1fb27d39eb3274191394584c343e3b5e4019fa93
author Carmelo Cascone <carmelo@opennetworking.org> Fri Aug 25 20:40:20 2017 +0200
committer Carmelo Cascone <carmelo@opennetworking.org> Tue Aug 29 18:01:05 2017 +0200
tree 3147e248ab70f1e6f08a4997da7dd1debd64b3d2
parent 19090320e75a09eeba9add81aa29af5153acc181

Modified PI-ECMP demo app to work with 2x2 clos topology

Also minor fix to general device provider.

Change-Id: Ia2c76a55d5e28d2be8edb75ee3c34ada557ada12

apps/pi-demo/ecmp/src/main/java/org/onosproject/pi/demo/app/ecmp/EcmpFabricApp.java

diff --git a/apps/pi-demo/ecmp/src/main/java/org/onosproject/pi/demo/app/ecmp/EcmpFabricApp.java b/apps/pi-demo/ecmp/src/main/java/org/onosproject/pi/demo/app/ecmp/EcmpFabricApp.java
index 1817997..3aabca8 100644
--- a/apps/pi-demo/ecmp/src/main/java/org/onosproject/pi/demo/app/ecmp/EcmpFabricApp.java
+++ b/apps/pi-demo/ecmp/src/main/java/org/onosproject/pi/demo/app/ecmp/EcmpFabricApp.java
@@ -73,8 +73,7 @@
 public class EcmpFabricApp extends AbstractUpgradableFabricApp {
 
     private static final String APP_NAME = "org.onosproject.pi-ecmp-fabric";
-    private static final String MODEL_NAME = "ECMP";
-    private static final String PIPECONF_ID = "org.project.pipeconf.ecmp";
+    private static final String PIPECONF_ID = "pi-demo-ecmp";
     private static final URL P4INFO_URL = EcmpFabricApp.class.getResource("/ecmp.p4info");
     private static final URL JSON_URL = EcmpFabricApp.class.getResource("/ecmp.json");
 
@@ -90,7 +89,7 @@
     private static final Map<DeviceId, Map<Set<PortNumber>, Short>> DEVICE_GROUP_ID_MAP = Maps.newHashMap();
 
     public EcmpFabricApp() {
-        super(APP_NAME, MODEL_NAME, ECMP_PIPECONF);
+        super(APP_NAME, ECMP_PIPECONF);
     }
 
     @Override