From 20b21b6680f8feb23fc8ea14500daa7ca1169df4 Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Mon, 5 Feb 2018 14:20:34 -0500 Subject: [PATCH] enable tcpdump on port 6653 in suite setup Change-Id: Ib69abc069155cde2a86e7c30fb6409b2ddf1d6df Signed-off-by: Sam Hague --- csit/libraries/OpenStackOperations.robot | 10 +++++++--- csit/libraries/VpnOperations.robot | 3 ++- csit/suites/netvirt/vpnservice/vpn_basic.robot | 4 ++-- .../vpnservice/vpn_basic_dualstack_one_router.robot | 6 ++---- csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot | 4 ++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot index 12ce06858d..e8f667d620 100644 --- a/csit/libraries/OpenStackOperations.robot +++ b/csit/libraries/OpenStackOperations.robot @@ -1114,6 +1114,8 @@ Cleanup Router OpenStack Suite Setup [Documentation] Wrapper teardown keyword that can be used in any suite running in an openstack environement SetupUtils.Setup_Utils_For_Setup_And_Teardown + @{tcpdump_port_6653_conn_ids} = OpenStackOperations.Start Packet Capture On Nodes tcpdump_port_6653 port 6653 ${OS_CONTROL_NODE_IP} ${OS_COMPUTE_1_IP} ${OS_COMPUTE_2_IP} + BuiltIn.Set Suite Variable @{tcpdump_port_6653_conn_ids} Run Keyword If "${PRE_CLEAN_OPENSTACK_ALL}"=="True" OpenStack Cleanup All DevstackUtils.Devstack Suite Setup Add OVS Logging On All OpenStack Nodes @@ -1124,6 +1126,7 @@ OpenStack Suite Teardown ... and deleted. As other global cleanup tasks are needed, they can be added here and the suites will all ... benefit automatically. OpenStack Cleanup All + OpenStackOperations.Stop Packet Capture On Nodes ${tcpdump_port_6653_conn_ids} SSHLibrary.Close All Connections Copy DHCP Files From Control Node @@ -1161,8 +1164,9 @@ Start Packet Capture On Nodes ... but ${EMPTY} can be used for the tag and filter. ${suite_} = BuiltIn.Evaluate """${SUITE_NAME}""".replace(" ","_").replace("/","_").replace(".","_") ${tag_} = BuiltIn.Catenate SEPARATOR=__ ${tag} ${suite_} - @{capture_conn_ids} = Tcpdump.Start Packet Capture on Nodes tag=${tag_} filter=${filter} ips=${ips} - BuiltIn.Set Suite Variable @{capture_conn_ids} + @{conn_ids} = Tcpdump.Start Packet Capture on Nodes tag=${tag_} filter=${filter} ips=${ips} + [Return] @{conn_ids} Stop Packet Capture On Nodes - Tcpdump.Stop Packet Capture on Nodes ${capture_conn_ids} + [Arguments] ${conn_ids}=@{EMPTY} + Tcpdump.Stop Packet Capture on Nodes ${conn_ids} diff --git a/csit/libraries/VpnOperations.robot b/csit/libraries/VpnOperations.robot index b396f0dcc6..c6e4785049 100644 --- a/csit/libraries/VpnOperations.robot +++ b/csit/libraries/VpnOperations.robot @@ -182,7 +182,8 @@ Get Gateway MAC And IP Address [Return] ${MacAddr-list} ${IpAddr-list} Test Teardown With Tcpdump Stop - OpenStackOperations.Stop Packet Capture On Nodes + [Arguments] ${conn_ids}=@{EMPTY} + OpenStackOperations.Stop Packet Capture On Nodes ${conn_ids} Get Test Teardown Debugs Verify IPv4 GWMAC Flow Entry On Flow Table diff --git a/csit/suites/netvirt/vpnservice/vpn_basic.robot b/csit/suites/netvirt/vpnservice/vpn_basic.robot index beb0fbc138..89d5cf88fd 100644 --- a/csit/suites/netvirt/vpnservice/vpn_basic.robot +++ b/csit/suites/netvirt/vpnservice/vpn_basic.robot @@ -109,7 +109,7 @@ Add Interfaces To Router BuiltIn.Set Suite Variable ${GWIP_ADDRS} Check L3_Datapath Traffic Across Networks With Router - OpenStackOperations.Start Packet Capture On Nodes tcpdump_vpn ${EMPTY} ${OS_CONTROL_NODE_IP} ${OS_COMPUTE_1_IP} ${OS_COMPUTE_2_IP} + @{tcpdump_conn_ids} = 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} @@ -121,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 + [Teardown] VpnOperations.Test Teardown With Tcpdump Stop ${tcpdump_conn_ids} 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_dualstack_one_router.robot b/csit/suites/netvirt/vpnservice/vpn_basic_dualstack_one_router.robot index 21656d3571..45685b6ad5 100644 --- a/csit/suites/netvirt/vpnservice/vpn_basic_dualstack_one_router.robot +++ b/csit/suites/netvirt/vpnservice/vpn_basic_dualstack_one_router.robot @@ -169,9 +169,7 @@ Check ELAN Datapath Traffic Within The Networks Check L3_Datapath Traffic Across Networks With Router [Documentation] L3 Datapath test across networks using previously created 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 + @{tcpdump_conn_ids} = OpenStackOperations.Start Packet Capture On Nodes tcpdump_vpn_ds ${EMPTY} ${OS_CONTROL_NODE_IP} ${OS_COMPUTE_1_IP} ${OS_COMPUTE_2_IP} ${vm_instances} = BuiltIn.Create List @{NET_1_VM_IPV4} @{NET_2_VM_IPV4} @{NET_1_VM_IPV6} @{NET_2_VM_IPV6} BuiltIn.Wait Until Keyword Succeeds 30s 5s Utils.Check For Elements At URI ${FIB_ENTRY_URL} ${vm_instances} : FOR ${VM} IN ${vm_instances} @@ -188,7 +186,7 @@ Check L3_Datapath Traffic Across Networks With Router Test Operations From Vm Instance @{NETWORKS}[0] ${NET_1_VM_IPV6[0]} ${dst_ipv6_list1} ${dst_ipv6_list2} = BuiltIn.Create List ${NET_2_VM_IPV6[1]} @{NET_1_VM_IPV6} Test Operations From Vm Instance @{NETWORKS}[1] ${NET_2_VM_IPV6[0]} ${dst_ipv6_list2} - [Teardown] VpnOperations.Test Teardown With Tcpdump Stop + [Teardown] VpnOperations.Test Teardown With Tcpdump Stop ${tcpdump_conn_ids} Add Multiple Extra Routes And Check Datapath Before L3VPN Creation [Documentation] Add multiple extra routes and check data path before L3VPN creation. diff --git a/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot b/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot index 8e04cb1a43..2336c7cef8 100644 --- a/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot +++ b/csit/suites/netvirt/vpnservice/vpn_basic_ipv6.robot @@ -125,7 +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 - OpenStackOperations.Start Packet Capture On Nodes tcpdump_vpn6 ${EMPTY} ${OS_CONTROL_NODE_IP} ${OS_COMPUTE_1_IP} ${OS_COMPUTE_2_IP} + @{tcpdump_conn_ids} = 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} @@ -137,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 + [Teardown] VpnOperations.Test Teardown With Tcpdump Stop ${tcpdump_conn_ids} 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 -- 2.36.6