diff options
Diffstat (limited to 'resources/libraries/python')
| -rw-r--r-- | resources/libraries/python/Constants.py | 3 | ||||
| -rw-r--r-- | resources/libraries/python/autogen/Regenerator.py | 5 | ||||
| -rw-r--r-- | resources/libraries/python/tcp.py | 80 |
3 files changed, 0 insertions, 88 deletions
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 6bf503da51..08de52368e 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -148,9 +148,6 @@ class Constants: # VPP Communications Library templates location RESOURCES_TPL_VCL = u"resources/templates/vcl" - # HTTP Server www root directory - RESOURCES_TP_WRK_WWW = u"resources/traffic_profiles/wrk/www" - # VPP Communications Library LD_PRELOAD library VCL_LDPRELOAD_LIBRARY = u"/usr/lib/x86_64-linux-gnu/libvcl_ldpreload.so" diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py index 0d291e231e..e6474e566d 100644 --- a/resources/libraries/python/autogen/Regenerator.py +++ b/resources/libraries/python/autogen/Regenerator.py @@ -480,9 +480,6 @@ class Regenerator: {u"frame_size": u"IMIX_v4_1", u"phy_cores": 2}, {u"frame_size": u"IMIX_v4_1", u"phy_cores": 4} ] - hs_wrk_kwargs_list = [ - {u"frame_size": 0, u"phy_cores": i} for i in (1, 2, 4) - ] hs_bps_kwargs_list = [ {u"frame_size": 1460, u"phy_cores": 1}, ] @@ -513,8 +510,6 @@ class Regenerator: write_default_files(in_filename, in_prolog, default_kwargs_list) elif in_filename.endswith(u"-reconf.robot"): write_reconf_files(in_filename, in_prolog, default_kwargs_list) - elif in_filename[-10:] in (u"-cps.robot", u"-rps.robot"): - write_tcp_files(in_filename, in_prolog, hs_wrk_kwargs_list) elif in_filename.endswith(u"-bps.robot"): hoststack_kwargs_list = \ hs_quic_kwargs_list if u"quic" in in_filename \ diff --git a/resources/libraries/python/tcp.py b/resources/libraries/python/tcp.py deleted file mode 100644 index 62cff2f4ff..0000000000 --- a/resources/libraries/python/tcp.py +++ /dev/null @@ -1,80 +0,0 @@ -# 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: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""TCP util library.""" - -from resources.libraries.python.Constants import Constants -from resources.libraries.python.PapiExecutor import PapiSocketExecutor - - -class TCPUtils: - """Implementation of the TCP utilities.""" - - www_root_dir = f"{Constants.REMOTE_FW_DIR}/{Constants.RESOURCES_TP_WRK_WWW}" - - def __init__(self): - pass - - @classmethod - def start_vpp_http_server_params( - cls, node, http_static_plugin, prealloc_fifos, fifo_size, - private_segment_size): - """Start the test HTTP server internal application or - the HTTP static server plugin internal applicatoin on the given node. - - http static server www-root <www-root-dir> prealloc-fifos <N> - fifo-size <size in kB> - private-segment-size <seg_size expressed as number + unit, e.g. 100m> - -- or -- - test http server static prealloc-fifos <N> fifo-size <size in kB> - private-segment-size <seg_size expressed as number + unit, e.g. 100m> - - - Where N is the max number of connections you expect to handle at one - time and <size> should be small if you test for CPS and exchange few - bytes, say 4, if each connection just exchanges few packets. Or it - should be much larger, up to 1024/4096 (i.e. 1-4MB) if you have only - one connection and exchange a lot of packets, i.e., when you test for - RPS. If you need to allocate lots of FIFOs, so you test for CPS, make - private-segment-size something like 4g. - - Example: - - For CPS - http static server www-root <www-root-dir> prealloc-fifos 10000 - fifo-size 64 private-segment-size 4000m - - For RPS - test http server static prealloc-fifos 500000 fifo-size 4 - private-segment-size 4000m - - :param node: Node to start HTTP server on. - :param http_static_plugin: Run HTTP static server plugin - :param prealloc_fifos: Max number of connections you expect to handle at - one time. - :param fifo_size: FIFO size in kB. - :param private_segment_size: Private segment size. Number + unit. - :type node: dict - :type http_static_plugin: boolean - :type prealloc_fifos: str - :type fifo_size: str - :type private_segment_size: str - """ - cmd = f"http static server www-root {cls.www_root_dir} " \ - f"prealloc-fifos {prealloc_fifos} fifo-size {fifo_size} " \ - f"private-segment-size {private_segment_size}" \ - if http_static_plugin \ - else f"test http server static prealloc-fifos {prealloc_fifos} " \ - f"fifo-size {fifo_size} private-segment-size {private_segment_size}" - - PapiSocketExecutor.run_cli_cmd(node, cmd) |