From: Stephen Kitt <skitt@redhat.com>
Date: Thu, 21 Dec 2017 14:15:29 +0000 (+0100)
Subject: GENIUS-109: make checkDmacSameDPN more robust
X-Git-Tag: release/oxygen~123
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8ac81791070e9816c85d3382437597b90438981b;p=netvirt.git

GENIUS-109: make checkDmacSameDPN more robust

This sorts the actions before comparing the flows, avoiding issues
when upstream changes cause the action order to change in the data
structure.

Change-Id: Ia4b62e2af5bc432f076432422236adacb097885b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java
index bb9e3365a6..6d1c007d1d 100644
--- a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTest.java
@@ -157,7 +157,7 @@ public class ElanServiceTest extends  ElanServiceTestBase {
         flowDst = getFlowWithoutCookie(flowDst);
 
         Flow expected = ExpectedObjects.checkDmacOfSameDpn(flowId, interfaceInfo, actualElanInstances);
-        AssertDataObjects.assertEqualBeans(expected, flowDst);
+        AssertDataObjects.assertEqualBeans(getSortedActions(expected), getSortedActions(flowDst));
     }
 
     @Test public void checkDmacOfOtherDPN() throws Exception {