commit 50eb95beae37a1fcf307038e711962476289f393
author weibit <weibit@gmail.com> Sat Oct 25 21:47:54 2014 -0700
committer weibit <weibit@gmail.com> Sat Oct 25 21:47:54 2014 -0700
tree 3b2d60bdbd03cadf0f25dda4b89712da31bab809
parent 8e6dba2982d548e47062de7b4cf6563b209b1d19

packet-intent fail event will trigger the creation of lightpaths

Change-Id: I54b3b039dee3350eaa0f3b4c7d3f0131966ea6bc

apps/optical/src/main/java/org/onlab/onos/optical/provisioner/OpticalPathProvisioner.java

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;
           }