Fixes for tests failing on Jenkins autorelease job

[groupbasedpolicy.git] / renderers / ofoverlay / src / test / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / mapper / ingressnat / IngressNatMapperFlowsTest.java

diff --git a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/mapper/ingressnat/IngressNatMapperFlowsTest.java b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/mapper/ingressnat/IngressNatMapperFlowsTest.java
old mode 100644 (file)
new mode 100755 (executable)
index b16dace..3d34383
--- a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/mapper/ingressnat/IngressNatMapperFlowsTest.java
+++ b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/mapper/ingressnat/IngressNatMapperFlowsTest.java
@@ -106,7 +106,7 @@ public class IngressNatMapperFlowsTest extends MapperUtilsTest {
                 FlowUtils.nxLoadRegAction(NxmNxReg4.class, BigInteger.valueOf(0)),
                 FlowUtils.nxLoadRegAction(NxmNxReg5.class, BigInteger.valueOf(0)),
                 FlowUtils.nxLoadRegAction(NxmNxReg6.class, BigInteger.valueOf(0)),
-                FlowUtils.nxLoadTunIdAction(BigInteger.valueOf(2), false)};
+                FlowUtils.nxLoadTunIdAction(BigInteger.valueOf(ordinals.getTunnelId()), false)};
         instructions.add(new InstructionBuilder().setOrder(0)
                 .setInstruction(FlowUtils.applyActionIns(ArrayUtils.addAll(ipActions, ordinalsAction))).build());
         instructions.add(new InstructionBuilder().setOrder(1).setInstruction(FlowUtils.gotoTableIns((short) 2)).build());
@@ -181,7 +181,7 @@ public class IngressNatMapperFlowsTest extends MapperUtilsTest {
                 FlowUtils.nxLoadRegAction(NxmNxReg4.class, BigInteger.valueOf(0)),
                 FlowUtils.nxLoadRegAction(NxmNxReg5.class, BigInteger.valueOf(0)),
                 FlowUtils.nxLoadRegAction(NxmNxReg6.class, BigInteger.valueOf(0)),
-                FlowUtils.nxLoadTunIdAction(BigInteger.valueOf(2), false)};
+                FlowUtils.nxLoadTunIdAction(BigInteger.valueOf(ordinals.getTunnelId()), false)};
         instructions.add(new InstructionBuilder().setOrder(0)
                 .setInstruction(FlowUtils.applyActionIns(ArrayUtils.addAll(ordinalsAction))).build());
         instructions.add(new InstructionBuilder().setOrder(1).setInstruction(FlowUtils.gotoTableIns((short) 2)).build());
@@ -224,7 +224,7 @@ public class IngressNatMapperFlowsTest extends MapperUtilsTest {
                 FlowUtils.nxLoadRegAction(NxmNxReg4.class, BigInteger.valueOf(0)),
                 FlowUtils.nxLoadRegAction(NxmNxReg5.class, BigInteger.valueOf(0)),
                 FlowUtils.nxLoadRegAction(NxmNxReg6.class, BigInteger.valueOf(0)),
-                FlowUtils.nxLoadTunIdAction(BigInteger.valueOf(2), false)};
+                FlowUtils.nxLoadTunIdAction(BigInteger.valueOf(ordinals.getTunnelId()), false)};
         instructions.add(new InstructionBuilder().setOrder(0)
                 .setInstruction(FlowUtils.applyActionIns(ArrayUtils.addAll(ordinalsAction))).build());
         instructions.add(new InstructionBuilder().setOrder(1).setInstruction(FlowUtils.gotoTableIns((short) 0)).build());