Fixes for tests failing on Jenkins autorelease job

[groupbasedpolicy.git] / renderers / ofoverlay / src / test / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / mapper / source / SourceMapperFlowsTest.java

diff --git a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/mapper/source/SourceMapperFlowsTest.java b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/mapper/source/SourceMapperFlowsTest.java
old mode 100644 (file)
new mode 100755 (executable)
index ebf4480..376563f
--- a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/mapper/source/SourceMapperFlowsTest.java
+++ b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/mapper/source/SourceMapperFlowsTest.java
@@ -118,7 +118,7 @@ public class SourceMapperFlowsTest extends MapperUtilsTest {
         Action reg4 = FlowUtils.nxLoadRegAction(NxmNxReg4.class, BigInteger.valueOf(0));
         Action reg5 = FlowUtils.nxLoadRegAction(NxmNxReg5.class, BigInteger.valueOf(0));
         Action reg6 = FlowUtils.nxLoadRegAction(NxmNxReg6.class, BigInteger.valueOf(0));
-        Action tunnelId = FlowUtils.nxLoadTunIdAction(BigInteger.valueOf(2), false);
+        Action tunnelId = FlowUtils.nxLoadTunIdAction(BigInteger.valueOf(ordinals.getTunnelId()), false);
         InstructionsBuilder instructionsBuilder = new InstructionsBuilder();
         List<Instruction> instructions = new ArrayList<>();
         InstructionBuilder ordinalsInstruction = new InstructionBuilder();
@@ -175,7 +175,7 @@ public class SourceMapperFlowsTest extends MapperUtilsTest {
 
         MatchBuilder matchBuilder = new MatchBuilder();
         matchBuilder.setInPort(new NodeConnectorId(CONNECTOR_0));
-        FlowUtils.addNxTunIdMatch(matchBuilder, 2);
+        FlowUtils.addNxTunIdMatch(matchBuilder, ordinals.getTunnelId());
         Match match = matchBuilder.build();
 
         Flow testFlow = buildFlow(FlowIdUtils.newFlowId(tableId, "tunnel", match), tableId, 80, match,
@@ -223,4 +223,4 @@ public class SourceMapperFlowsTest extends MapperUtilsTest {
         flows.createBroadcastFlow((short) 3, 80, new NodeConnectorId(CONNECTOR_1), ordinals, ofWriter);
         verify(ofWriter, times(1)).writeFlow(NODE_ID, tableId, testFlow);
     }
-}
\ No newline at end of file
+}