Enabling vlan in flow spec in backend

Change-Id: Idfc779b7f0b6b583b96566b1b0aeb321feb394d1
Signed-off-by: Alessandro Boch <aboch@cisco.com>

diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowConfig.java b/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowConfig.java
index c9b5dab8080f36d96a301db894845abafa1ca028..baa2c782538255b6da9dfff772d10406e9eabf47 100644 (file)
--- a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowConfig.java
+++ b/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowConfig.java
@@ -707,6 +707,9 @@ public class ContainerFlowConfig implements Serializable {
         List<Match> matches = new ArrayList<Match>();
         Match match = new Match();
 
+        if (this.dlVlan != null && !this.dlVlan.isEmpty()) {
+            match.setField(MatchType.DL_VLAN, this.getVlanId());
+        }
         if (this.nwSrc != null && !this.nwSrc.trim().isEmpty()) {
             String parts[] = this.nwSrc.split("/");
             InetAddress ip = NetUtils.parseInetAddress(parts[0]);
@@ -760,7 +763,7 @@ public class ContainerFlowConfig implements Serializable {
      */
     @Override
     public String toString() {
-        return "Container Flow={name:" + name + " nwSrc:" + nwSrc + " nwDst:" + nwDst + " " + "protocol:" + protocol
+        return "Container Flow={name:" + name + " dlVlan:" + dlVlan + " nwSrc:" + nwSrc + " nwDst:" + nwDst + " " + "protocol:" + protocol
                 + " tpSrc:" + tpSrc + " tpDst:" + tpDst + "}";
     }
 }