diff --git a/scenarios/windows/_library/web/web_run/default_params.py b/scenarios/windows/_library/web/web_run/default_params.py index e02c012..f420801 100644 --- a/scenarios/windows/_library/web/web_run/default_params.py +++ b/scenarios/windows/_library/web/web_run/default_params.py @@ -1,12 +1,8 @@ # Copyright (c) Microsoft. All rights reserved. # Licensed under the MIT license. See LICENSE file in the project root for full license information. -from functools import partial -import os from core.parameters import Params -import utilities.open_source.modules - -import_run_user_only = partial(utilities.open_source.modules.import_run_user_only, here=__file__) +from utilities.open_source.modules import import_run_user_only def run(): Params.setCalculated('scenario_section', __package__.split('.')[-1]) @@ -16,19 +12,19 @@ def run(): return def run_user_only(): - import_run_user_only('..\\site\\web_site_amazon_bsg') - import_run_user_only('..\\site\\web_site_amazon_vacuum') - import_run_user_only('..\\site\\web_site_google_images_apollo') - import_run_user_only('..\\site\\web_site_google_images_london') - import_run_user_only('..\\site\\web_site_google_search_belgium') - import_run_user_only('..\\site\\web_site_google_search_super_bowl') - import_run_user_only('..\\site\\web_site_instagram') - import_run_user_only('..\\site\\web_site_reddit') - import_run_user_only('..\\site\\web_site_the_verge') - import_run_user_only('..\\site\\web_site_wikipedia') - import_run_user_only('..\\site\\web_site_youtube_nasa') - import_run_user_only('..\\site\\web_site_youtube_tos') - import_run_user_only('..\\web_clear_cache') - import_run_user_only('..\\web_new_tab') - Params.setUserDefault(None, 'web_workload', 'amazonbsg amazonvacuum googleimagesapollo googleimageslondon googlesearchbelgium googlesearchsuperbowl instagram reddit theverge wikipedia youtubenasa youtubetos', desc='Specific websites to run.', valOptions=['amazonbsg', 'amazonvacuum', 'googleimagesapollo', 'googleimageslondon', 'googlesearchbelgium', 'googlesearchsuperbowl', 'instagram', 'reddit', 'theverge', 'wikipedia', 'youtubenasa', 'youtubetos'], multiple=True) + import_run_user_only('..\\site\\web_site_amazon_bsg', here=__file__) + import_run_user_only('..\\site\\web_site_amazon_vacuum', here=__file__) + import_run_user_only('..\\site\\web_site_google_images_apollo', here=__file__) + import_run_user_only('..\\site\\web_site_google_images_london', here=__file__) + import_run_user_only('..\\site\\web_site_google_search_belgium', here=__file__) + import_run_user_only('..\\site\\web_site_google_search_super_bowl', here=__file__) + import_run_user_only('..\\site\\web_site_instagram', here=__file__) + import_run_user_only('..\\site\\web_site_reddit', here=__file__) + import_run_user_only('..\\site\\web_site_the_verge', here=__file__) + import_run_user_only('..\\site\\web_site_wikipedia', here=__file__) + import_run_user_only('..\\site\\web_site_youtube_nasa', here=__file__) + import_run_user_only('..\\site\\web_site_youtube_tos', here=__file__) + import_run_user_only('..\\web_clear_cache', here=__file__) + import_run_user_only('..\\web_new_tab', here=__file__) + Params.setUserDefault('web', 'web_workload', 'amazonbsg amazonvacuum googleimagesapollo googleimageslondon googlesearchbelgium googlesearchsuperbowl instagram reddit theverge wikipedia youtubenasa youtubetos', desc='Specific websites to run.', valOptions=['amazonbsg', 'amazonvacuum', 'googleimagesapollo', 'googleimageslondon', 'googlesearchbelgium', 'googlesearchsuperbowl', 'instagram', 'reddit', 'theverge', 'wikipedia', 'youtubenasa', 'youtubetos'], multiple=True) return diff --git a/scenarios/windows/_library/web/web_run/web_run.json b/scenarios/windows/_library/web/web_run/web_run.json index fc26e7f..dcc1cf4 100644 --- a/scenarios/windows/_library/web/web_run/web_run.json +++ b/scenarios/windows/_library/web/web_run/web_run.json @@ -27,7 +27,7 @@ "enabled": true, "id": "14FF8YK", "multiple": true, - "name": "[web_workload]", + "name": "[web:web_workload]", "type": "Set User Default", "val_options": "amazonbsg,amazonvacuum,googleimagesapollo,googleimageslondon,googlesearchbelgium,googlesearchsuperbowl,instagram,reddit,theverge,wikipedia,youtubenasa,youtubetos", "value": "amazonbsg amazonvacuum googleimagesapollo googleimageslondon googlesearchbelgium googlesearchsuperbowl instagram reddit theverge wikipedia youtubenasa youtubetos" diff --git a/scenarios/windows/abl_active/abl_active.json b/scenarios/windows/abl_active/abl_active.json index 5ee6fd8..d5862a2 100644 --- a/scenarios/windows/abl_active/abl_active.json +++ b/scenarios/windows/abl_active/abl_active.json @@ -48,7 +48,7 @@ "description": "", "enabled": true, "id": "V4K5RP", - "include_path": "..\\_library\\web\\web_setup", + "include_path": "scenarios\\windows\\_library\\web\\web_setup", "type": "Include" }, { @@ -57,7 +57,7 @@ "description": "", "enabled": true, "id": "V4K656", - "include_path": "..\\_library\\productivity\\prod_setup", + "include_path": "scenarios\\windows\\_library\\productivity\\prod_setup", "type": "Include" } ], @@ -82,7 +82,7 @@ "description": "", "enabled": true, "id": "V5MRFU", - "include_path": "..\\_library\\productivity\\prod_open", + "include_path": "scenarios\\windows\\_library\\productivity\\prod_open", "type": "Include" }, { @@ -99,24 +99,24 @@ "description": "", "enabled": true, "id": "V5NJXL", - "include_path": "..\\_library\\web\\web_switchto", + "include_path": "scenarios\\windows\\_library\\web\\web_switchto", "type": "Include" }, { - "id": "W8WX4F", - "type": "Include", + "children": [], + "delay": "0", "description": "", "enabled": true, - "delay": "0", - "include_path": "..\\_library\\web\\web_run", + "id": "W8WX4F", + "include_path": "scenarios\\windows\\_library\\web\\web_run", "params": [ { "name": "[load_only]", - "value": "0", - "val_options": "0,1" + "val_options": "0,1", + "value": "0" } ], - "children": [] + "type": "Include" }, { "children": [], @@ -132,7 +132,7 @@ "description": "", "enabled": true, "id": "W8WC7T", - "include_path": "..\\_library\\misc\\recording_phase_begin", + "include_path": "scenarios\\windows\\_library\\misc\\recording_phase_begin", "type": "Include" }, { @@ -149,7 +149,7 @@ "description": "", "enabled": true, "id": "V4KPAF", - "include_path": "..\\_library\\productivity\\prod_idle", + "include_path": "scenarios\\windows\\_library\\productivity\\prod_idle", "params": [ { "name": "[idle_time]", @@ -165,7 +165,7 @@ "description": "", "enabled": true, "id": "W8WCEM", - "include_path": "..\\_library\\misc\\recording_phase_end", + "include_path": "scenarios\\windows\\_library\\misc\\recording_phase_end", "params": [ { "name": "[phase_category]", @@ -194,7 +194,7 @@ "description": "", "enabled": true, "id": "V4KTMJ", - "include_path": "..\\_library\\productivity\\prod_run", + "include_path": "scenarios\\windows\\_library\\productivity\\prod_run", "type": "Include" }, { @@ -211,7 +211,7 @@ "description": "", "enabled": true, "id": "V4K70M", - "include_path": "..\\_library\\productivity\\prod_close", + "include_path": "scenarios\\windows\\_library\\productivity\\prod_close", "type": "Include" }, { @@ -220,7 +220,7 @@ "description": "", "enabled": true, "id": "V4K6PC", - "include_path": "..\\_library\\web\\web_close_tabs", + "include_path": "scenarios\\windows\\_library\\web\\web_close_tabs", "params": [ { "name": "[num_tabs_to_close]", @@ -244,7 +244,7 @@ "description": "", "enabled": true, "id": "V4K6TH", - "include_path": "..\\_library\\web\\web_close_browser", + "include_path": "scenarios\\windows\\_library\\web\\web_close_browser", "type": "Include" }, { @@ -253,7 +253,7 @@ "description": "", "enabled": true, "id": "V4K6VU", - "include_path": "..\\_library\\web\\web_kill", + "include_path": "scenarios\\windows\\_library\\web\\web_kill", "type": "Include" }, { @@ -262,7 +262,7 @@ "description": "", "enabled": true, "id": "V4K74H", - "include_path": "..\\_library\\productivity\\prod_kill", + "include_path": "scenarios\\windows\\_library\\productivity\\prod_kill", "type": "Include" } ], diff --git a/scenarios/windows/abl_active/default_params.py b/scenarios/windows/abl_active/default_params.py index b449f66..393d398 100644 --- a/scenarios/windows/abl_active/default_params.py +++ b/scenarios/windows/abl_active/default_params.py @@ -2,9 +2,29 @@ # Licensed under the MIT license. See LICENSE file in the project root for full license information. from core.parameters import Params +from utilities.open_source.modules import import_run_user_only def run(): + Params.setCalculated('scenario_section', __package__.split('.')[-1]) + run_user_only() Params.setParam(None, 'web_replay_run', '1') Params.setDefault('abl_active', 'idle_time', '111', desc='Idle time between each app switch, - 3s', valOptions=[]) Params.setParam(None, 'phase_reporting', '1') return + +def run_user_only(): + import_run_user_only('scenarios\\windows\\_library\\misc\\recording_phase_begin') + import_run_user_only('scenarios\\windows\\_library\\misc\\recording_phase_end') + import_run_user_only('scenarios\\windows\\_library\\productivity\\prod_close') + import_run_user_only('scenarios\\windows\\_library\\productivity\\prod_idle') + import_run_user_only('scenarios\\windows\\_library\\productivity\\prod_kill') + import_run_user_only('scenarios\\windows\\_library\\productivity\\prod_open') + import_run_user_only('scenarios\\windows\\_library\\productivity\\prod_run') + import_run_user_only('scenarios\\windows\\_library\\productivity\\prod_setup') + import_run_user_only('scenarios\\windows\\_library\\web\\web_close_browser') + import_run_user_only('scenarios\\windows\\_library\\web\\web_close_tabs') + import_run_user_only('scenarios\\windows\\_library\\web\\web_kill') + import_run_user_only('scenarios\\windows\\_library\\web\\web_run') + import_run_user_only('scenarios\\windows\\_library\\web\\web_setup') + import_run_user_only('scenarios\\windows\\_library\\web\\web_switchto') + return diff --git a/scenarios/windows/abl_standby/abl_standby.json b/scenarios/windows/abl_standby/abl_standby.json index 5c85faf..90ccf7b 100644 --- a/scenarios/windows/abl_standby/abl_standby.json +++ b/scenarios/windows/abl_standby/abl_standby.json @@ -49,7 +49,7 @@ "description": "", "enabled": true, "id": "W1W9K5", - "include_path": "..\\_library\\misc\\call_early_callback", + "include_path": "scenarios\\windows\\_library\\misc\\call_early_callback", "type": "Include" }, { @@ -58,7 +58,7 @@ "description": "", "enabled": true, "id": "W11MXJ", - "include_path": "..\\_library\\web\\web_setup", + "include_path": "scenarios\\windows\\_library\\web\\web_setup", "type": "Include" }, { @@ -67,7 +67,7 @@ "description": "", "enabled": true, "id": "W11NL3", - "include_path": "..\\_library\\productivity\\prod_setup", + "include_path": "scenarios\\windows\\_library\\productivity\\prod_setup", "type": "Include" }, { @@ -76,7 +76,7 @@ "description": "", "enabled": true, "id": "W1VWW1", - "include_path": "..\\_library\\productivity\\prod_open", + "include_path": "scenarios\\windows\\_library\\productivity\\prod_open", "type": "Include" }, { @@ -85,7 +85,7 @@ "description": "", "enabled": true, "id": "W1X1N9", - "include_path": "..\\_library\\web\\web_switchto", + "include_path": "scenarios\\windows\\_library\\web\\web_switchto", "type": "Include" }, { @@ -94,7 +94,7 @@ "description": "", "enabled": true, "id": "W13H65", - "include_path": "..\\_library\\web\\web_run", + "include_path": "scenarios\\windows\\_library\\web\\web_run", "params": [ { "name": "[load_only]", @@ -118,7 +118,7 @@ "description": "", "enabled": true, "id": "W33WVT", - "include_path": "..\\_library\\misc\\standby", + "include_path": "scenarios\\windows\\_library\\misc\\standby", "params": [ { "name": "[standby_duration]", @@ -147,7 +147,7 @@ "description": "", "enabled": true, "id": "W11P66", - "include_path": "..\\_library\\web\\web_close_tabs", + "include_path": "scenarios\\windows\\_library\\web\\web_close_tabs", "params": [ { "name": "[num_tabs_to_close]", @@ -163,7 +163,7 @@ "description": "", "enabled": true, "id": "W11P88", - "include_path": "..\\_library\\web\\web_close_browser", + "include_path": "scenarios\\windows\\_library\\web\\web_close_browser", "type": "Include" }, { @@ -172,7 +172,7 @@ "description": "", "enabled": true, "id": "W11Y1X", - "include_path": "..\\_library\\web\\web_kill", + "include_path": "scenarios\\windows\\_library\\web\\web_kill", "type": "Include" }, { @@ -181,7 +181,7 @@ "description": "", "enabled": true, "id": "W11NXV", - "include_path": "..\\_library\\productivity\\prod_close", + "include_path": "scenarios\\windows\\_library\\productivity\\prod_close", "type": "Include" }, { @@ -190,7 +190,7 @@ "description": "", "enabled": true, "id": "W11Y5K", - "include_path": "..\\_library\\productivity\\prod_kill", + "include_path": "scenarios\\windows\\_library\\productivity\\prod_kill", "type": "Include" } ], diff --git a/scenarios/windows/abl_standby/default_params.py b/scenarios/windows/abl_standby/default_params.py index 62f41ae..ecdea17 100644 --- a/scenarios/windows/abl_standby/default_params.py +++ b/scenarios/windows/abl_standby/default_params.py @@ -2,9 +2,27 @@ # Licensed under the MIT license. See LICENSE file in the project root for full license information. from core.parameters import Params +from utilities.open_source.modules import import_run_user_only def run(): + Params.setCalculated('scenario_section', __package__.split('.')[-1]) + run_user_only() Params.setDefault('abl_standby', 'standby_duration', '2348', desc='The time to be in standby, in seconds', valOptions=[]) Params.setDefault('abl_standby', 'sleep_mode', 'Standby', desc='', valOptions=['Standby', 'S1', 'S3']) Params.setParam(None, 'web_replay_run', '1') return + +def run_user_only(): + import_run_user_only('scenarios\\windows\\_library\\misc\\call_early_callback') + import_run_user_only('scenarios\\windows\\_library\\misc\\standby') + import_run_user_only('scenarios\\windows\\_library\\productivity\\prod_close') + import_run_user_only('scenarios\\windows\\_library\\productivity\\prod_kill') + import_run_user_only('scenarios\\windows\\_library\\productivity\\prod_open') + import_run_user_only('scenarios\\windows\\_library\\productivity\\prod_setup') + import_run_user_only('scenarios\\windows\\_library\\web\\web_close_browser') + import_run_user_only('scenarios\\windows\\_library\\web\\web_close_tabs') + import_run_user_only('scenarios\\windows\\_library\\web\\web_kill') + import_run_user_only('scenarios\\windows\\_library\\web\\web_run') + import_run_user_only('scenarios\\windows\\_library\\web\\web_setup') + import_run_user_only('scenarios\\windows\\_library\\web\\web_switchto') + return