Fixes for tests failing on Jenkins autorelease job

[groupbasedpolicy.git] / renderers / ofoverlay / src / test / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / flow / ChainActionFlowsTest.java

diff --git a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/ChainActionFlowsTest.java b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/ChainActionFlowsTest.java
old mode 100644 (file)
new mode 100755 (executable)
index 28d820e..04bda8c
--- a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/ChainActionFlowsTest.java
+++ b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/ChainActionFlowsTest.java
@@ -193,7 +193,7 @@ public class ChainActionFlowsTest extends MapperUtilsTest {
         ChainActionFlows.createChainTunnelFlows(nshHeader, netElements, ofWriter, ctx, HasDirection.Direction.Out);\r
 \r
         // Verify flows and capture arguments\r
-        verify(ofWriter, times(1)).writeFlow(NODE_ID, (short) 6, createExternalTestFlow());\r
+        verify(ofWriter, times(1)).writeFlow(NODE_ID, (short) 6, createExternalTestFlow(netElements));\r
     }\r
 \r
     private Flow allowFromChainTestFlow() {\r
@@ -223,7 +223,7 @@ public class ChainActionFlowsTest extends MapperUtilsTest {
                     .getIpv4Address().getValue() + IP_PREFIX_32)).build();\r
             MatchBuilder mb = new MatchBuilder().setInPort(CONNECTOR_2).setLayer3Match(l3Match)\r
                     .setEthernetMatch(FlowUtils.ethernetMatch(null, null, FlowUtils.IPv4));\r
-            addNxTunIdMatch(mb, 2);\r
+            addNxTunIdMatch(mb, networkElements.getSrcEpOrdinals().getTunnelId());\r
             addNxNspMatch(mb, 27L);\r
             addNxNsiMatch(mb, (short) 250);\r
             Match match = mb.build();\r
@@ -260,16 +260,19 @@ public class ChainActionFlowsTest extends MapperUtilsTest {
         return flowBuilder.build();\r
     }\r
 \r
-    private Flow createExternalTestFlow() {\r
+    private Flow createExternalTestFlow(NetworkElements networkElements) {\r
+        int matchTunnelId = networkElements.getSrcEpOrdinals().getTunnelId();\r
+        long setTunnelId = networkElements.getDstEpOrdinals().getTunnelId();\r
+\r
         Action loadC1 = nxLoadNshc1RegAction(null);\r
-        Action loadC2 = nxLoadNshc2RegAction(2L);\r
-        Action loadChainTunVnId = nxLoadTunIdAction(BigInteger.valueOf(2L), false);\r
+        Action loadC2 = nxLoadNshc2RegAction(setTunnelId);\r
+        Action loadChainTunVnId = nxLoadTunIdAction(BigInteger.valueOf(setTunnelId), false);\r
         Action loadChainTunDest = nxLoadTunIPv4Action(IPV4_2.getValue(), false);\r
         Action outputAction = FlowUtils.createActionResubmit(null, (short) 0);\r
 \r
         MatchBuilder matchBuilder = new MatchBuilder();\r
         addNxRegMatch(matchBuilder, RegMatch.of(NxmNxReg6.class, 0L));\r
-        addNxTunIdMatch(matchBuilder, 2);\r
+        addNxTunIdMatch(matchBuilder, matchTunnelId);\r
         addNxNspMatch(matchBuilder, 27L);\r
         addNxNsiMatch(matchBuilder, (short) 255);\r
 \r