commit 328251fd70f9458a426c739021cb47a9eccc338f
author Praseed Balakrishnan <praseed.balakrishnan@us.fujitsu.com> Wed Oct 22 14:05:41 2014 -0700
committer Praseed Balakrishnan <praseed.balakrishnan@us.fujitsu.com> Wed Oct 22 14:05:41 2014 -0700
tree c4a55e52beb5ebb119b49216cbb510028d298757
parent 69d95be9e5c5b1374017caf1744120ebb554a12d
parent 38594c28b5b18d21e63785e3e27f404f3aff32c8

Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

Conflicts:
	apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java

apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java

diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java b/apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java
index b2e273f..6513ae7 100644
--- a/apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java
+++ b/apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java
@@ -58,7 +58,7 @@
 
     // TODO: fix hard coded file path later.
     private static final String DEFAULT_CONFIG_FILE =
-            "/opt/onos/config/demo-3-roadm-2-ps.json";
+            "config/demo-3-roadm-2-ps.json";
     private String configFileName = DEFAULT_CONFIG_FILE;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -83,7 +83,8 @@
     protected OpticalNetworkConfig opticalNetworkConfig;
 
     public OpticalConfigProvider() {
-        super(new ProviderId("optical", "org.onlab.onos.provider.opticalConfig", true));
+        super(new ProviderId("optical", "org.onlab.onos.provider" +
+                ".opticalConfig"));
     }
 
     @Activate

apps/optical/src/main/resources/demo-3-roadm-2-ps.json

diff --git a/apps/optical/src/main/resources/demo-3-roadm-2-ps.json b/apps/optical/src/main/resources/demo-3-roadm-2-ps.json
index 6f2c2f5..417afdc 100644
--- a/apps/optical/src/main/resources/demo-3-roadm-2-ps.json
+++ b/apps/optical/src/main/resources/demo-3-roadm-2-ps.json
@@ -47,7 +47,7 @@
                 "nodeName1": "ROADM1",
                 "nodeName2": "ROADM3",
                 "numWaves": 80,
-                "port1": 10,
+                "port1": 20,
                 "port2": 30
             },
             "type": "wdmLink"
@@ -63,7 +63,7 @@
                 "nodeName2": "ROADM2",
                 "numWaves": 80,
                 "port1": 31,
-                "port2": 20
+                "port2": 21
             },
             "type": "wdmLink"
        },
@@ -78,7 +78,7 @@
                 "nodeName2": "ROADM1",
                 "bandWidth": 100000,
                 "port1": 10,
-                "port2": 11
+                "port2": 10
             },
             "type": "pktOptLink"
         },
@@ -92,7 +92,7 @@
                 "nodeName2": "ROADM2",
                 "bandWidth": 100000,
                 "port1": 10,
-                "port2": 21
+                "port2": 11
             },
             "type": "pktOptLink"
         }