X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_configuration.robot;h=cdd3c9d02b412cc6e24b4bdfba3ac3e4b62908fa;hp=3255547e08ea229633336416eb53f6fd482ec732;hb=9ca5e946c7ea4b5740c257c71fe6d76eaa4206b4;hpb=176e4a72195cc5c80f73650af260ac491fb53469 diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 3255547e08..cdd3c9d02b 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -13,6 +13,7 @@ *** Settings *** | Library | Collections +| Library | String | Library | resources.libraries.python.topology.Topology | Library | resources.libraries.python.NodePath | Library | resources.libraries.python.DpdkUtil @@ -20,6 +21,7 @@ | Library | resources.libraries.python.VhostUser | Library | resources.libraries.python.TrafficGenerator | Library | resources.libraries.python.TrafficGenerator.TGDropRateSearchImpl +| Library | resources.libraries.python.Classify | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/counters.robot @@ -645,7 +647,6 @@ | | ... | ${sock1} | ${sock2} | dut2_vhost_if1 | dut2_vhost_if2 | | Configure L2XC | ${dut2} | ${dut2_if1} | ${dut2_vhost_if1} | | Configure L2XC | ${dut2} | ${dut2_if2} | ${dut2_vhost_if2} -| | All Vpp Interfaces Ready Wait | ${nodes} | Initialize L2 xconnect with Vhost-User for '${nr}' in 3-node circular topology | | [Documentation] @@ -722,7 +723,6 @@ | | ... | ${sock1} | ${sock2} | | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1} | | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} -| | All Vpp Interfaces Ready Wait | ${nodes} | Initialize L2 bridge domain in 3-node circular topology | | [Documentation] @@ -730,9 +730,321 @@ | | ... | that is created automatically with index 1. Learning is enabled. | | ... | Interfaces are brought up. | | ... +| | ... | *Arguments:* +| | ... | - bd_id - Bridge domain ID. Type: integer +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 bridge domain in 3-node circular topology \| 1 \| +| | ... +| | [Arguments] | ${bd_id}=${1} +| | ... +| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id} +| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id} +| | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${bd_id} +| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id} +| | All Vpp Interfaces Ready Wait | ${nodes} + +| Configure IPv4 ACLs +| | [Documentation] +| | ... | Configure ACL with required number of not-hitting permit ACEs plus two +| | ... | hitting ACEs for both traffic directions. +| | ... +| | ... | *Arguments:* +| | ... | - dut_node - DUT node. Type: dictionary +| | ... | - dut_if1 - DUT node interface1 name (Optional). Type: string +| | ... | - dut_if2 - DUT node interface2 name (Optional). Type: string +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Configure IPv4 ACLs \| ${nodes['DUT1']} \| GigabitEthernet0/7/0 \ +| | ... | \| GigabitEthernet0/8/0 \| +| | ... +| | ... | _NOTE:_ This KW uses following test case variables: +| | ... | - ${src_ip_start} - Source IP address start. Type: string +| | ... | - ${dst_ip_start} - Destination IP address start. Type: string +| | ... | - ${ip_step} - IP address step. Type: string +| | ... | - ${sport_start} - Source port number start. Type: string +| | ... | - ${dport_start} - Destination port number start. Type: string +| | ... | - ${port_step} - Port number step. Type: string +| | ... | - ${no_hit_aces_number} - Number of not-hitting ACEs to be configured. +| | ... | Type: integer +| | ... | - ${acl_apply_type} - To what path apply the ACL - input or output. +| | ... | Type: string +| | ... | - ${acl_action} - Action for the rule - deny, permit, permit+reflect. +| | ... | Type: string +| | ... | - ${trex_stream1_subnet} - IP subnet used by T-Rex in direction 0->1. +| | ... | Type: string +| | ... | - ${trex_stream2_subnet} - IP subnet used by T-Rex in direction 1->0. +| | ... | Type: string +| | ... +| | [Arguments] | ${dut} | ${dut_if1}=${None} | ${dut_if2}=${None} +| | ${src_ip_int} = | Evaluate +| | ... | int(ipaddress.ip_address(unicode($src_ip_start))) - $ip_step +| | ... | modules=ipaddress +| | ${dst_ip_int} = | Evaluate +| | ... | int(ipaddress.ip_address(unicode($dst_ip_start))) - $ip_step +| | ... | modules=ipaddress +| | ${ip_limit} = | Set Variable | 255.255.255.255 +| | ${ip_limit_int} = | Evaluate +| | ... | int(ipaddress.ip_address(unicode($ip_limit))) | modules=ipaddress +| | ${sport}= | Evaluate | $sport_start - $port_step +| | ${dport}= | Evaluate | $dport_start - $port_step +| | ${port_limit}= | Set Variable | ${65535} +| | ${acl}= | Set Variable | ipv4 permit +| | :FOR | ${nr} | IN RANGE | 0 | ${no_hit_aces_number} +| | | ${src_ip_int} = | Evaluate | $src_ip_int + $ip_step +| | | ${dst_ip_int} = | Evaluate | $dst_ip_int + $ip_step +| | | ${sport}= | Evaluate | $sport + $port_step +| | | ${dport}= | Evaluate | $dport + $port_step +| | | ${ipv4_limit_reached}= | Set Variable If +| | | ... | $src_ip_int > $ip_limit_int or $src_ip_int > $ip_limit_int +| | | ... | ${True} +| | | ${udp_limit_reached}= | Set Variable If +| | | ... | $sport > $port_limit or $dport > $port_limit | ${True} +| | | Run Keyword If | $ipv4_limit_reached is True | Log +| | | ... | Can't do more iterations - IPv4 address limit has been reached. +| | | ... | WARN +| | | Run Keyword If | $udp_limit_reached is True | Log +| | | ... | Can't do more iterations - UDP port limit has been reached. +| | | ... | WARN +| | | ${src_ip} = | Run Keyword If | $ipv4_limit_reached is True +| | | ... | Set Variable | ${ip_limit} +| | | ... | ELSE | Evaluate | str(ipaddress.ip_address($src_ip_int)) +| | | ... | modules=ipaddress +| | | ${dst_ip} = | Run Keyword If | $ipv4_limit_reached is True +| | | ... | Set Variable | ${ip_limit} +| | | ... | ELSE | Evaluate | str(ipaddress.ip_address($dst_ip_int)) +| | | ... | modules=ipaddress +| | | ${sport}= | Set Variable If | ${sport} > $port_limit | $port_limit +| | | ... | ${sport} +| | | ${dport}= | Set Variable If | ${dport} > $port_limit | $port_limit +| | | ... | ${dport} +| | | ${acl}= | Catenate | ${acl} | src ${src_ip}/32 dst ${dst_ip}/32 +| | | ... | sport ${sport} | dport ${dport}, +| | | Exit For Loop If +| | | ... | $ipv4_limit_reached is True or $udp_limit_reached is True +| | ${acl}= | Catenate | ${acl} +| | ... | ipv4 ${acl_action} src ${trex_stream1_subnet}, +| | ... | ipv4 ${acl_action} src ${trex_stream2_subnet} +| | Add Replace Acl Multi Entries | ${dut} | rules=${acl} +| | @{acl_list}= | Create List | ${0} +| | Run Keyword If | 'input' in $acl_apply_type and $dut_if1 is not None +| | ... | Set Acl List For Interface | ${dut} | ${dut_if1} | input | ${acl_list} +| | Run Keyword If | 'input' in $acl_apply_type and $dut_if2 is not None +| | ... | Set Acl List For Interface | ${dut} | ${dut_if2} | input | ${acl_list} +| | Run Keyword If | 'output' in $acl_apply_type and $dut_if1 is not None +| | ... | Set Acl List For Interface | ${dut} | ${dut_if1} | output +| | ... | ${acl_list} +| | Run Keyword If | 'output' in $acl_apply_type and $dut_if2 is not None +| | ... | Set Acl List For Interface | ${dut} | ${dut_if2} | output +| | ... | ${acl_list} + +| Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology +| | [Documentation] +| | ... | Setup L2BD topology by adding two interfaces on DUT1 into bridge +| | ... | domain that is created automatically with index 1. Learning is +| | ... | enabled. Interfaces are brought up. Apply required ACL rules to DUT1 +| | ... | interfaces. +| | ... +| | ... | *Arguments:* +| | ... | _None_ +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node \ +| | ... | circular topology \| +| | ... +| | ... | _NOTE:_ This KW uses following test case variables: +| | ... | - ${dut1} - DUT1 node. +| | ... | - ${dut2} - DUT2 node. +| | ... | - ${dut1_if1} - DUT1 interface towards TG. +| | ... | - ${dut1_if2} - DUT1 interface towards DUT2. +| | ... | - ${dut2_if1} - DUT2 interface towards DUT1. +| | ... | - ${dut2_if2} - DUT2 interface towards TG. +| | ... +| | Configure L2BD forwarding | ${dut1} | ${dut1_if1} | ${dut1_if2} +| | Configure L2XC | ${dut2} | ${dut2_if1} | ${dut2_if2} +| | All Vpp Interfaces Ready Wait | ${nodes} +| | Configure IPv4 ACLs | ${dut1} | ${dut1_if1} | ${dut1_if2} + +| Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in 3-node circular topology +| | [Documentation] +| | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular +| | ... | topology. Get the interface MAC addresses and setup ARP on all VPP +| | ... | interfaces. Setup IPv4 addresses with /24 prefix on DUT-TG links and +| | ... | /30 prefix on DUT1-DUT2 link. Set routing on both DUT nodes with +| | ... | prefix /24 and next hops of neighbour DUT interface IPv4 address. +| | ... | Apply required ACL rules to DUT1 interfaces. +| | ... +| | ... | *Arguments:* +| | ... | - ip_nr - Number of IPs to be used. Type: integer or string +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize IPv4 routing for '10' addresses with IPv4 ACLs on DUT1 \ +| | ... | in 3-node circular topology \| +| | ... +| | ... | _NOTE:_ This KW uses following test case variables: +| | ... | - ${dut1} - DUT1 node. +| | ... | - ${dut2} - DUT2 node. +| | ... | - ${dut1_if1} - DUT1 interface towards TG. +| | ... | - ${dut1_if2} - DUT1 interface towards DUT2. +| | ... | - ${dut2_if1} - DUT2 interface towards DUT1. +| | ... | - ${dut2_if2} - DUT2 interface towards TG. +| | ... +| | Set Interface State | ${dut1} | ${dut1_if1} | up +| | Set Interface State | ${dut1} | ${dut1_if2} | up +| | Set Interface State | ${dut2} | ${dut2_if1} | up +| | Set Interface State | ${dut2} | ${dut2_if2} | up +| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} +| | ${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} +| | :FOR | ${number} | IN RANGE | 2 | ${ip_nr}+2 +| | | Add arp on dut | ${dut1} | ${dut1_if1} | 10.10.10.${number} +| | | ... | ${tg1_if1_mac} +| | | Add arp on dut | ${dut2} | ${dut2_if2} | 20.20.20.${number} +| | | ... | ${tg1_if2_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} +| | Configure IP addresses on interfaces +| | ... | ${dut1} | ${dut1_if1} | 10.10.10.1 | 24 +| | ... | ${dut1} | ${dut1_if2} | 1.1.1.1 | 30 +| | ... | ${dut2} | ${dut2_if1} | 1.1.1.2 | 30 +| | ... | ${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} +| | Configure IPv4 ACLs | ${dut1} | ${dut1_if1} | ${dut1_if2} + +| Configure MACIP ACLs +| | [Documentation] +| | ... | Configure MACIP ACL with required number of not-hitting permit ACEs +| | ... | plus two hitting ACEs for both traffic directions. +| | ... +| | ... | *Arguments:* +| | ... | - dut_node - DUT node. Type: dictionary +| | ... | - dut_if1 - DUT node interface1 name (Optional). Type: string +| | ... | - dut_if2 - DUT node interface2 name (Optional). Type: string +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Configure MACIP ACLs \| ${nodes['DUT1']} \| GigabitEthernet0/7/0 \ +| | ... | \| GigabitEthernet0/8/0 \| +| | ... +| | ... | _NOTE:_ This KW uses following test case variables: +| | ... | - ${tg_if1_mac} - MAC address of TG interface towards DUT1. +| | ... | Type: string +| | ... | - ${tg_if2_mac} - MAC address of TG interface towards DUT2. +| | ... | Type: string +| | ... | - ${src_ip_start} - Source IP address start. Type: string +| | ... | - ${ip_step} - IP address step. Type: string +| | ... | - ${src_mac_start} - Source MAC address start in format with colons. +| | ... | Type: string +| | ... | - ${src_mac_step} - Source MAC address step. Type: string +| | ... | - ${src_mac_mask} - Source MAC address mask. 00:00:00:00:00:00 is a +| | ... | wildcard mask. Type: string +| | ... | - ${no_hit_aces_number} - Number of not-hitting ACEs to be configured. +| | ... | Type: integer +| | ... | - ${acl_action} - Action for the rule - deny, permit, permit+reflect. +| | ... | Type: string +| | ... | - ${trex_stream1_subnet} - IP subnet used by T-Rex in direction 0->1. +| | ... | Type: string +| | ... | - ${trex_stream2_subnet} - IP subnet used by T-Rex in direction 1->0. +| | ... | Type: string +| | ... | - ${tg_mac_mask} - MAC address mask for traffic streams. +| | ... | 00:00:00:00:00:00 is a wildcard mask. Type: string +| | ... +| | [Arguments] | ${dut} | ${dut_if1}=${None} | ${dut_if2}=${None} +| | ${src_ip_int} = | Evaluate +| | ... | int(ipaddress.ip_address(unicode($src_ip_start))) - $ip_step +| | ... | modules=ipaddress +| | ${ip_limit} = | Set Variable | 255.255.255.255 +| | ${ip_limit_int} = | Evaluate +| | ... | int(ipaddress.ip_address(unicode($ip_limit))) | modules=ipaddress +| | ${src_mac_int} = | Evaluate +| | ... | int($src_mac_start.replace(':', ''), 16) - $src_mac_step +| | ${mac_limit} = | Set Variable | ff:ff:ff:ff:ff:ff +| | ${mac_limit_int} = | Evaluate +| | ... | int($mac_limit.replace(':', ''), 16) +| | ${acl}= | Set Variable | ipv4 permit +| | :FOR | ${nr} | IN RANGE | 0 | ${no_hit_aces_number} +| | | ${src_ip_int} = | Evaluate | $src_ip_int + $ip_step +| | | ${src_mac_int} = | Evaluate | $src_mac_int + $src_mac_step +| | | ${ipv4_limit_reached}= | Set Variable If +| | | ... | $src_ip_int > $ip_limit_int | ${True} +| | | ${mac_limit_reached}= | Set Variable If +| | | ... | $src_mac_int > $mac_limit_int | ${True} +| | | Run Keyword If | $ipv4_limit_reached is True | Log +| | | ... | Can't do more iterations - IPv4 address limit has been reached. +| | | ... | WARN +| | | Run Keyword If | $mac_limit_reached is True | Log +| | | ... | Can't do more iterations - MAC address limit has been reached. +| | | ... | WARN +| | | ${src_ip} = | Run Keyword If | $ipv4_limit_reached is True +| | | ... | Set Variable | ${ip_limit} +| | | ... | ELSE | Evaluate | str(ipaddress.ip_address($src_ip_int)) +| | | ... | modules=ipaddress +| | | ${src_mac}= | Run Keyword If | $mac_limit_reached is True +| | | ... | Set Variable | ${mac_limit} +| | | ... | ELSE | Evaluate +| | | ... | ':'.join(textwrap.wrap("{:012x}".format($src_mac_int), width=2)) +| | | ... | modules=textwrap +| | | ${acl}= | Catenate | ${acl} | ip ${src_ip}/32 +| | | ... | mac ${src_mac} | mask ${src_mac_mask}, +| | | Exit For Loop If +| | | ... | $ipv4_limit_reached is True or $mac_limit_reached is True +| | ${acl}= | Catenate | ${acl} +| | ... | ipv4 ${acl_action} ip ${trex_stream1_subnet} mac ${tg_if1_mac} +| | ... | mask ${tg_mac_mask}, +| | ... | ipv4 ${acl_action} ip ${trex_stream2_subnet} mac ${tg_if2_mac} +| | ... | mask ${tg_mac_mask} +| | Add Macip Acl Multi Entries | ${dut} | rules=${acl} +| | ${acl_idx}= | Set Variable | 0 +| | Run Keyword If | $dut_if1 is not None +| | ... | Add Del Macip Acl Interface | ${dut} | ${dut_if1} | add | ${acl_idx} +| | Run Keyword If | $dut_if2 is not None +| | ... | Add Del Macip Acl Interface | ${dut} | ${dut_if2} | add | ${acl_idx} + +| Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology +| | [Documentation] +| | ... | Setup L2BD topology by adding two interfaces on DUT1 into bridge +| | ... | domain that is created automatically with index 1. Learning is +| | ... | enabled. Interfaces are brought up. Apply required MACIP ACL rules to +| | ... | DUT1 interfaces. +| | ... +| | ... | *Arguments:* +| | ... | _None_ +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node \ +| | ... | circular topology \| +| | ... +| | ... | _NOTE 1:_ This KW uses following test case variables: +| | ... | - ${tg} - TG node. +| | ... | - ${dut1} - DUT1 node. +| | ... | - ${dut2} - DUT2 node. +| | ... | - ${tg_if1} - TG interface towards DUT1. +| | ... | - ${tg_if2} - TG interface towards DUT2. +| | ... | - ${dut1_if1} - DUT1 interface towards TG. +| | ... | - ${dut1_if2} - DUT1 interface towards DUT2. +| | ... | - ${dut2_if1} - DUT2 interface towards DUT1. +| | ... | - ${dut2_if2} - DUT2 interface towards TG. +| | ... +| | ... | _NOTE 2:_ This KW sets following test case variables: +| | ... | - ${tg_if1_mac} - MAC address of TG interface towards DUT1. +| | ... | - ${tg_if2_mac} - MAC address of TG interface towards DUT2. +| | ... | | Configure L2BD forwarding | ${dut1} | ${dut1_if1} | ${dut1_if2} -| | Configure L2BD forwarding | ${dut2} | ${dut2_if1} | ${dut2_if2} +| | Configure L2XC | ${dut2} | ${dut2_if1} | ${dut2_if2} | | All Vpp Interfaces Ready Wait | ${nodes} +| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} +| | Set Test Variable | ${tg_if1_mac} +| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} +| | Set Test Variable | ${tg_if2_mac} +| | Configure MACIP ACLs | ${dut1} | ${dut1_if1} | ${dut1_if2} | Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | [Documentation] @@ -773,7 +1085,6 @@ | | Add interface to bridge domain | ${dut2} | ${dut2_vhost_if1} | ${bd_id1} | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} | | Add interface to bridge domain | ${dut2} | ${dut2_vhost_if2} | ${bd_id2} -| | All Vpp Interfaces Ready Wait | ${nodes} | Initialize L2 bridge domains with Vhost-User for '${nr}' VMs in 3-node circular topology | | [Documentation] @@ -888,7 +1199,6 @@ | | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1} | | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} -| | All Vpp Interfaces Ready Wait | ${nodes} | Initialize L2 bridge domains with Vhost-User in 2-node circular topology | | [Documentation] @@ -915,6 +1225,42 @@ | | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1} | | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2} | | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2} + +| Initialize L2 bridge domains with VLAN dot1q sub-interfaces in a 3-node circular topology +| | [Documentation] +| | ... | Setup L2 bridge domain topology with learning enabled with VLAN +| | ... | between DUTs by connecting physical and vlan interfaces on each DUT. +| | ... | All interfaces are brought up. +| | ... +| | ... | *Arguments:* +| | ... | - bd_id1 - Bridge domain ID. Type: integer +| | ... | - bd_id2 - Bridge domain ID. Type: integer +| | ... | - subid - ID of the sub-interface to be created. Type: string +| | ... | - tag_rewrite - Method of tag rewrite. Type: string +| | ... +| | ... | _NOTE:_ This KW uses following test case variables: +| | ... | - ${dut1} - DUT1 node. +| | ... | - ${dut2} - DUT2 node. +| | ... | - ${dut1_if2} - DUT1 interface towards DUT2. +| | ... | - ${dut2_if1} - DUT2 interface towards DUT1. +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 bridge domains with VLAN dot1q sub-interfaces +| | ... | in a 3-node circular topology \| 1 \| 2 \| 10 \| pop-1 \| +| | ... +| | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} +| | ... +| | Set interfaces in path in 3-node circular topology up +| | Initialize VLAN dot1q sub-interfaces in 3-node circular topology +| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} +| | Configure L2 tag rewrite method on interfaces +| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} +| | ... | ${tag_rewrite} +| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id1} +| | Add interface to bridge domain | ${dut2} | ${subif_index_2} | ${bd_id2} +| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} | | All Vpp Interfaces Ready Wait | ${nodes} | Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology @@ -959,7 +1305,6 @@ | | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1} | | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} -| | All Vpp Interfaces Ready Wait | ${nodes} | Add PCI devices to DUTs in 3-node single link topology | | [Documentation] @@ -1026,8 +1371,8 @@ | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} -| | Run Keyword | ${vm_name}.Build QEMU | ${dut_node} -| | ... | apply_patch=${apply_patch} +| | 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 Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1071,6 +1416,8 @@ | | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM${number} | | | ... | skip=${skip_cpus} | count=${vm_cpus} | qemu_id=${number} | | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM${number} | ${vm2} +| | | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} +| | | ... | ${True} | Configure guest VM with dpdk-testpmd using SMT connected via vhost-user | | [Documentation] @@ -1107,8 +1454,8 @@ | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} -| | Run Keyword | ${vm_name}.Build QEMU | ${dut_node} -| | ... | apply_patch=${apply_patch} +| | 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 Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1172,8 +1519,8 @@ | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} -| | Run Keyword | ${vm_name}.Build QEMU | ${dut_node} -| | ... | apply_patch=${apply_patch} +| | 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 Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1225,6 +1572,8 @@ | | | ... | ${dut2-vhost-${number}-if2_mac} | skip=${skip_cpus} | | | ... | count=${vm_cpus} | qemu_id=${number} | | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM${number} | ${vm2} +| | | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built} +| | | ... | ${True} | Configure guest VM with dpdk-testpmd-mac using SMT connected via vhost-user | | [Documentation] @@ -1263,8 +1612,8 @@ | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} | | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} | | ... | ${True} -| | Run Keyword | ${vm_name}.Build QEMU | ${dut_node} -| | ... | apply_patch=${apply_patch} +| | 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 Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1309,7 +1658,10 @@ | | ... | skip_cnt=${skip} | cpu_cnt=${count} | smt_used=${False} | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1} | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} -| | Run Keyword | ${vm_name}.Build QEMU | ${dut_node} | apply_patch=${True} +| | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} +| | ... | ${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 Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1356,7 +1708,10 @@ | | ... | skip_cnt=${skip} | cpu_cnt=${count} | smt_used=${True} | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1} | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} -| | Run Keyword | ${vm_name}.Build QEMU | ${dut_node} | apply_patch=${True} +| | ${apply_patch}= | Set Variable If | "${perf_qemu_qsz}" == "256" | ${False} +| | ... | ${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 Node | ${dut_node} | | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1 @@ -1597,13 +1952,13 @@ | | Add arp on dut | ${dut2} | ${dut2_if1} | ${dut1_dut2_ip4_address} | | ... | ${dut1_if2_mac} -| Initialize SNAT in 3-node circular topology -| | [Documentation] | Initialization of 3-node topology with SNAT between DUTs: +| Initialize NAT44 in 3-node circular topology +| | [Documentation] | Initialization of 3-node topology with NAT44 between DUTs: | | ... | - set interfaces up | | ... | - set IP addresses | | ... | - set ARP | | ... | - create routes -| | ... | - set SNAT - only on DUT1 +| | ... | - set NAT44 - only on DUT1 | | ... | | Set Interface State | ${dut1} | ${dut1_if1} | up | | Set Interface State | ${dut1} | ${dut1_if2} | up @@ -1633,7 +1988,7 @@ | | ... | | Configure inside and outside interfaces | | ... | ${dut1} | ${dut1_if1} | ${dut1_if2} -| | Configure deterministic mode for SNAT +| | Configure deterministic mode for NAT44 | | ... | ${dut1} | 20.0.0.0 | 18 | 200.0.0.0 | 30 | Initialize L2 xconnect for '${nr}' memif pairs in 3-node circular topology @@ -1659,8 +2014,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-${number}-1 -| | | ${sock2}= | Set Variable | /tmp/memif-${number}-2 +| | | ${sock1}= | Set Variable | /tmp/memif-DUT1_VNF${number}-1 +| | | ${sock2}= | Set Variable | /tmp/memif-DUT1_VNF${number}-2 | | | ${prev_index}= | Evaluate | ${number}-1 | | | Set up memif interfaces on DUT node | ${dut1} | | | ... | ${sock1} | ${sock2} | ${number} | dut1-memif-${number}-if1 @@ -1669,6 +2024,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 | | | Set up memif interfaces on DUT node | ${dut2} | | | ... | ${sock1} | ${sock2} | ${number} | dut2-memif-${number}-if1 | | | ... | dut2-memif-${number}-if2 @@ -1680,3 +2037,48 @@ | | | ... | ${dut1} | ${dut1-memif-${number}-if2} | ${dut1_if2} | | | Run Keyword If | ${number}==${nr} | Configure L2XC | | | ... | ${dut2} | ${dut2-memif-${number}-if2} | ${dut2_if2} + +| Initialize L2 Bridge Domain for '${nr}' memif pairs in 3-node circular topology +| | [Documentation] +| | ... | Create pairs of Memif interfaces on all defined VPP nodes. Put each +| | ... | Memif interface to separate L2 bridge domain with one physical or +| | ... | virtual interface to create a chain accross DUT node. +| | ... +| | ... | *Arguments:* +| | ... | _None_ +| | ... +| | ... | *Note:* +| | ... | Socket paths for Memif are defined in following format: +| | ... | - /tmp/memif-${number}-1 +| | ... | - /tmp/memif-${number}-2 +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 Bridge Domain for '1' memif pairs in 3-node circular\ +| | ... | topology \| +| | ... +| | ${bd_id2}= | Evaluate | ${nr}+1 +| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${1} +| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2} +| | 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 +| | | Set up memif interfaces on DUT node | ${dut1} +| | | ... | ${sock1} | ${sock2} | ${number} | dut1-memif-${number}-if1 +| | | ... | dut1-memif-${number}-if2 +| | | ${bd_id2}= | Evaluate | ${number}+1 +| | | Add interface to bridge domain | ${dut1} +| | | ... | ${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 +| | | Set up memif interfaces on DUT node | ${dut2} +| | | ... | ${sock1} | ${sock2} | ${number} | dut2-memif-${number}-if1 +| | | ... | dut2-memif-${number}-if2 +| | | Add interface to bridge domain | ${dut2} +| | | ... | ${dut2-memif-${number}-if1} | ${number} +| | | Add interface to bridge domain | ${dut2} +| | | ... | ${dut2-memif-${number}-if2} | ${bd_id2}