Merge "Bug 1072 -Add OF13 pre-req for PCP match in TestCommandProvider"

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java
index d5a9708348eacf9ca28881ff6b7efa505b1d60db..d610e65996c5af8cab6562158c325ae92c162701 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java
@@ -648,7 +648,7 @@ public class OpenflowpluginTestCommandProvider implements CommandProvider {
             break;
         case "f80":
             id += 80;
-            flow.setMatch(createMatch1().build());
+            flow.setMatch(createVlanMatch().build());
             flow.setInstructions(createAppyActionInstruction88().build());
             break;
         case "f81":
@@ -666,6 +666,11 @@ public class OpenflowpluginTestCommandProvider implements CommandProvider {
             flow.setMatch(createTcpFlagMatch().build());
             flow.setInstructions(createDropInstructions().build());
             break;
+        case "f84":
+            id += 84;
+            flow.setMatch(createVlanMatch().build()); // match vlan=10,dl_vlan_pcp=3
+            flow.setInstructions(createAppyActionInstruction88().build()); // vlan_pcp=4
+            break;
         default:
             LOG.warn("flow type not understood: {}", flowType);
         }