packet-intent fail event will trigger the creation of lightpaths
Change-Id: I54b3b039dee3350eaa0f3b4c7d3f0131966ea6bc
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 6d46807..ca7636e 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 =
- "config/demo-3-roadm-2-ps.json";
+ "/opt/onos/config/demo-3-roadm-2-ps.json";
private String configFileName = DEFAULT_CONFIG_FILE;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/provisioner/OpticalPathProvisioner.java b/apps/optical/src/main/java/org/onlab/onos/optical/provisioner/OpticalPathProvisioner.java
index 9f77cfd..74a5f08 100644
--- a/apps/optical/src/main/java/org/onlab/onos/optical/provisioner/OpticalPathProvisioner.java
+++ b/apps/optical/src/main/java/org/onlab/onos/optical/provisioner/OpticalPathProvisioner.java
@@ -96,7 +96,7 @@
case INSTALLED:
break;
case FAILED:
- log.info("intent {} failed, calling optical path provisioning APP.", event.subject());
+ log.info("packet intent {} failed, calling optical path provisioning APP.", event.subject());
setuplightpath(event.subject());
break;
case WITHDRAWN:
@@ -109,8 +109,8 @@
}
private void setuplightpath(Intent intent) {
- // TODO: considering user policies and optical reach
- if (!intent.equals(PointToPointIntent.class)) {
+ // TODO support more packet intent types
+ if (!intent.getClass().equals(PointToPointIntent.class)) {
return;
}
@@ -124,15 +124,10 @@
LinkWeight weight = new LinkWeight() {
@Override
public double weight(TopologyEdge edge) {
- boolean isOptical = false;
- String t = edge.link().annotations().value("linkType");
- if (t.equals("WDM")) {
- isOptical = true;
- }
- if (isOptical) {
- return 1000; // optical links
+ if (isOpticalLink(edge.link())) {
+ return 1000.0; // optical links
} else {
- return 10; // packet links
+ return 1.0; // packet links
}
}
};
@@ -165,14 +160,12 @@
}
while (true) {
-
if (itrLink.hasNext()) {
Link link2 = itrLink.next();
dstWdmPoint = link2.src();
} else {
break;
}
-
if (itrLink.hasNext()) {
Link link3 = itrLink.next();
if (!isOpticalLink(link3)) {
@@ -210,9 +203,9 @@
private boolean isOpticalLink(Link link) {
boolean isOptical = false;
- String t = link.annotations().value("linkType");
- if (t.equals("WDM") || t.equals("PktOptLink")) {
- isOptical = true;
+ Link.Type lt = link.type();
+ if (lt == Link.Type.OPTICAL) {
+ isOptical = true;
}
return isOptical;
}