From: Sam Hague Date: Mon, 29 Jan 2018 20:37:06 +0000 (-0500) Subject: Move remaining tcpdump users to use wrapper X-Git-Tag: pre-potassium~978 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4cfc780475608e2102334a465a230ac4074de03d;p=integration%2Ftest.git Move remaining tcpdump users to use wrapper Change-Id: Ief3bfd12f1fb46f49e575cc63edd37aef0f88eea Signed-off-by: Sam Hague --- diff --git a/csit/libraries/VpnOperations.robot b/csit/libraries/VpnOperations.robot index 3a15c53396..b396f0dcc6 100644 --- a/csit/libraries/VpnOperations.robot +++ b/csit/libraries/VpnOperations.robot @@ -182,10 +182,7 @@ Get Gateway MAC And IP Address [Return] ${MacAddr-list} ${IpAddr-list} Test Teardown With Tcpdump Stop - [Arguments] ${cn1_conn_id} ${cn2_conn_id} ${os_conn_id} - Stop Packet Capture on Node ${cn1_conn_id} - Stop Packet Capture on Node ${cn2_conn_id} - Stop Packet Capture on Node ${os_conn_id} + OpenStackOperations.Stop Packet Capture On Nodes Get Test Teardown Debugs Verify IPv4 GWMAC Flow Entry On Flow Table diff --git a/csit/suites/netvirt/elan/elan.robot b/csit/suites/netvirt/elan/elan.robot index 7931332a51..ee33d1b9a9 100644 --- a/csit/suites/netvirt/elan/elan.robot +++ b/csit/suites/netvirt/elan/elan.robot @@ -15,7 +15,6 @@ Resource ../../../libraries/OVSDB.robot Resource ../../../libraries/OpenStackOperations.robot Resource ../../../libraries/DevstackUtils.robot Resource ../../../libraries/SetupUtils.robot -Resource ../../../libraries/Tcpdump.robot Resource ../../../variables/Variables.robot Resource ../../../variables/netvirt/Variables.robot diff --git a/csit/suites/netvirt/vpnservice/vpn_basic.robot b/csit/suites/netvirt/vpnservice/vpn_basic.robot index 9fb2cd808a..beb0fbc138 100644 --- a/csit/suites/netvirt/vpnservice/vpn_basic.robot +++ b/csit/suites/netvirt/vpnservice/vpn_basic.robot @@ -109,9 +109,7 @@ Add Interfaces To Router BuiltIn.Set Suite Variable ${GWIP_ADDRS} Check L3_Datapath Traffic Across Networks With Router - ${cn1_conn_id} = Tcpdump.Start Packet Capture on Node ${OS_COMPUTE_1_IP} file_Name=tcpDumpCN1 - ${cn2_conn_id} = Tcpdump.Start Packet Capture on Node ${OS_COMPUTE_2_IP} file_Name=tcpDumpCN2 - ${os_conn_id} = Tcpdump.Start Packet Capture on Node ${OS_CONTROL_NODE_IP} file_Name=tcpDumpOS + OpenStackOperations.Start Packet Capture On Nodes tcpdump_vpn ${EMPTY} ${OS_CONTROL_NODE_IP} ${OS_COMPUTE_1_IP} ${OS_COMPUTE_2_IP} ${vm_ips} = BuiltIn.Create List @{NET_1_VM_IPS} @{NET_2_VM_IPS} BuiltIn.Wait Until Keyword Succeeds 30s 10s Utils.Check For Elements At URI ${FIB_ENTRY_URL} ${vm_ips} BuiltIn.Wait Until Keyword Succeeds 30s 10s VpnOperations.Verify Flows Are Present For L3VPN ${OS_COMPUTE_1_IP} ${vm_ips} @@ -123,7 +121,7 @@ Check L3_Datapath Traffic Across Networks With Router OpenStackOperations.Test Operations From Vm Instance @{NETWORKS}[0] @{NET_1_VM_IPS}[0] ${dst_ip_list} ${dst_ip_list} = BuiltIn.Create List @{NET_2_VM_IPS}[1] @{NET_1_VM_IPS} OpenStackOperations.Test Operations From Vm Instance @{NETWORKS}[1] @{NET_2_VM_IPS}[0] ${dst_ip_list} - [Teardown] VpnOperations.Test Teardown With Tcpdump Stop ${cn1_conn_id} ${cn2_conn_id} ${os_conn_id} + [Teardown] VpnOperations.Test Teardown With Tcpdump Stop Add Multiple Extra Routes And Check Datapath Before L3VPN Creation ${CONFIG_EXTRA_ROUTE_IP1} = BuiltIn.Catenate sudo ifconfig eth0:1 @{EXTRA_NW_IP}[0] netmask 255.255.255.0 up diff --git a/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot b/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot index 0cc82c5697..5627886c4c 100644 --- a/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot +++ b/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot @@ -125,9 +125,7 @@ Check ELAN Datapath Traffic Within The Networks Check L3_Datapath Traffic Across Networks With Router BuiltIn.Log Verification of FIB Entries and Flow - ${cn1_conn_id} = Tcpdump.Start Packet Capture on Node ${OS_COMPUTE_1_IP} file_Name=tcpDumpCN1 - ${cn2_conn_id} = Tcpdump.Start Packet Capture on Node ${OS_COMPUTE_2_IP} file_Name=tcpDumpCN2 - ${os_conn_id} = Tcpdump.Start Packet Capture on Node ${OS_CONTROL_NODE_IP} file_Name=tcpDumpOS + OpenStackOperations.Start Packet Capture On Nodes tcpdump_vpn6 ${EMPTY} ${OS_CONTROL_NODE_IP} ${OS_COMPUTE_1_IP} ${OS_COMPUTE_2_IP} ${vm_ips} = BuiltIn.Create List @{VM_IP_NET10} @{VM_IP_NET20} BuiltIn.Wait Until Keyword Succeeds 30s 10s Utils.Check For Elements At URI ${FIB_ENTRY_URL} ${vm_ips} BuiltIn.Wait Until Keyword Succeeds 30s 10s VpnOperations.Verify Flows Are Present For L3VPN ${OS_COMPUTE_1_IP} ${VM_IP_NET10} @@ -139,7 +137,7 @@ Check L3_Datapath Traffic Across Networks With Router OpenStackOperations.Test Operations From Vm Instance @{NETWORKS}[0] @{VM_IP_NET10}[0] ${dst_ip_list} ${dst_ip_list} = BuiltIn.Create List @{VM_IP_NET20}[1] @{VM_IP_NET10} OpenStackOperations.Test Operations From Vm Instance @{NETWORKS}[1] @{VM_IP_NET20}[0] ${dst_ip_list} - [Teardown] VpnOperations.Test Teardown With Tcpdump Stop ${cn1_conn_id} ${cn2_conn_id} ${os_conn_id} + [Teardown] VpnOperations.Test Teardown With Tcpdump Stop Add Multiple Extra Routes And Check Datapath Before L3VPN Creation ${CONFIG_EXTRA_ROUTE_IP1} = BuiltIn.Catenate sudo ip -6 addr add @{EXTRA_NW_IP}[0]/64 dev eth0