Clean up Piccolo imports (#5307)

doc/architecture/performance/analysis.rst

@@ -9,30 +9,21 @@ files produced by previous components. This component is produced in Python and
 provides the functionality of a library called either from a command-line tool 
 or by creating a script to call the library functions.
 
-In order to run this component the dependencies need to be installed. If 
-these are not already installed, you can run from the :ccf_repo:`tests/perf-system/` 
-directory the following command:
-
-.. code-block:: bash
-
-    $ pip install -r requirements.txt
-
-
 Run Analyzer
 ------------
 
-The command line tool in :ccf_repo:`tests/perf-system/analyzer/analyze_packages.py` 
+The command line tool in :ccf_repo:`tests/infra/piccolo/analyze_packages.py` 
 
 provide a default analysis that returns some throughput and latency metrics. 
 For more targeted analysis you can create your own scripts, such as 
-:ccf_repo:`tests/perf-system/analyzer/throughput_analysis.py`.
+:ccf_repo:`tests/infra/piccolo/throughput_analysis.py`.
 
 
 Command-Line Tool
 #################
 
 For the default analysis of the command line tool you need to run the 
-following command from the :ccf_repo:`tests/perf-system/analyzer/` 
+following command from the :ccf_repo:`tests/infra/piccolo/` 
 
 directory:
 
@@ -81,4 +72,4 @@ with ``total_time_in_sec()`` to get throughput, or you could
 customize your own metrics table with ``customize_table()`` 
 providing the lists for the field names and the values. For 
 more information about the provided functions, you can see the 
-library code on the :ccf_repo:`tests/perf-system/analyzer/analyzer.py`.
+library code on the :ccf_repo:`tests/infra/piccolo/analyzer.py`.

doc/architecture/performance/generator.rst

@@ -6,19 +6,12 @@ Overview
 
 This component is responsible for generating requests and storing them in a format 
 that could be submitted to the server. The user can declare the requests by leveraging
-the functions inside the library in :ccf_repo:`tests/perf-system/generator/generator.py`.
+the functions inside the library in :ccf_repo:`tests/infra/piccolo/generator.py`.
 The user can generate requests from the library by either calling the command line tool 
-in :ccf_repo:`tests/perf-system/generator/generate_packages.py` or by creating a script 
-calling the functions of the library, such as the :ccf_repo:`tests/perf-system/generator/logging_generator.py` 
+in :ccf_repo:`tests/infra/piccolo/generate_packages.py` or by creating a script 
+calling the functions of the library, such as the :ccf_repo:`tests/infra/piccolo/logging_generator.py` 
 which contains a sample generation of requests for the logging CCF application.
 
-Prior running any of these files you first need to install the requirements
-existing in :ccf_repo:`tests/perf-system/` by running inside this directory:
-
-.. code-block:: bash
-
-    $ pip install -r requirements.txt
-
 Run generator
 -------------
 

tests/infra/piccolo/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the Apache 2.0 License.

tests/infra/piccolo_driver.py

@@ -12,15 +12,10 @@ from loguru import logger as LOG
 import cimetrics.upload
 import time
 import http
-import sys
 import hashlib
 import json
-
-sys.path.insert(0, "../tests/perf-system/generator")
-import generator  # noqa: E402
-
-sys.path.insert(0, "../tests/perf-system/analyzer")
-import analyzer  # noqa: E402
+from piccolo import generator
+from piccolo import analyzer
 
 
 def get_command_args(args, network, get_command):

tests/perf-system/requirements.txt

@@ -1,5 +0,0 @@
-pandas==1.4.*
-fastparquet==0.8.*
-prettytable==3.*
-matplotlib==3.*
-loguru >= 0.5, == 0.*

tests/requirements.txt

@@ -19,3 +19,6 @@ pyOpenSSL
 grpcio-tools == 1.44.0 # Pin to a working version for SNP platform
 JWCrypto
 pycose
+# Piccolo dependencies
+fastparquet==2023.*
+prettytable==3.*

tests/tests.sh

@@ -14,7 +14,6 @@ source env/bin/activate
 pip install -U -q pip
 pip install -q -U -e ../python/
 pip install -q -U -r ../tests/requirements.txt
-pip install -q -U -r ../tests/perf-system/requirements.txt
 echo "Python environment successfully setup"
 
 # We can delete it when