Pre-merge code cleanup

src/tests/tools/perf_plots/Component_RPC_Methods.py

@@ -22,9 +22,9 @@ from .tools.Histogram import results_to_histograms, save_histograms, unaccumulat
 
 ##### EXPERIMENT SETTINGS ##############################################################################################
 
-from .experiments.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+from .experiments.scenario_1.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
 TIME_STEP       = '1m'
 LABEL_FILTERS   = {}
 

src/tests/tools/perf_plots/Device_Driver_Details.py

@@ -22,9 +22,9 @@ from .tools.Histogram import results_to_histograms, save_histograms, unaccumulat
 
 ##### EXPERIMENT SETTINGS ##############################################################################################
 
-from .experiments.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+from .experiments.scenario_1.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
 TIME_STEP       = '1m'
 LABEL_FILTERS   = {
     #'driver': 'emulated',

src/tests/tools/perf_plots/Device_Driver_Methods.py

@@ -22,9 +22,9 @@ from .tools.Histogram import results_to_histograms, save_histograms, unaccumulat
 
 ##### EXPERIMENT SETTINGS ##############################################################################################
 
-from .experiments.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+from .experiments.scenario_1.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
 TIME_STEP       = '1m'
 LABEL_FILTERS   = {
     #'driver': 'emulated',

src/tests/tools/perf_plots/Service_Handler_Methods.py

@@ -22,9 +22,9 @@ from .tools.Histogram import results_to_histograms, save_histograms, unaccumulat
 
 ##### EXPERIMENT SETTINGS ##############################################################################################
 
-from .experiments.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
-#from .experiments.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+from .experiments.scenario_1.Emu_Onboard import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L2NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
+#from .experiments.scenario_1.L3NM_EMU_Service import EXPERIMENT_NAME, EXPERIMENT_ID, TIME_START, TIME_END
 TIME_STEP       = '1m'
 LABEL_FILTERS   = {
     #'handler': 'l2nm_emulated',

src/tests/tools/perf_plots/experiments/__init__.py

+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+#
+# 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.
+

src/tests/tools/perf_plots/experiments/details-l2vpn.txt

-CEST times (UTC+2)
-
-10:00 - 10:03: onboard emulated devices
-
-10:03 - 10:15: l2nm_emulated service setup
-    1000 requests
-    - service L2NM
-    off load: 50 erlang
-    hold time: 10 sec
-    inter arrival time: 0.2 sec
-    workers: 10 threads
-    1 replica per service
-    horizontal pod auto-scalers off

src/tests/tools/perf_plots/experiments/details-l3vpn.txt

-CEST times (UTC+2)
-
-10:29 - 10:42: l3nm_emulated service setup
-    1000 requests
-    - service L3NM
-    off load: 50 erlang
-    hold time: 10 sec
-    inter arrival time: 0.2 sec
-    workers: 10 threads
-    1 replica per service
-    horizontal pod auto-scalers off

src/tests/tools/perf_plots/experiments/old_details.txt

-CEST times (UTC+2)
-
-18:45 - 18:50: onboard emulated devices
-
-18:50 - 19:00: l2nm_emulated service setup
-    1000 requests
-    - service L2NM
-    off load: 50 erlang
-    hold time: 10 sec
-    inter arrival time: 0.2 sec
-    workers: 10 threads
-    1 replica per service
-    horizontal pod auto-scalers off
-
-19:03 - 19:14: l3nm_emulated service setup
-    1000 requests
-    - service L3NM
-    off load: 50 erlang
-    hold time: 10 sec
-    inter arrival time: 0.2 sec
-    workers: 10 threads
-    1 replica per service
-    horizontal pod auto-scalers off

src/tests/tools/perf_plots/experiments/L2NM_EMU_Service.py → src/tests/tools/perf_plots/experiments/scenario_1/L2NM_EMU_Service.py

@@ -12,6 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# CEST times (UTC+2)
+#
+# 10:03 - 10:15: l2nm_emulated service setup
+#     1000 requests
+#     - service L2NM
+#     off load: 50 erlang
+#     hold time: 10 sec
+#     inter arrival time: 0.2 sec
+#     workers: 10 threads
+#     1 replica per service
+#     horizontal pod auto-scalers off
+
 import datetime
 
 EXPERIMENT_NAME = 'L2VPN with Emulated'

src/tests/tools/perf_plots/experiments/L3NM_EMU_Service.py → src/tests/tools/perf_plots/experiments/scenario_1/L3NM_EMU_Service.py

@@ -12,6 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# CEST times (UTC+2)
+#
+# 10:29 - 10:42: l3nm_emulated service setup
+#     1000 requests
+#     - service L3NM
+#     off load: 50 erlang
+#     hold time: 10 sec
+#     inter arrival time: 0.2 sec
+#     workers: 10 threads
+#     1 replica per service
+#     horizontal pod auto-scalers off
+
 import datetime
 
 EXPERIMENT_NAME = 'L3VPN with Emulated'

src/tests/tools/perf_plots/experiments/scenario_1/__init__.py

+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+#
+# 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.
+