From: Tibor Frank Date: Wed, 7 Jun 2017 12:26:59 +0000 (+0200) Subject: CSIT-663: Remove unused keywords X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=4e565011b2e53f99fb78e1143e6543b3427de79a CSIT-663: Remove unused keywords Change-Id: Ib3f0edb0c3a48a760040886e5aedce81c9baeac2 Signed-off-by: Tibor Frank --- diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot index c660736c97..d6952db120 100644 --- a/resources/libraries/robot/default.robot +++ b/resources/libraries/robot/default.robot @@ -205,26 +205,6 @@ | | Add CPU config | ${dut1} | ${dut1_cpu} | | Add rxqueues config | ${dut1} | ${rxqueues} -| Add worker threads and rxqueues to all DUTs -| | [Documentation] | Setup worker threads and rxqueues in VPP startup\ -| | ... | configuration to all DUTs. -| | ... -| | ... | *Arguments:* -| | ... | - ${cpu} - CPU configuration. Type: string -| | ... | - ${rxqueues} - rxqueues configuration. Type: string -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Add worker threads and rxqueues to all DUTs \| main-core 0 \ -| | ... | \| rxqueues 2 \| -| | ... -| | [Arguments] | ${cpu} | ${rxqueues} -| | ... -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Add CPU config | ${nodes['${dut}']} | ${cpu} -| | | Add rxqueues config | ${nodes['${dut}']} | ${rxqueues} - | Add all PCI devices to all DUTs | | [Documentation] | Add all available PCI devices from topology file to VPP\ | | ... | startup configuration to all DUTs. @@ -289,8 +269,7 @@ | | | Add SNAT Config | ${nodes['${dut}']} | Add cryptodev to all DUTs -| | [Documentation] | AddCryptodev to VPP startup configuration to all -| | ... | DUTs +| | [Documentation] | AddCryptodev to VPP startup configuration to all DUTs. | | ... | | ... | *Arguments:* | | ... | - ${count} - Number of QAT devices. Type: integer @@ -327,14 +306,6 @@ | | Add all PCI devices to all DUTs | | Apply startup configuration on all VPP DUTs -| Setup 2-node startup configuration of VPP on all DUTs -| | [Documentation] | Setup default startup configuration of VPP to all DUTs. -| | ... -| | Remove startup configuration of VPP from all DUTs -| | Add '1' worker threads and '1' rxqueues in 2-node single-link circular topology -| | Add all PCI devices to all DUTs -| | Apply startup configuration on all VPP DUTs - | Apply startup configuration on all VPP DUTs | | [Documentation] | Apply startup configuration of VPP and restart VPP on all\ | | ... | DUTs. diff --git a/resources/libraries/robot/honeycomb/bridge_domain.robot b/resources/libraries/robot/honeycomb/bridge_domain.robot index 8f17edafc2..e680e82ad4 100644 --- a/resources/libraries/robot/honeycomb/bridge_domain.robot +++ b/resources/libraries/robot/honeycomb/bridge_domain.robot @@ -178,39 +178,6 @@ | | | Should contain | ${if_indices} | ${interface['sw_if_index']} | | | Should be equal | ${interface['shg']} | ${settings['split_horizon_group']} -| Honeycomb should not show interfaces assigned to bridge domain -| | [Documentation] | Uses Honeycomb API to verify interfaces are not assigned\ -| | ... | to bridge domain. -| | ... -| | ... | *Arguments:* -| | ... | - node - Information about a DUT node. Type: dictionary -| | ... | - interface1, interface2 - Names of interfaces to check\ -| | ... | bridge domain assignment on. Type: string -| | ... | - bd_name - Name of the bridge domain. Type: string -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Honeycomb should not show interfaces assigned to bridge domain \ -| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| GigabitEthernet0/9/0 \ -| | ... | \| bd-04 \| -| | [Arguments] | ${node} | ${interface1} | ${interface2} | ${bd_name} -| | ${if1_data_oper}= | interfaceAPI.Get interface oper data -| | ... | ${node} | ${interface1} -| | ${if2_data_oper}= | interfaceAPI.Get interface oper data -| | ... | ${node} | ${interface2} -| | ${if1_data_cfg}= -| | ... | interfaceAPI.Get interface cfg data | ${node} | ${interface1} -| | ${if1_data_cfg}= -| | ... | interfaceAPI.Get interface cfg data | ${node} | ${interface2} -| | Run keyword and expect error | *KeyError: 'v3po:l2'* -| | ... | Set Variable | ${if1_data_oper['v3po:l2']} -| | Run keyword and expect error | *KeyError: 'v3po:l2'* -| | ... | Set Variable | ${if2_data_oper['v3po:l2']} -| | Run keyword and expect error | *KeyError: 'v3po:l2'* -| | ... | Set Variable | ${if1_data_cfg['v3po:l2']} -| | Run keyword and expect error | *KeyError: 'v3po:l2'* -| | ... | Set Variable | ${if2_data_cfg['v3po:l2']} - | Honeycomb removes all bridge domains | | [Documentation] | Uses Honeycomb API to remove all bridge domains from the \ | | ... | VPP node. @@ -316,18 +283,3 @@ | | ${if_data}= | interfaceAPI.Get BD Oper Data From Interface | | ... | ${node} | ${interface} | | interfaceAPI.Compare Data Structures | ${if_data} | ${bd_settings} - -| VAT removes bridge domain -| | [Documentation] Remove the specified bridge domain using VAT. -| | ... -| | ... | *Arguments:* -| | ... | - node - Information about a DUT node. Type: dictionary -| | ... | - bd_id - Bridge domain ID. Type: integer -| | ... -| | ... | *Example:* -| | ... | \| VAT removes bridge domain \ -| | ... | \| ${nodes['DUT1']} \| 1 \| -| | ... -| | [Arguments] | ${node} | ${bd_id} -| | ... -| | Delete Bridge Domain VAT | ${node} | ${bd_id} diff --git a/resources/libraries/robot/honeycomb/nat.robot b/resources/libraries/robot/honeycomb/nat.robot index 81bffe66d7..2b79c1b407 100644 --- a/resources/libraries/robot/honeycomb/nat.robot +++ b/resources/libraries/robot/honeycomb/nat.robot @@ -69,22 +69,6 @@ | | ... | ${data['nat-instances']['nat-instance'][${instance}]['mapping-table']} | | Compare data structures | ${data} | ${settings} -| NAT entries from VAT should be -| | [Documentation] | Uses VPP test API to retrieve NAT entries\ -| | ... | and compares against expected settings. -| | ... -| | ... | *Arguments:* -| | ... | - node - information about a DUT node. Type: dictionary -| | ... | - settings - NAT entry to expect. Type: dictionary -| | ... -| | ... | *Example:* -| | ... -| | ... | \| NAT entries from VAT should be \| ${nodes['DUT1']} \ -| | ... | \| ${settings} \| -| | [Arguments] | ${node} | ${settings} -| | ${data}= | VPP get NAT static mappings | ${node} -| | Compare data structures | ${data} | ${settings} - | Honeycomb configures NAT on interface | | [Documentation] | Uses Honeycomb API to configure NAT on an interface. | | ... diff --git a/resources/libraries/robot/honeycomb/nsh.robot b/resources/libraries/robot/honeycomb/nsh.robot index 434c72f516..fbb5b89567 100644 --- a/resources/libraries/robot/honeycomb/nsh.robot +++ b/resources/libraries/robot/honeycomb/nsh.robot @@ -124,21 +124,6 @@ | | ${oper_data}= | Get NSH oper data | ${node} | map_name=${name} | | Compare data structures | ${oper_data} | ${data} -| NSH entry from Honeycomb should not exist -| | [Documentation] | Retrieves oper data for NSH entry and expects to fail. -| | ... -| | ... | *Arguments:* -| | ... | - node - information about a DUT node. Type: dict -| | ... | - name - name of the NSH entry. Type: string -| | ... -| | ... | *Example:* -| | ... -| | ... | \| NSH entry from Honeycomb should not exist \| ${nodes['DUT1']} \ -| | ... | \| nsh_1 \| -| | [Arguments] | ${node} | ${name} -| | Run keyword and expect error | *Status code: 404* -| | ... | Get NSH oper data | ${node} | entry_name=${name} - | NSH map from Honeycomb should not exist | | [Documentation] | Retrieves oper data for NSH map and expects to fail. | | ... diff --git a/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot b/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot index 7385f1c15f..bb8aa78f41 100644 --- a/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot +++ b/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot @@ -54,46 +54,6 @@ | | ... | | Delete PBB Sub Interface | ${node} | ${super_if} -| PBB Sub Interface Operational Data From Honeycomb Should Be -| | [Documentation] | Retrieves PBB sub-interface operational data from -| | ... | Honeycomb and compares with expected configuration. -| | ... -| | ... | *Arguments:* -| | ... | - node - Information about a DUT node. Type: dictionary -| | ... | - super_if - Super-interface. Type: string -| | ... | - sub_if_id - Sub-interface ID. Type: string -| | ... | - expected_params - Expected operational data. Type: dictionary -| | ... -| | ... | *Example:* -| | ... | \| PBB sub interface operational data from Honeycomb should be\ -| | ... | \| ${node} \| ${super_if} \| ${cfg_pbb_sub_if_1_ID}\ -| | ... | \| ${oper_pbb_sub_if_1} \| -| | ... -| | [Arguments] | ${node} | ${super_if} | ${sub_if_id} | ${expected_params} -| | ... -| | ${data}= | IfAPI.Get PBB Sub Interface Oper Data -| | ... | ${node} | ${super_if} | ${sub_if_id} -| | Compare data structures | ${data} | ${expected_params} - -| PBB Sub Interface Operational Data From Honeycomb Should Be Empty -| | [Documentation] | Retrieves interface BPP configuration from Honeycomb,\ -| | ... | and expects an empty dictionary. -| | ... -| | ... | *Arguments:* -| | ... | - node - Information about a DUT node. Type: dictionary -| | ... | - super_if - Super-interface. Type: string -| | ... | - sub_if_id - Sub-interface ID. Type: string -| | ... -| | ... | *Example:* -| | ... | \| PBB sub interface operational data from Honeycomb should be empty\ -| | ... | \| ${node} \| ${super_if} \| ${cfg_pbb_sub_if_1_ID} \| -| | ... -| | [Arguments] | ${node} | ${super_if} | ${sub_if_id} -| | ... -| | ${data}= | IfAPI.Get PBB Sub Interface Oper Data -| | ... | ${node} | ${super_if} | ${sub_if_id} -| | Should be empty | ${data} - | Honeycomb fails to create PBB sub-interface | | [Documentation] | Uses Honeycomb API to set PBB sub-interface with wrong\ | | ... | parameter(s) and expects to fail. diff --git a/resources/libraries/robot/honeycomb/sub_interface.robot b/resources/libraries/robot/honeycomb/sub_interface.robot index 1b1b80049b..4b93de9b8c 100644 --- a/resources/libraries/robot/honeycomb/sub_interface.robot +++ b/resources/libraries/robot/honeycomb/sub_interface.robot @@ -432,23 +432,6 @@ | | ... | interfaceAPI.Configure tag rewrite | | ... | ${node} | ${super_if} | ${identifier} | ${settings} -| VAT disables tag-rewrite -| | [Documentation] | The keyword disables the tag-rewrite using VAT. -| | ... -| | ... | *Arguments:* -| | ... | - node - Information about a DUT node. Type: dictionary -| | ... | - sub_interface - Name of an sub-interface on the specified node.\ -| | ... | Type: string -| | ... -| | ... | *Example:* -| | ... | \| VAT disables tag-rewrite\ -| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0.1 \| -| | ... -| | [Arguments] | ${node} | ${sub_interface} -| | ... -| | ${sw_if_index}= | interfaceCLI.Get sw if index | ${node} | ${sub_interface} -| | L2 tag rewrite | ${node} | ${sw_if_index} | disable - | Honeycomb sets sub-interface ipv4 address | | [Documentation] | Uses Honeycomb API to configure an ipv4 address on the\ | | ... | spcified sub-interface. Replaces any existing ipv4 addresses. diff --git a/resources/libraries/robot/ipv4.robot b/resources/libraries/robot/ipv4.robot index d200afdea2..3fa522f5c5 100644 --- a/resources/libraries/robot/ipv4.robot +++ b/resources/libraries/robot/ipv4.robot @@ -57,9 +57,6 @@ | | Configure routes for IPv4 test | ${nodes} | ${nodes_ipv4_addr} | | All Vpp Interfaces Ready Wait | ${nodes} -| TG interface "${tg_port}" can route to node "${node}" interface "${port}" "${hops}" hops away using IPv4 -| | Node "${nodes['TG']}" interface "${tg_port}" can route to node "${node}" interface "${port}" "${hops}" hops away using IPv4 - | Route traffic from interface '${from_port}' on node '${from_node}' to interface '${to_port}' on node '${to_node}' '${hops}' hops away using IPv4 | | ${src_ip}= | Get IPv4 address of node "${from_node}" interface "${from_port}" from "${nodes_ipv4_addr}" | | ${dst_ip}= | Get IPv4 address of node "${to_node}" interface "${to_port}" from "${nodes_ipv4_addr}" @@ -111,12 +108,12 @@ | Configure IP addresses on interfaces | | [Documentation] | Iterates through @{args} list and Set Interface Address -| | ... | for every (${dut_node}, ${interface}, ${address}, -| | ... | ${prefix}) tuple. +| | ... | for every (${dut_node}, ${interface}, ${address}, +| | ... | ${prefix}) tuple. | | ... | | ... | *Arguments:* | | ... | - ${dut_node} - Node where IP address should be set to. -| | ... | Type: dictionary +| | ... | Type: dictionary | | ... | - ${interface} - Interface name. Type: string | | ... | - ${address} - IP address. Type: string | | ... | - ${prefix} - Prefix length. Type: integer @@ -134,12 +131,12 @@ | Send ICMP echo request and verify answer | | [Documentation] | Run traffic script that waits for ICMP reply and ignores -| | ... | all other packets. +| | ... | all other packets. | | ... | | ... | *Arguments:* | | ... | - tg_node - TG node where run traffic script. Type: dictionary | | ... | - tg_interface - TG interface where send ICMP echo request. -| | ... | Type: string +| | ... | Type: string | | ... | - dst_mac - Destination MAC address. Type: string | | ... | - src_mac - Source MAC address. Type: string | | ... | - dst_ip - Destination IP address. Type: string diff --git a/resources/libraries/robot/ipv6.robot b/resources/libraries/robot/ipv6.robot index 35905af02a..b82c995e3a 100644 --- a/resources/libraries/robot/ipv6.robot +++ b/resources/libraries/robot/ipv6.robot @@ -48,7 +48,7 @@ | Execute IPv6 ICMP echo sweep | | [Documentation] | Type of the src_node must be TG and dst_node must be DUT | | [Arguments] | ${src_node} | ${dst_node} | ${start_size} | ${end_size} -| | ... | ${step} | ${nodes_addr} +| | ... | ${step} | ${nodes_addr} | | Append Nodes | ${src_node} | ${dst_node} | | Compute Path | | ${src_port} | ${src_node}= | First Interface @@ -121,7 +121,7 @@ | Ipv6 tg to tg routed | | [Documentation] | Send traffic from one TG port to another through DUT nodes -| | ... | and send reply back, also verify hop limit processing +| | ... | and send reply back, also verify hop limit processing | | [Arguments] | ${tg_node} | ${first_dut} | ${second_dut} | ${nodes_addr} | | Append Nodes | ${tg_node} | ${first_dut} | ${second_dut} | ${tg_node} | | Compute Path @@ -168,11 +168,6 @@ | | | Set Interface State | @{interface} | up | if_type=name | | All Vpp Interfaces Ready Wait | ${nodes} -| Clear ipv6 on all dut in topology -| | [Documentation] | Remove IPv6 address on all DUTs -| | [Arguments] | ${nodes} | ${nodes_addr} -| | Nodes Clear Ipv6 Addresses | ${nodes} | ${nodes_addr} - | Suppress ICMPv6 router advertisement message | | [Documentation] | Suppress ICMPv6 router advertisement message for link scope address | | [Arguments] | ${nodes} diff --git a/resources/libraries/robot/vxlan.robot b/resources/libraries/robot/vxlan.robot index 27c9c7c3da..0c149fdcda 100644 --- a/resources/libraries/robot/vxlan.robot +++ b/resources/libraries/robot/vxlan.robot @@ -60,10 +60,6 @@ | | Add IP Neighbor | ${DUT1} | ${DUT1_INT_INDEX} | ${dut2s_ip_address} | ${DUT2_INT_MAC} | | Add IP Neighbor | ${DUT2} | ${DUT2_INT_INDEX} | ${dut1s_ip_address} | ${DUT1_INT_MAC} -| VXLAN interface is created -| | [Arguments] | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP} -| | Create VXLAN interface | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP} - | Add interfaces to L2BD | | [Arguments] | ${DUT} | ${BID} | ${INTERFACE_1} | ${INTERFACE_2} | | Vpp Add L2 Bridge Domain | ${DUT} | ${BID} | ${INTERFACE_1} | ${INTERFACE_2} @@ -107,11 +103,11 @@ | | ... | - tx_dst_mac - Destination MAC address of sent packet. Type: string | | ... | - tx_src_ip - Source IP address of sent VXLAN packet. Type: string | | ... | - tx_dst_ip - Destination IP address of sent VXLAN packet. -| | ... | Type: string +| | ... | Type: string | | ... | - tx_vni - VNI of sent VXLAN packet. Type: string | | ... | - rx_src_ip - Source IP address of received VXLAN packet. Type: string | | ... | - rx_dst_ip - Destination IP address of received VXLAN packet. -| | ... | Type: string +| | ... | Type: string | | ... | - rx_vni - VNI of received VXLAN packet. Type: string | | ... | | ... | *Return:*