Fixed learning optical links

@@ -58,7 +58,7 @@ public class OpticalConfigProvider extends AbstractProvider implements DevicePro
 
 
     // TODO: fix hard coded file path later.
     // TODO: fix hard coded file path later.
     private static final String DEFAULT_CONFIG_FILE =
     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;
     private String configFileName = DEFAULT_CONFIG_FILE;
 
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -83,7 +83,8 @@ public class OpticalConfigProvider extends AbstractProvider implements DevicePro
     protected OpticalNetworkConfig opticalNetworkConfig;
     protected OpticalNetworkConfig opticalNetworkConfig;
 
 
     public OpticalConfigProvider() {
     public OpticalConfigProvider() {
-        super(new ProviderId("of", "org.onlab.onos.provider.opticalConfig", true));
+        super(new ProviderId("optical", "org.onlab.onos.provider" +
+                ".opticalConfig"));
     }
     }
 
 
     @Activate
     @Activate
@@ -238,7 +239,7 @@ public class OpticalConfigProvider extends AbstractProvider implements DevicePro
         while (iterWdmNode.hasNext()) {
         while (iterWdmNode.hasNext()) {
             Roadm value = iterWdmNode.next();
             Roadm value = iterWdmNode.next();
             DeviceId did = deviceId("of:" + value.getNodeId().replace(":", ""));
             DeviceId did = deviceId("of:" + value.getNodeId().replace(":", ""));
-            ChassisId cid = new ChassisId(value.getNodeId());
+            ChassisId cid = new ChassisId();
             DefaultAnnotations extendedAttributes = DefaultAnnotations.builder()
             DefaultAnnotations extendedAttributes = DefaultAnnotations.builder()
                     .set(OPTICAL_ANNOTATION + "switchType", "ROADM")
                     .set(OPTICAL_ANNOTATION + "switchType", "ROADM")
                     .set(OPTICAL_ANNOTATION + "switchName", value.getName())
                     .set(OPTICAL_ANNOTATION + "switchName", value.getName())

@@ -47,7 +47,7 @@
                 "nodeName1": "ROADM1",
                 "nodeName1": "ROADM1",
                 "nodeName2": "ROADM3",
                 "nodeName2": "ROADM3",
                 "numWaves": 80,
                 "numWaves": 80,
-                "port1": 10,
+                "port1": 20,
                 "port2": 30
                 "port2": 30
             },
             },
             "type": "wdmLink"
             "type": "wdmLink"
@@ -63,7 +63,7 @@
                 "nodeName2": "ROADM2",
                 "nodeName2": "ROADM2",
                 "numWaves": 80,
                 "numWaves": 80,
                 "port1": 31,
                 "port1": 31,
-                "port2": 20
+                "port2": 21
             },
             },
             "type": "wdmLink"
             "type": "wdmLink"
        },
        },
@@ -78,7 +78,7 @@
                 "nodeName2": "ROADM1",
                 "nodeName2": "ROADM1",
                 "bandWidth": 100000,
                 "bandWidth": 100000,
                 "port1": 10,
                 "port1": 10,
-                "port2": 11
+                "port2": 10
             },
             },
             "type": "pktOptLink"
             "type": "pktOptLink"
         },
         },
@@ -92,7 +92,7 @@
                 "nodeName2": "ROADM2",
                 "nodeName2": "ROADM2",
                 "bandWidth": 100000,
                 "bandWidth": 100000,
                 "port1": 10,
                 "port1": 10,
-                "port2": 21
+                "port2": 11
             },
             },
             "type": "pktOptLink"
             "type": "pktOptLink"
         } 
         }