X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_configuration.robot;h=ba6c7967bb32ec100f375850ce2cd5c6c109206b;hb=fdf235ec30b409daef533c5258e2bfbe506c49f8;hp=52be3a26a857b330aab8c01126a144b571867a66;hpb=95998a67270ffd72f09ce6f3d43235c723edf36b;p=csit.git diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 52be3a26a8..ba6c7967bb 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -117,16 +117,20 @@ | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} -| | dut1_v4.set_arp | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac} -| | dut1_v4.set_arp | ${dut1_if2} | 1.1.1.2 | ${dut2_if1_mac} -| | dut2_v4.set_arp | ${dut2_if1} | 1.1.1.1 | ${dut1_if2_mac} -| | dut2_v4.set_arp | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac} -| | dut1_v4.set_ip | ${dut1_if1} | 10.10.10.1 | 24 -| | dut1_v4.set_ip | ${dut1_if2} | 1.1.1.1 | 30 -| | dut2_v4.set_ip | ${dut2_if1} | 1.1.1.2 | 30 -| | dut2_v4.set_ip | ${dut2_if2} | 20.20.20.1 | 24 -| | dut1_v4.set_route | 20.20.20.0 | 24 | 1.1.1.2 | ${dut1_if2} -| | dut2_v4.set_route | 10.10.10.0 | 24 | 1.1.1.1 | ${dut2_if1} +| | Add arp on dut | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac} +| | Add arp on dut | ${dut1} | ${dut1_if2} | 1.1.1.2 | ${dut2_if1_mac} +| | Add arp on dut | ${dut2} | ${dut2_if1} | 1.1.1.1 | ${dut1_if2_mac} +| | Add arp on dut | ${dut2} | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac} +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} +| | ... | 10.10.10.1 | 24 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} +| | ... | 1.1.1.1 | 30 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} +| | ... | 1.1.1.2 | 30 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} +| | ... | 20.20.20.1 | 24 +| | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | 1.1.1.2 | ${dut1_if2} +| | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 1.1.1.1 | ${dut2_if1} | | All Vpp Interfaces Ready Wait | ${nodes} | Initialize IPv4 forwarding in 2-node circular topology @@ -141,10 +145,12 @@ | | Set Interface State | ${dut1} | ${dut1_if2} | up | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | dut1_v4.set_arp | ${dut1_if1} | 10.10.10.3 | ${tg1_if1_mac} -| | dut1_v4.set_arp | ${dut1_if2} | 20.20.20.3 | ${tg1_if2_mac} -| | dut1_v4.set_ip | ${dut1_if1} | 10.10.10.2 | 24 -| | dut1_v4.set_ip | ${dut1_if2} | 20.20.20.2 | 24 +| | Add arp on dut | ${dut1} | ${dut1_if1} | 10.10.10.3 | ${tg1_if1_mac} +| | Add arp on dut | ${dut1} | ${dut1_if2} | 20.20.20.3 | ${tg1_if2_mac} +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} +| | ... | 10.10.10.2 | 24 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} +| | ... | 20.20.20.2 | 24 | | All Vpp Interfaces Ready Wait | ${nodes} | Initialize IPv4 forwarding with scaling in 3-node circular topology @@ -238,29 +244,29 @@ | | Set Interface State | ${dut2} | ${dut2_vif1} | up | | Set Interface State | ${dut2} | ${dut2_vif2} | up | | Add Fib Table | ${dut1} | ${fib_table_1} -| | And Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | vrf=${fib_table_1} -| | ... | gateway=4.4.4.2 | interface=${dut1_vif1} | multipath=${TRUE} +| | And Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | vrf=${fib_table_1} +| | ... | gateway=4.4.4.2 | interface=${dut1_vif1} | multipath=${TRUE} | | Add Fib Table | ${dut1} | ${fib_table_1} | | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=${fib_table_1} -| | ... | gateway=1.1.1.2 | interface=${dut1_if1} | multipath=${TRUE} +| | ... | gateway=1.1.1.2 | interface=${dut1_if1} | multipath=${TRUE} | | Add Fib Table | ${dut1} | ${fib_table_2} | | And Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | vrf=${fib_table_2} -| | ... | gateway=2.2.2.2 | interface=${dut1_if2} | multipath=${TRUE} +| | ... | gateway=2.2.2.2 | interface=${dut1_if2} | multipath=${TRUE} | | Add Fib Table | ${dut1} | ${fib_table_2} | | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=${fib_table_2} -| | ... | gateway=5.5.5.2 | interface=${dut1_vif2} | multipath=${TRUE} +| | ... | gateway=5.5.5.2 | interface=${dut1_vif2} | multipath=${TRUE} | | Add Fib Table | ${dut2} | ${fib_table_1} | | And Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | vrf=${fib_table_1} -| | ... | gateway=2.2.2.1 | interface=${dut2_if1} | multipath=${TRUE} +| | ... | gateway=2.2.2.1 | interface=${dut2_if1} | multipath=${TRUE} | | Add Fib Table | ${dut2} | ${fib_table_1} | | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=${fib_table_1} -| | ... | gateway=4.4.4.1 | interface=${dut2_vif1} | multipath=${TRUE} +| | ... | gateway=4.4.4.1 | interface=${dut2_vif1} | multipath=${TRUE} | | Add Fib Table | ${dut2} | ${fib_table_2} | | And Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | vrf=${fib_table_2} -| | ... | gateway=5.5.5.2 | interface=${dut2_vif2} | multipath=${TRUE} +| | ... | gateway=5.5.5.2 | interface=${dut2_vif2} | multipath=${TRUE} | | Add Fib Table | ${dut2} | ${fib_table_2} | | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=${fib_table_2} -| | ... | gateway=3.3.3.2 | interface=${dut2_if2} | multipath=${TRUE} +| | ... | gateway=3.3.3.2 | interface=${dut2_if2} | multipath=${TRUE} | | Assign Interface To Fib Table | ${dut1} | ${dut1_if1} | ${fib_table_1} | | Assign Interface To Fib Table | ${dut1} | ${dut1_vif1} | ${fib_table_1} | | Assign Interface To Fib Table | ${dut1} | ${dut1_if2} | ${fib_table_2} @@ -354,16 +360,16 @@ | | ${fib_table_2}= | Evaluate | ${fib_table_1}+${nr} | | Add Fib Table | ${dut1} | ${fib_table_1} | | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=${fib_table_1} -| | ... | gateway=1.1.1.2 | interface=${dut1_if1} | multipath=${TRUE} +| | ... | gateway=1.1.1.2 | interface=${dut1_if1} | multipath=${TRUE} | | Add Fib Table | ${dut1} | ${fib_table_2} | | And Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | vrf=${fib_table_2} -| | ... | gateway=2.2.2.2 | interface=${dut1_if2} | multipath=${TRUE} +| | ... | gateway=2.2.2.2 | interface=${dut1_if2} | multipath=${TRUE} | | Add Fib Table | ${dut2} | ${fib_table_1} | | And Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | vrf=${fib_table_1} -| | ... | gateway=2.2.2.1 | interface=${dut2_if1} | multipath=${TRUE} +| | ... | gateway=2.2.2.1 | interface=${dut2_if1} | multipath=${TRUE} | | Add Fib Table | ${dut2} | ${fib_table_2} | | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=${fib_table_2} -| | ... | gateway=3.3.3.2 | interface=${dut2_if2} | multipath=${TRUE} +| | ... | gateway=3.3.3.2 | interface=${dut2_if2} | multipath=${TRUE} | | Assign Interface To Fib Table | ${dut1} | ${dut1_if1} | ${fib_table_1} | | Assign Interface To Fib Table | ${dut1} | ${dut1_if2} | ${fib_table_2} | | Assign Interface To Fib Table | ${dut2} | ${dut2_if1} | ${fib_table_1} @@ -412,19 +418,19 @@ | | | Set Interface State | ${dut2} | ${dut2-vhost-${number}-if2} | up | | | Add Fib Table | ${dut1} | ${fib_table_1} | | | And Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | vrf=${fib_table_1} -| | | ... | gateway=${ip_net_vif1}.1 | interface=${dut1-vhost-${number}-if1} +| | | ... | gateway=${ip_net_vif1}.1 | interface=${dut1-vhost-${number}-if1} | | | ... | multipath=${TRUE} | | | Add Fib Table | ${dut1} | ${fib_table_2} | | | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=${fib_table_2} -| | | ... | gateway=${ip_net_vif2}.2 | interface=${dut1-vhost-${number}-if2} +| | | ... | gateway=${ip_net_vif2}.2 | interface=${dut1-vhost-${number}-if2} | | | ... | multipath=${TRUE} | | | Add Fib Table | ${dut2} | ${fib_table_1} | | | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=${fib_table_1} -| | | ... | gateway=${ip_net_vif1}.1 | interface=${dut2-vhost-${number}-if1} +| | | ... | gateway=${ip_net_vif1}.1 | interface=${dut2-vhost-${number}-if1} | | | ... | multipath=${TRUE} | | | Add Fib Table | ${dut2} | ${fib_table_2} | | | And Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | vrf=${fib_table_2} -| | | ... | gateway=${ip_net_vif2}.2 | interface=${dut2-vhost-${number}-if2} +| | | ... | gateway=${ip_net_vif2}.2 | interface=${dut2-vhost-${number}-if2} | | | ... | multipath=${TRUE} | | | Assign Interface To Fib Table | ${dut1} | ${dut1-vhost-${number}-if1} | | | ... | ${fib_table_1} @@ -1457,7 +1463,7 @@ | | ... | ${True} | | Run Keyword Unless | ${qemu_built} | ${vm_name}.Build QEMU | ${dut_node} | | ... | force_install=${True} | apply_patch=${apply_patch} -| | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin} +| | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 @@ -1540,7 +1546,7 @@ | | ... | ${True} | | Run Keyword Unless | ${qemu_built} | ${vm_name}.Build QEMU | ${dut_node} | | ... | force_install=${True} | apply_patch=${apply_patch} -| | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin} +| | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 @@ -1605,7 +1611,7 @@ | | ... | ${True} | | Run Keyword Unless | ${qemu_built} | ${vm_name}.Build QEMU | ${dut_node} | | ... | force_install=${True} | apply_patch=${apply_patch} -| | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin} +| | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 @@ -1698,7 +1704,7 @@ | | ... | ${True} | | Run Keyword Unless | ${qemu_built} | ${vm_name}.Build QEMU | ${dut_node} | | ... | force_install=${True} | apply_patch=${apply_patch} -| | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin} +| | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 @@ -1746,7 +1752,7 @@ | | ... | ${True} | | Run Keyword Unless | ${qemu_built} | ${vm_name}.Build QEMU | ${dut_node} | | ... | force_install=${True} | apply_patch=${apply_patch} -| | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin} +| | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 @@ -1796,7 +1802,7 @@ | | ... | ${True} | | Run Keyword Unless | ${qemu_built} | ${vm_name}.Build QEMU | ${dut_node} | | ... | force_install=${True} | apply_patch=${apply_patch} -| | Run keyword | ${vm_name}.Qemu Set Bin | ${perf_qemu_bin} +| | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 @@ -2086,8 +2092,7 @@ | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: -| | ... | - /tmp/memif-${number}-1 -| | ... | - /tmp/memif-${number}-2 +| | ... | - /tmp/memif-DUT1_VNF${number}-${sid} | | ... | | ... | *Example:* | | ... @@ -2098,8 +2103,8 @@ | | Set Interface State | ${dut2} | ${dut2_if1} | up | | Set Interface State | ${dut2} | ${dut2_if2} | up | | :FOR | ${number} | IN RANGE | 1 | ${nr}+1 -| | | ${sock1}= | Set Variable | /tmp/memif-DUT1_VNF${number}-1 -| | | ${sock2}= | Set Variable | /tmp/memif-DUT1_VNF${number}-2 +| | | ${sock1}= | Set Variable | memif-DUT1_VNF +| | | ${sock2}= | Set Variable | memif-DUT1_VNF | | | ${prev_index}= | Evaluate | ${number}-1 | | | Set up memif interfaces on DUT node | ${dut1} | | | ... | ${sock1} | ${sock2} | ${number} | dut1-memif-${number}-if1 @@ -2108,8 +2113,8 @@ | | | ... | ${dut1-memif-${prev_index}-if2} | | | Configure L2XC | ${dut1} | ${dut1_xconnect_if1} | | | ... | ${dut1-memif-${number}-if1} -| | | ${sock1}= | Set Variable | /tmp/memif-DUT2_VNF${number}-1 -| | | ${sock2}= | Set Variable | /tmp/memif-DUT2_VNF${number}-2 +| | | ${sock1}= | Set Variable | memif-DUT2_VNF +| | | ${sock2}= | Set Variable | memif-DUT2_VNF | | | Set up memif interfaces on DUT node | ${dut2} | | | ... | ${sock1} | ${sock2} | ${number} | dut2-memif-${number}-if1 | | | ... | dut2-memif-${number}-if2 @@ -2133,8 +2138,7 @@ | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: -| | ... | - /tmp/memif-${number}-1 -| | ... | - /tmp/memif-${number}-2 +| | ... | - /tmp/memif-DUT1_VNF${number}-${sid} | | ... | | ... | *Example:* | | ... @@ -2147,8 +2151,8 @@ | | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${1} | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} | | :FOR | ${number} | IN RANGE | 1 | ${nr}+1 -| | | ${sock1}= | Set Variable | /tmp/memif-DUT1_VNF${number}-1 -| | | ${sock2}= | Set Variable | /tmp/memif-DUT1_VNF${number}-2 +| | | ${sock1}= | Set Variable | memif-DUT1_VNF +| | | ${sock2}= | Set Variable | memif-DUT1_VNF | | | Set up memif interfaces on DUT node | ${dut1} | | | ... | ${sock1} | ${sock2} | ${number} | dut1-memif-${number}-if1 | | | ... | dut1-memif-${number}-if2 @@ -2157,8 +2161,8 @@ | | | ... | ${dut1-memif-${number}-if1} | ${number} | | | Add interface to bridge domain | ${dut1} | | | ... | ${dut1-memif-${number}-if2} | ${bd_id2} -| | | ${sock1}= | Set Variable | /tmp/memif-DUT2_VNF${number}-1 -| | | ${sock2}= | Set Variable | /tmp/memif-DUT2_VNF${number}-2 +| | | ${sock1}= | Set Variable | memif-DUT2_VNF +| | | ${sock2}= | Set Variable | memif-DUT2_VNF | | | Set up memif interfaces on DUT node | ${dut2} | | | ... | ${sock1} | ${sock2} | ${number} | dut2-memif-${number}-if1 | | | ... | dut2-memif-${number}-if2 @@ -2166,3 +2170,4 @@ | | | ... | ${dut2-memif-${number}-if1} | ${number} | | | Add interface to bridge domain | ${dut2} | | | ... | ${dut2-memif-${number}-if2} | ${bd_id2} +