diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2019-08-06 22:26:00 +0000 |
|---|---|---|
| committer |   Vratko Polak <vrpolak@cisco.com> | 2019-08-14 16:25:19 +0000 |
| commit | 6da7266754c28754c04cf37d1974e39766a261f6 (patch) | |
| tree | 3fbbe99fd1e797946a888293d302d0f50ffbb96a /resources/libraries/robot | |
| parent | 669d320bc64e41f879c047a39a66b8ec99bf4b1e (diff) | |
VAT-to-PAPI: Fix HTTP/TCP tests
Change-Id: Ie728bc73eb7429d246e82dd195fc63191c3ac51d
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/tcp/tcp_setup.robot | 22 | ||||
| -rw-r--r-- | resources/libraries/robot/wrk/wrk_utils.robot | 3 |
2 files changed, 13 insertions, 12 deletions
diff --git a/resources/libraries/robot/tcp/tcp_setup.robot b/resources/libraries/robot/tcp/tcp_setup.robot index 39a570c20a..91192639c1 100644 --- a/resources/libraries/robot/tcp/tcp_setup.robot +++ b/resources/libraries/robot/tcp/tcp_setup.robot @@ -21,24 +21,27 @@ | Documentation | L2 keywords to set up VPP to test tcp. *** Keywords *** -| Set up HTTP server with paramters on the VPP node +| Set up HTTP server with parameters on the VPP node | | [Documentation] | | ... | Configure IP address on the port, set it up and start HTTP server on | | ... | the VPP. | | ... | | ... | *Arguments:* -| | ... | - ${prealloc_fifos} - Max number of connections you expect to handle +| | ... | - http_static_plugin - Use the HTTP static plugin http server. +| | ... | Type: boolean +| | ... | - prealloc_fifos - Max number of connections you expect to handle | | ... | at one time. Type: string -| | ... | - ${fifo_size} - FIFO size in kB. Type: string -| | ... | - ${private_segment_size} - Private segment size. Number + unit. +| | ... | - fifo_size - FIFO size in kB. Type: string +| | ... | - private_segment_size - Private segment size. Number + unit. | | ... | Type: string | | ... | | ... | *Example:* | | ... -| | ... | \| Set up HTTP server with paramters on the VPP node \| 400 \| 4096\ -| | ... | \| 2g \| +| | ... | \| Set up HTTP server with paramters on the VPP node \| ${true}\ +| | ... | \| 400 \| 4096 \| 2g \| | | ... -| | [Arguments] | ${prealloc_fifos} | ${fifo_size} | ${private_segment_size} +| | [Arguments] | ${http_static_plugin} | ${prealloc_fifos} | ${fifo_size} +| | ... | ${private_segment_size} | | ... | | Set Interface State | ${dut1} | ${dut1_if1} | up | | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | 192.168.10.2 | 24 @@ -50,6 +53,5 @@ | | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | 192.168.70.2 | 24 | | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | 192.168.80.2 | 24 | | Vpp Node Interfaces Ready Wait | ${dut1} -| | Start HTTP server params | ${dut1} | ${prealloc_fifos} | ${fifo_size} -| | ... | ${private_segment_size} -| | Sleep | 30 +| | Start VPP HTTP server params | ${dut1} | ${http_static_plugin} +| | ... | ${prealloc_fifos} | ${fifo_size} | ${private_segment_size} diff --git a/resources/libraries/robot/wrk/wrk_utils.robot b/resources/libraries/robot/wrk/wrk_utils.robot index fd18a5d686..1c65228130 100644 --- a/resources/libraries/robot/wrk/wrk_utils.robot +++ b/resources/libraries/robot/wrk/wrk_utils.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -17,7 +17,6 @@ | Library | resources.libraries.python.DUTSetup | Library | resources.libraries.python.TrafficGenerator | Library | resources.libraries.python.topology.Topology -| Resource | resources/libraries/robot/performance/performance_setup.robot | ... | Documentation | L2 keywords to set up wrk and to measure performance | ... | parameters using wrk. |