Commit 826d0213 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 2f78cc2d
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -22,9 +22,9 @@ from .tools.Histogram import results_to_histograms, save_histograms, unaccumulat


##### EXPERIMENT SETTINGS ##############################################################################################
##### EXPERIMENT SETTINGS ##############################################################################################


from .experiments.Emu_Onboard 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.L2NM_EMU_Service 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.L3NM_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'
TIME_STEP       = '1m'
LABEL_FILTERS   = {}
LABEL_FILTERS   = {}


+3 −3
Original line number Original line Diff line number Diff line
@@ -22,9 +22,9 @@ from .tools.Histogram import results_to_histograms, save_histograms, unaccumulat


##### EXPERIMENT SETTINGS ##############################################################################################
##### EXPERIMENT SETTINGS ##############################################################################################


from .experiments.Emu_Onboard 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.L2NM_EMU_Service 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.L3NM_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'
TIME_STEP       = '1m'
LABEL_FILTERS   = {
LABEL_FILTERS   = {
    #'driver': 'emulated',
    #'driver': 'emulated',
+3 −3
Original line number Original line Diff line number Diff line
@@ -22,9 +22,9 @@ from .tools.Histogram import results_to_histograms, save_histograms, unaccumulat


##### EXPERIMENT SETTINGS ##############################################################################################
##### EXPERIMENT SETTINGS ##############################################################################################


from .experiments.Emu_Onboard 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.L2NM_EMU_Service 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.L3NM_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'
TIME_STEP       = '1m'
LABEL_FILTERS   = {
LABEL_FILTERS   = {
    #'driver': 'emulated',
    #'driver': 'emulated',
+3 −3
Original line number Original line Diff line number Diff line
@@ -22,9 +22,9 @@ from .tools.Histogram import results_to_histograms, save_histograms, unaccumulat


##### EXPERIMENT SETTINGS ##############################################################################################
##### EXPERIMENT SETTINGS ##############################################################################################


from .experiments.Emu_Onboard 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.L2NM_EMU_Service 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.L3NM_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'
TIME_STEP       = '1m'
LABEL_FILTERS   = {
LABEL_FILTERS   = {
    #'handler': 'l2nm_emulated',
    #'handler': 'l2nm_emulated',
+14 −0
Original line number Original line Diff line number Diff line
# 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.
Loading