commit | 253c865d79a34ba7f25606f7e10143173a6313db | [log] [tgz] |
---|---|---|
author | weibit <weibit@gmail.com> | Thu Oct 23 16:30:03 2014 -0700 |
committer | weibit <weibit@gmail.com> | Thu Oct 23 16:31:29 2014 -0700 |
tree | 3a578f2ccda981969cb22a1f229e4b6e0d35288b | |
parent | 41c088a22d655aef2a959829a62b7e78710a78d8 [diff] [blame] |
some optical intent changes Change-Id: Ie9b02e2d199aa72f9828e91b248bd052f7b38fa2
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalConnectivityIntentCompiler.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalConnectivityIntentCompiler.java index f5272f2..58586dc 100644 --- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalConnectivityIntentCompiler.java +++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalConnectivityIntentCompiler.java
@@ -84,8 +84,8 @@ // create a new opticalPathIntent Intent newIntent = new OpticalPathIntent(intent.appId(), - path.src(), - path.dst(), + intent.getSrcConnectPoint(), + intent.getDst(), path); retList.add(newIntent); @@ -100,8 +100,11 @@ @Override public double weight(TopologyEdge edge) { boolean isOptical = false; - String t = edge.link().annotations().value("linkType"); - if (t.equals("WDM")) { + + Link.Type lt = edge.link().type(); + + //String t = edge.link().annotations().value("linkType"); + if (lt == Link.Type.OPTICAL) { isOptical = true; } if (isOptical) {