From 826d0213760f758e048f94e9c26025467883ca11 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 29 May 2023 08:24:19 +0000
Subject: [PATCH] Pre-merge code cleanup
---
.../tools/perf_plots/Component_RPC_Methods.py | 6 ++---
.../tools/perf_plots/Device_Driver_Details.py | 6 ++---
.../tools/perf_plots/Device_Driver_Methods.py | 6 ++---
.../perf_plots/Service_Handler_Methods.py | 6 ++---
.../tools/perf_plots/experiments/__init__.py | 14 +++++++++++
.../perf_plots/experiments/details-l2vpn.txt | 13 -----------
.../perf_plots/experiments/details-l3vpn.txt | 11 ---------
.../perf_plots/experiments/old_details.txt | 23 -------------------
.../{ => scenario_1}/Emu_Onboard.py | 0
.../{ => scenario_1}/L2NM_EMU_Service.py | 12 ++++++++++
.../{ => scenario_1}/L3NM_EMU_Service.py | 12 ++++++++++
.../experiments/scenario_1/__init__.py | 14 +++++++++++
12 files changed, 64 insertions(+), 59 deletions(-)
create mode 100644 src/tests/tools/perf_plots/experiments/__init__.py
delete mode 100644 src/tests/tools/perf_plots/experiments/details-l2vpn.txt
delete mode 100644 src/tests/tools/perf_plots/experiments/details-l3vpn.txt
delete mode 100644 src/tests/tools/perf_plots/experiments/old_details.txt
rename src/tests/tools/perf_plots/experiments/{ => scenario_1}/Emu_Onboard.py (100%)
rename src/tests/tools/perf_plots/experiments/{ => scenario_1}/L2NM_EMU_Service.py (76%)
rename src/tests/tools/perf_plots/experiments/{ => scenario_1}/L3NM_EMU_Service.py (76%)
create mode 100644 src/tests/tools/perf_plots/experiments/scenario_1/__init__.py
diff --git a/src/tests/tools/perf_plots/Component_RPC_Methods.py b/src/tests/tools/perf_plots/Component_RPC_Methods.py
index d39686ae0..231e388cf 100644
--- a/src/tests/tools/perf_plots/Component_RPC_Methods.py
+++ b/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 = {}
diff --git a/src/tests/tools/perf_plots/Device_Driver_Details.py b/src/tests/tools/perf_plots/Device_Driver_Details.py
index 995fd8823..7a371817e 100644
--- a/src/tests/tools/perf_plots/Device_Driver_Details.py
+++ b/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',
diff --git a/src/tests/tools/perf_plots/Device_Driver_Methods.py b/src/tests/tools/perf_plots/Device_Driver_Methods.py
index 8d61b23c7..732e05b7a 100644
--- a/src/tests/tools/perf_plots/Device_Driver_Methods.py
+++ b/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',
diff --git a/src/tests/tools/perf_plots/Service_Handler_Methods.py b/src/tests/tools/perf_plots/Service_Handler_Methods.py
index cd9d210f5..e122e9c51 100644
--- a/src/tests/tools/perf_plots/Service_Handler_Methods.py
+++ b/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',
diff --git a/src/tests/tools/perf_plots/experiments/__init__.py b/src/tests/tools/perf_plots/experiments/__init__.py
new file mode 100644
index 000000000..1549d9811
--- /dev/null
+++ b/src/tests/tools/perf_plots/experiments/__init__.py
@@ -0,0 +1,14 @@
+# 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.
+
diff --git a/src/tests/tools/perf_plots/experiments/details-l2vpn.txt b/src/tests/tools/perf_plots/experiments/details-l2vpn.txt
deleted file mode 100644
index 6e6fbc94c..000000000
--- a/src/tests/tools/perf_plots/experiments/details-l2vpn.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/src/tests/tools/perf_plots/experiments/details-l3vpn.txt b/src/tests/tools/perf_plots/experiments/details-l3vpn.txt
deleted file mode 100644
index cf26e7f71..000000000
--- a/src/tests/tools/perf_plots/experiments/details-l3vpn.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/src/tests/tools/perf_plots/experiments/old_details.txt b/src/tests/tools/perf_plots/experiments/old_details.txt
deleted file mode 100644
index 9e7675e7d..000000000
--- a/src/tests/tools/perf_plots/experiments/old_details.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-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
diff --git a/src/tests/tools/perf_plots/experiments/Emu_Onboard.py b/src/tests/tools/perf_plots/experiments/scenario_1/Emu_Onboard.py
similarity index 100%
rename from src/tests/tools/perf_plots/experiments/Emu_Onboard.py
rename to src/tests/tools/perf_plots/experiments/scenario_1/Emu_Onboard.py
diff --git a/src/tests/tools/perf_plots/experiments/L2NM_EMU_Service.py b/src/tests/tools/perf_plots/experiments/scenario_1/L2NM_EMU_Service.py
similarity index 76%
rename from src/tests/tools/perf_plots/experiments/L2NM_EMU_Service.py
rename to src/tests/tools/perf_plots/experiments/scenario_1/L2NM_EMU_Service.py
index 781109ffc..ae10f3b54 100644
--- a/src/tests/tools/perf_plots/experiments/L2NM_EMU_Service.py
+++ b/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'
diff --git a/src/tests/tools/perf_plots/experiments/L3NM_EMU_Service.py b/src/tests/tools/perf_plots/experiments/scenario_1/L3NM_EMU_Service.py
similarity index 76%
rename from src/tests/tools/perf_plots/experiments/L3NM_EMU_Service.py
rename to src/tests/tools/perf_plots/experiments/scenario_1/L3NM_EMU_Service.py
index aade813b1..ed46c1b86 100644
--- a/src/tests/tools/perf_plots/experiments/L3NM_EMU_Service.py
+++ b/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'
diff --git a/src/tests/tools/perf_plots/experiments/scenario_1/__init__.py b/src/tests/tools/perf_plots/experiments/scenario_1/__init__.py
new file mode 100644
index 000000000..1549d9811
--- /dev/null
+++ b/src/tests/tools/perf_plots/experiments/scenario_1/__init__.py
@@ -0,0 +1,14 @@
+# 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.
+
--
GitLab