commit 81c47bfe1c7cb6f8b9fe767a1a2c116b855b4de2
author Pier Ventre <pierventre@hotmail.com> Fri Nov 04 07:26:22 2016 -0700
committer Brian O'Connor <bocon@onlab.us> Fri Nov 18 03:21:39 2016 +0000
tree 922f56586d7274a5fd40056509e677a32eddb06b
parent 766995d7ff1a3b66e5c1155c90ea4c7e38a5daae

Fixes [ONOS-5415] and [ONOS-5491]

Changes:
- Introduces ordering between core ports and egress ports;
- Introduces ordering between egress ports;
- Introduces ttl_in and tll_out in the link collection compiler logic;
- Optimized push/pop mpls/vlan actions;
- Optimizes dec ttl related actions;
- Optimizes ttl_in and ttl_out actions;
- Makes the optimizations configurable;

Change-Id: I60f187031e89c366ec9c79d1652a5fb0da96c206

core/net/src/test/java/org/onosproject/net/intent/impl/compiler/LinkCollectionEncapIntentCompilerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/LinkCollectionEncapIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/LinkCollectionEncapIntentCompilerTest.java
index 588880a..295a998 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/LinkCollectionEncapIntentCompilerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/LinkCollectionEncapIntentCompilerTest.java
@@ -82,6 +82,9 @@
         sut.registrator = registrator;
         sut.resourceService = new MockResourceService();
 
+        LinkCollectionCompiler.optimize = false;
+        LinkCollectionCompiler.copyTtl = false;
+
         replay(coreService, intentExtensionService);
     }
 
@@ -290,7 +293,7 @@
                 DefaultTrafficTreatment
                         .builder()
                         .pushMpls()
-                        .setMpls(MplsLabel.mplsLabel((LABEL)))
+                        .setMpls(MplsLabel.mplsLabel(LABEL))
                         .setOutput(d3p0.port())
                         .build()
         ));