From 050ece3a87fbbad7d04e69ed951c48118edf0a89 Mon Sep 17 00:00:00 2001 From: Fangyin Hu Date: Mon, 26 Jun 2017 20:34:56 -0700 Subject: Change the bootstrap script file and test the CI-management. Debug the NSH SFC functional test. Change the test cases and not use the tcpdump. Delete the unused code. Change the directory structure. Change-Id: I52486b9ba4b02e305f702ffc8cdb84e941cb18ff Signed-off-by: Fangyin Hu --- resources/libraries/robot/nsh_sfc/default.robot | 48 ++++++++++++++++--------- 1 file changed, 31 insertions(+), 17 deletions(-) (limited to 'resources/libraries/robot/nsh_sfc') diff --git a/resources/libraries/robot/nsh_sfc/default.robot b/resources/libraries/robot/nsh_sfc/default.robot index fc70523cdd..64d31a9897 100644 --- a/resources/libraries/robot/nsh_sfc/default.robot +++ b/resources/libraries/robot/nsh_sfc/default.robot @@ -24,18 +24,34 @@ | | ... | on the DUT node. | | ${testtype}= | Convert to String | ${type} | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} -| | Compute Path -| | ${src_port} | ${src_node}= | First Interface -| | ${dst_port} | ${dst_node}= | Last Interface -| | Set Suite Variable | ${src_node} -| | Set Suite Variable | ${src_port} -| | Set Suite Variable | ${dst_node} -| | Set Suite Variable | ${dst_port} -| | Set Interface State | ${src_node} | ${src_port} | 'up' -| | Set Interface Ethernet MTU | ${src_node} | ${src_port} | 9000 -| | ${adj_mac}= | Get interface mac | ${src_node} | ${src_port} -| | Config and Start SFC test | ${dst_node} | ${dst_port} -| | ... | ${adj_mac} | ${testtype} +| | ... | ${nodes['TG']} +| | Compute Path | always_same_link=${FALSE} +| | ${tg_to_dut_if1} | ${tg_node}= | First Interface +| | ${tg_to_dut_if2} | ${tg_node}= | Last Interface +| | ${dut_to_tg_if1} | ${dut_node}= | First Ingress Interface +| | ${dut_to_tg_if2} | ${dut_node}= | Last Egress Interface +| | ${tg_to_dut_if1_mac}= | Get interface mac | ${tg_node} | ${tg_to_dut_if1} +| | ${tg_to_dut_if2_mac}= | Get interface mac | ${tg_node} | ${tg_to_dut_if2} +| | ${dut_to_tg_if1_mac}= | Get interface mac | ${dut_node} | ${dut_to_tg_if1} +| | ${dut_to_tg_if2_mac}= | Get interface mac | ${dut_node} | ${dut_to_tg_if2} +| | Set Suite Variable | ${tg_to_dut_if1} +| | Set Suite Variable | ${tg_to_dut_if2} +| | Set Suite Variable | ${dut_to_tg_if1} +| | Set Suite Variable | ${dut_to_tg_if2} +| | Set Suite Variable | ${tg_to_dut_if1_mac} +| | Set Suite Variable | ${tg_to_dut_if2_mac} +| | Set Suite Variable | ${dut_to_tg_if1_mac} +| | Set Suite Variable | ${dut_to_tg_if2_mac} +| | Set Suite Variable | ${tg_node} +| | Set Suite Variable | ${dut_node} +| | Set Interface State | ${tg_node} | ${tg_to_dut_if1} | 'up' +| | Set Interface State | ${tg_node} | ${tg_to_dut_if2} | 'up' +| | Set Interface Ethernet MTU | ${tg_node} | ${tg_to_dut_if1} | 9000 +| | Set Interface Ethernet MTU | ${tg_node} | ${tg_to_dut_if2} | 9000 +| | Config and Start SFC test | ${dut_node} | ${dut_to_tg_if1} +| | ... | ${dut_to_tg_if2} | ${tg_to_dut_if1_mac} | ${tg_to_dut_if2_mac} +| | ... | ${testtype} + | Node "${from_node}" interface "${from_port}" send "${size}" Bytes packet to node "${to_node}" interface "${to_port}" for "${type}" test | | [Documentation] | At the first start the tcpdump on the TG node, @@ -43,17 +59,15 @@ | | ... | DUT node, DUT node will receive the packet on the ingress interface | | ... | DUT will loopback packet to the TG after processed. TG will use | | ... | the tcpdump to capture the packet and check the packet is correct. -| | ${filter_dst_ip}= | Set Variable | 192.168.50.71 -| | Start the tcpdump on the Node | ${from_node} | ${from_port} | ${filter_dst_ip} | | ${src_ip}= | Set Variable If | "${type}" == "Classifier" | 10.10.12.101 | 192.168.50.72 | | ${dst_ip}= | Set Variable If | "${type}" == "Classifier" | 10.10.12.100 | 192.168.50.76 | | ${src_mac}= | Get interface mac | ${from_node} | ${from_port} | | ${dst_mac}= | Get interface mac | ${to_node} | ${to_port} -| | ${from_port_name}= | Get interface name | ${from_node} | ${from_port} -| | ${to_port_name}= | Get interface name | ${to_node} | ${to_port} +| | ${tx_port_name}= | Get interface name | ${from_node} | ${from_port} +| | ${rx_port_name}= | Get interface name | ${from_node} | ${tg_to_dut_if2} | | ${timeout}= | Set Variable | 10 | | ${frame_size}= | Convert To Integer | ${size} -| | ${args}= | Traffic Script Gen Arg | ${from_port_name} | ${from_port_name} +| | ${args}= | Traffic Script Gen Arg | ${rx_port_name} | ${tx_port_name} | | | ... | ${src_mac} | ${dst_mac} | ${src_ip} | ${dst_ip} | | ${args}= | Catenate | ${args} | --framesize ${frame_size} | | | ... | --timeout ${timeout} | --testtype "${type}" -- cgit 1.2.3-korg