commit 6096acd0d631cb66b117fc0fa09b619dc496571a
author Michele Santuari <michele.santuari@create-net.org> Tue Feb 09 17:00:37 2016 +0100
committer Gerrit Code Review <gerrit@onlab.us> Wed Mar 23 21:45:51 2016 +0000
tree 6d495c89cbdbc91e0d0f7ff0cbdeebe0ae8d0865
parent b11c4d0ae98af7e587fa7d54851f7b2d0e145117

Add MPLS encapsulation behaviour ONOS-3467

- MPLS encapsulation using constraint
- New MPLS encapsulation test
- Fix VLAN encapsulation test

Change-Id: I94670bcd51a95a0272f786681e51d6785a56c4f5

core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PathIntentCompiler.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PathIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PathIntentCompiler.java
index 039a1f5..7222f0f 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PathIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PathIntentCompiler.java
@@ -15,10 +15,7 @@
  */
 package org.onosproject.net.intent.impl.compiler;
 
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
+import com.google.common.collect.ImmutableList;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -42,10 +39,13 @@
 import org.onosproject.net.resource.link.LinkResourceAllocations;
 import org.slf4j.Logger;
 
-import com.google.common.collect.ImmutableList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 
 import static org.slf4j.LoggerFactory.getLogger;
 
+
 @Component(immediate = true)
 public class PathIntentCompiler
         extends PathCompiler<FlowRule>
@@ -84,6 +84,7 @@
         List<DeviceId> devices = new LinkedList<>();
         compile(this, intent, rules, devices);
 
+
         return ImmutableList.of(new FlowRuleIntent(appId, null, rules, intent.resources()));
     }
 
@@ -97,12 +98,14 @@
         return resourceService;
     }
 
+
     @Override
     public void createFlow(TrafficSelector originalSelector, TrafficTreatment originalTreatment,
                            ConnectPoint ingress, ConnectPoint egress,
                            int priority, boolean applyTreatment,
                            List<FlowRule> rules,
                            List<DeviceId> devices) {
+
         TrafficSelector selector = DefaultTrafficSelector.builder(originalSelector)
                 .matchInPort(ingress.port())
                 .build();
@@ -123,5 +126,6 @@
                 .fromApp(appId)
                 .makePermanent()
                 .build());
+
     }
 }