Code Review / openflowplugin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Fixed (de)serialization issue
[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / ActionConvertorV13Test.java
diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertorV13Test.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertorV13Test.java
index 500861902ab022125125a3578fa9e3e1b6156cff..0b3379f9f44b2150190e464512791a6613add584 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertorV13Test.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertorV13Test.java
@@ -131,7 +131,7 @@ public class ActionConvertorV13Test {
     public void testToMDSalActions2() {\r
         OpenflowPortsUtil.init();\r
         List<Action> actions = new ArrayList<>();\r
-        \r
+\r
         ActionBuilder actionBuilder = new ActionBuilder();\r
         OutputActionCaseBuilder caseBuilder = new OutputActionCaseBuilder();\r
         OutputActionBuilder outputBuilder = new OutputActionBuilder();\r
@@ -168,11 +168,11 @@ public class ActionConvertorV13Test {
         pushVlanCaseBuilder.setPushVlanAction(pushVlanBuilder.build());\r
         actionBuilder.setActionChoice(pushVlanCaseBuilder.build());\r
         actions.add(actionBuilder.build());\r
-        \r
+\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setActionChoice(new PopVlanCaseBuilder().build());\r
         actions.add(actionBuilder.build());\r
-        \r
+\r
         actionBuilder = new ActionBuilder();\r
         PushMplsCaseBuilder pushMplsCaseBuilder = new PushMplsCaseBuilder();\r
         PushMplsActionBuilder pushMplsBuilder = new PushMplsActionBuilder();\r
@@ -478,7 +478,7 @@ public class ActionConvertorV13Test {
         checkEntryHeader(entry, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanPcp.class, false);\r
         Assert.assertEquals("Wrong vlan pcp", 7, ((VlanPcpCase) entry.getMatchEntryValue()).getVlanPcp().getVlanPcp()\r
                 .intValue());\r
-        \r
+\r
         action = actions.get(1);\r
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"\r
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase", action.getActionChoice().getImplementedInterface().getName());\r
@@ -489,27 +489,27 @@ public class ActionConvertorV13Test {
         Assert.assertEquals("Wrong vlan vid", 0, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getVlanVid()\r
                 .intValue());\r
         Assert.assertEquals("Wrong cfi bit", true, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().isCfiBit());\r
-        \r
+\r
         action = actions.get(2);\r
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"\r
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase", action.getActionChoice().getImplementedInterface().getName());\r
         setFieldCase =\r
                 (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase) action.getActionChoice();\r
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);\r
-        checkEntryHeader(entry, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthDst.class, true);\r
+        checkEntryHeader(entry, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthDst.class, false);\r
         Assert.assertEquals("Wrong dl dst", "00:00:00:00:00:06", ((EthDstCase) entry.getMatchEntryValue()).getEthDst()\r
                 .getMacAddress().getValue());\r
-        \r
+\r
         action = actions.get(3);\r
         setFieldCase =\r
                 (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase) action.getActionChoice();\r
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"\r
                 + ".action.rev150203.action.grouping.action.choice.SetFieldCase", action.getActionChoice().getImplementedInterface().getName());\r
         entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);\r
-        checkEntryHeader(entry, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthSrc.class, true);\r
+        checkEntryHeader(entry, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthSrc.class, false);\r
         Assert.assertEquals("Wrong dl src", "00:00:00:00:00:05", ((EthSrcCase) entry.getMatchEntryValue()).getEthSrc()\r
                 .getMacAddress().getValue());\r
-        \r
+\r
         action = actions.get(4);\r
         setFieldCase =\r
                 (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase) action.getActionChoice();\r
@@ -519,7 +519,7 @@ public class ActionConvertorV13Test {
         checkEntryHeader(entry, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Src.class, false);\r
         Assert.assertEquals("Wrong ipv4 src", "10.0.0.1", ((Ipv4SrcCase) entry.getMatchEntryValue()).getIpv4Src()\r
                 .getIpv4Address().getValue());\r
-        \r
+\r
         action = actions.get(5);\r
         setFieldCase =\r
                 (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase) action.getActionChoice();\r
@@ -529,7 +529,7 @@ public class ActionConvertorV13Test {
         checkEntryHeader(entry, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Dst.class, false);\r
         Assert.assertEquals("Wrong ipv4 dst", "10.0.0.2", ((Ipv4DstCase) entry.getMatchEntryValue()).getIpv4Dst()\r
                 .getIpv4Address().getValue());\r
-        \r
+\r
         action = actions.get(6);\r
         setFieldCase =\r
                 (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase) action.getActionChoice();\r
@@ -539,7 +539,7 @@ public class ActionConvertorV13Test {
         checkEntryHeader(entry, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpSrc.class, false);\r
         Assert.assertEquals("Wrong tcp src", 54, ((TcpSrcCase) entry.getMatchEntryValue()).getTcpSrc()\r
                 .getPort().getValue().intValue());\r
-        \r
+\r
         action = actions.get(7);\r
         setFieldCase =\r
                 (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase) action.getActionChoice();\r
@@ -549,7 +549,7 @@ public class ActionConvertorV13Test {
         checkEntryHeader(entry, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpDst.class, false);\r
         Assert.assertEquals("Wrong tcp dst", 45, ((TcpDstCase) entry.getMatchEntryValue()).getTcpDst()\r
                 .getPort().getValue().intValue());\r
-        \r
+\r
         action = actions.get(8);\r
         setFieldCase =\r
                 (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase) action.getActionChoice();\r
@@ -559,7 +559,7 @@ public class ActionConvertorV13Test {
         checkEntryHeader(entry, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.IpDscp.class, false);\r
         Assert.assertEquals("Wrong ip dscp", 4, ((IpDscpCase) entry.getMatchEntryValue()).getIpDscp()\r
                 .getDscp().getValue().intValue());\r
-        \r
+\r
         action = actions.get(9);\r
         setFieldCase =\r
                 (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase) action.getActionChoice();\r
@@ -571,7 +571,7 @@ public class ActionConvertorV13Test {
                 .getVlanVid().intValue());\r
         Assert.assertEquals("Wrong cfi bit", true, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid()\r
                 .isCfiBit());\r
-        \r
+\r
         action = actions.get(10);\r
         setFieldCase =\r
                 (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase) action.getActionChoice();\r
@@ -581,7 +581,7 @@ public class ActionConvertorV13Test {
         checkEntryHeader(entry, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Src.class, false);\r
         Assert.assertEquals("Wrong ipv4 src", "0000:0000:0000:0000:0000:0000:0000:0005",\r
                 ((Ipv6SrcCase) entry.getMatchEntryValue()).getIpv6Src().getIpv6Address().getValue());\r
-        \r
+\r
         action = actions.get(11);\r
         setFieldCase =\r
                 (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase) action.getActionChoice();\r
OpenFlow Plugin