Fixed learning optical links
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 86c1c0b..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("of", "org.onlab.onos.provider.opticalConfig", true));
+ super(new ProviderId("optical", "org.onlab.onos.provider" +
+ ".opticalConfig"));
}
@Activate
@@ -238,7 +239,7 @@
while (iterWdmNode.hasNext()) {
Roadm value = iterWdmNode.next();
DeviceId did = deviceId("of:" + value.getNodeId().replace(":", ""));
- ChassisId cid = new ChassisId(value.getNodeId());
+ ChassisId cid = new ChassisId();
DefaultAnnotations extendedAttributes = DefaultAnnotations.builder()
.set(OPTICAL_ANNOTATION + "switchType", "ROADM")
.set(OPTICAL_ANNOTATION + "switchName", value.getName())
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"
}