commit | e4b2c681011ac26bb59eee4dff57aa28926e8342 | [log] [tgz] |
---|---|---|
author | Andrea Campanella <andrea@opennetworking.org> | Fri Aug 23 15:42:55 2019 +0200 |
committer | Andrea Campanella <andrea@opennetworking.org> | Wed Aug 28 22:57:26 2019 +0000 |
tree | 8e8b7e61f56403aabd9553e0169455cfbcd30d27 | |
parent | 1edc0bd3fdc82d26da619c8ba6cb4c90d57d87f0 [diff] [blame] |
Optical Intent compiler fix and ADVA OLS testing derived adjustments Change-Id: I986431b751e3ba060cf81f357938b34f3a68f5aa
diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/intent/impl/compiler/OpticalConnectivityIntentCompiler.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/intent/impl/compiler/OpticalConnectivityIntentCompiler.java index 2fced48..58c9d49 100644 --- a/apps/optical-model/src/main/java/org/onosproject/net/optical/intent/impl/compiler/OpticalConnectivityIntentCompiler.java +++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/intent/impl/compiler/OpticalConnectivityIntentCompiler.java
@@ -306,7 +306,10 @@ // Sort available lambdas List<OchSignal> lambdaList = new ArrayList<>(lambdas); lambdaList.sort(new DefaultOchSignalComparator()); - + //Means there is only exactly one set of lambdas available + if (lambdaList.size() == count) { + return lambdaList; + } // Look ahead by count and ensure spacing multiplier is as expected (i.e., no gaps) for (int i = 0; i < lambdaList.size() - count; i++) { if (lambdaList.get(i).spacingMultiplier() + 2 * count ==