fix(perf/hoststack/quic): enable plugin_crypto_openssl.so

- convert hoststack tests to use app-api-socket instead
  of vpp-api-socket

Change-Id: Ibcd87f3624e33168ed3afcb30267262efc927e7c
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

diff --git a/resources/libraries/python/HoststackUtil.py b/resources/libraries/python/HoststackUtil.py
index 2c9c080..234a3eb 100644 (file)
--- a/resources/libraries/python/HoststackUtil.py
+++ b/resources/libraries/python/HoststackUtil.py
@@ -44,7 +44,7 @@ class HoststackUtil():
         vpp_echo_cmd = {}
         vpp_echo_cmd[u"name"] = u"vpp_echo"
         vpp_echo_cmd[u"args"] = f"{vpp_echo_attributes[u'role']} " \
-            f"socket-name {vpp_echo_attributes[u'vpp_api_socket']} " \
+            f"socket-name {vpp_echo_attributes[u'app_api_socket']} " \
             f"{vpp_echo_attributes[u'json_output']} " \
             f"uri {proto}://{addr}/{port} " \
             f"nthreads {vpp_echo_attributes[u'nthreads']} " \
@@ -435,7 +435,7 @@ class HoststackUtil():
                 program_json = json.loads(json_results)
                 export_hoststack_results(
                     bandwidth=program_json["rx_bits_per_second"],
-                    duration=program_json["time"]
+                    duration=float(program_json["time"])
                 )
             else:
                 test_results += u"Invalid test data output!\n" + program_stdout

diff --git a/resources/libraries/robot/hoststack/hoststack.robot b/resources/libraries/robot/hoststack/hoststack.robot
index 8dd1355..9dd3987 100644 (file)
--- a/resources/libraries/robot/hoststack/hoststack.robot
+++ b/resources/libraries/robot/hoststack/hoststack.robot
@@ -33,7 +33,6 @@
 | ... | rxd=${256}
 | ... | txd=${256}
 | ... | phy_cores=${1}
-| ... | vpp_api_socket=${SOCKSVR_PATH}
 | ... | app_api_socket=/run/vpp/app_ns_sockets/default
 | ... | tcp_cc_algo=cubic
 | ... | sess_evt_q_length=16384
@@ -133,7 +132,7 @@
 | | ... | - ${rxd} - Number of Rx Descriptors Type: int
 | | ... | - ${txd} - Number of Tx Descriptors Type: int
 | | ... | - ${phy_cores} - Number of cores for workers Type: int
-| | ... | - ${vpp_api_socket} - Path to VPP api socket file Type: string
+| | ... | - ${app_api_socket} - Path to application api socket file Type: string
 | | ... | - ${tcp_cc_algo} - TCP congestion control algorithm Type: string
 | | ... | Type: string
 | | ... | - ${sess_evt_q_length} - Session event queue length Type: string
@@ -161,7 +160,7 @@
 | | ... | ${rxd}=${vpp_hoststack_attr}[rxd]
 | | ... | ${txd}=${vpp_hoststack_attr}[txd]
 | | ... | ${phy_cores}=${vpp_hoststack_attr}[phy_cores]
-| | ... | ${vpp_api_socket}=${vpp_hoststack_attr}[vpp_api_socket]
+| | ... | ${app_api_socket}=${vpp_hoststack_attr}[app_api_socket]
 | | ... | ${tcp_cc_algo}=${vpp_hoststack_attr}[tcp_cc_algo]
 | | ... | ${sess_evt_q_length}=${vpp_hoststack_attr}[sess_evt_q_length]
 | | ... | ${sess_prealloc_sess}=${vpp_hoststack_attr}[sess_prealloc_sess]
@@ -177,7 +176,7 @@
 | | Set To Dictionary | ${vpp_hoststack_attr} | txd | ${txd}
 | | Set To Dictionary | ${vpp_hoststack_attr} | phy_cores | ${phy_cores}
 | | Set To Dictionary | ${vpp_hoststack_attr}
-| | ... | vpp_api_socket | ${vpp_api_socket}
+| | ... | app_api_socket | ${app_api_socket}
 | | Set To Dictionary | ${vpp_hoststack_attr}
 | | ... | tcp_cc_algo | ${tcp_cc_algo}
 | | Set To Dictionary | ${vpp_hoststack_attr}
@@ -448,7 +447,6 @@
 | | FOR | ${dut} | IN | @{duts}
 | | | Import Library | resources.libraries.python.VppConfigGenerator
 | | | ... | WITH NAME | ${dut}
-| | | Run keyword | ${dut}.Add socksvr | ${vpp_hoststack_attr}[vpp_api_socket]
 | | | Run Keyword If
 | | | ... | '${dut}' == 'DUT1' and ${vpp_nsim_attr}[output_nsim_enable]
 | | | ... | ${dut}.Add Nsim poll main thread
@@ -657,4 +655,4 @@
 | | | ... | ${tcp_prealloc_conns}
 | | | Run keyword | ${dut}.Add tcp preallocated half open connections
 | | | ... | ${tcp_prealloc_ho_conns}
-| | END
\ No newline at end of file
+| | END

diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot
index 6077a7a..a9da173 100644 (file)
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2023 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:
@@ -40,7 +40,7 @@
 | ... | - **[Ref] Applicable standard specifications:**
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so | crypto_openssl_plugin.so
 | ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
@@ -50,7 +50,7 @@
 | ${overhead}= | ${0}
 | ${frame_size}= | ${9000}
 | ${crypto_type}= | ${None}
-| ${bytes}= | 10G
+| ${bytes}= | 5G
 
 *** Keywords ***
 | Local template

diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot
index a853579..3c51450 100644 (file)
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2023 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:
@@ -41,7 +41,7 @@
 | ... | - **[Ref] Applicable standard specifications:**
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so | crypto_openssl_plugin.so
 | ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0

diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot
index c1deff3..ece7379 100644 (file)
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2023 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:
@@ -41,7 +41,7 @@
 | ... | - **[Ref] Applicable standard specifications:**
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so | crypto_openssl_plugin.so
 | ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0

diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot
index 28549bb..dab2f75 100644 (file)
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2023 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:
@@ -41,7 +41,7 @@
 | ... | - **[Ref] Applicable standard specifications:**
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so | crypto_openssl_plugin.so
 | ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0