From f0033d223da06e2efea99737dcfb1f0a24fbfafd Mon Sep 17 00:00:00 2001 From: Oded Shvartz Date: Sun, 14 Aug 2016 14:37:09 +0300 Subject: [PATCH] Fix IT default flows validation 1)Changed the list of default flows due to some changes in the pipeline. 2)Changed the max time for flow validation method, because 1 minute was not enough. Change-Id: Icc7c2ac03fce75a14cb04f185b1350936d39f67b Signed-off-by: Oded Shvartz --- .../src/test/java/org/opendaylight/netvirt/it/NetvirtIT.java | 4 ++-- .../java/org/opendaylight/netvirt/it/NetvirtITConstants.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/vpnservice/it/src/test/java/org/opendaylight/netvirt/it/NetvirtIT.java b/vpnservice/it/src/test/java/org/opendaylight/netvirt/it/NetvirtIT.java index 4d3989d28a..6b0db874b6 100644 --- a/vpnservice/it/src/test/java/org/opendaylight/netvirt/it/NetvirtIT.java +++ b/vpnservice/it/src/test/java/org/opendaylight/netvirt/it/NetvirtIT.java @@ -244,7 +244,7 @@ public class NetvirtIT extends AbstractMdsalTestBase { nodeInfo.connect(); //validate default flows - validateDefaultFlows(nodeInfo.datapathId, 60*1000); + validateDefaultFlows(nodeInfo.datapathId, 2*60*1000); LOG.info("testNetVirt: should be connected: {}", nodeInfo.ovsdbNode.getNodeId()); @@ -279,7 +279,7 @@ public class NetvirtIT extends AbstractMdsalTestBase { nodeInfo.connect(); //validate default flows - validateDefaultFlows(nodeInfo.datapathId, 60*1000); + validateDefaultFlows(nodeInfo.datapathId, 2*60*1000); //create the neutron objects NetITUtil net = new NetITUtil(ovs, southboundUtils, mdsalUtils); diff --git a/vpnservice/it/src/test/java/org/opendaylight/netvirt/it/NetvirtITConstants.java b/vpnservice/it/src/test/java/org/opendaylight/netvirt/it/NetvirtITConstants.java index 6cba47b955..6ded626d8c 100644 --- a/vpnservice/it/src/test/java/org/opendaylight/netvirt/it/NetvirtITConstants.java +++ b/vpnservice/it/src/test/java/org/opendaylight/netvirt/it/NetvirtITConstants.java @@ -40,10 +40,9 @@ public final class NetvirtITConstants { public enum DefaultFlow { + DHCP_EXTERNAL_TUNNEL("DHCPTableMissFlowForExternalTunnel",NwConstants.DHCP_TABLE_EXTERNAL_TUNNEL), DHCP("DHCPTableMissFlow", NwConstants.DHCP_TABLE), - IPV6("IPv6TableMissFlow", NwConstants.IPV6_TABLE), - ELAN_SMAC(""+NwConstants.ELAN_SMAC_TABLE, NwConstants.ELAN_SMAC_TABLE), - ELAN_DMAC(""+NwConstants.ELAN_DMAC_TABLE, NwConstants.ELAN_DMAC_TABLE); + IPV6("IPv6TableMissFlow", NwConstants.IPV6_TABLE); String flowId; short tableId; -- 2.36.6