From 6adbf507391616cdd097cf0f18316fcd1cdc34e8 Mon Sep 17 00:00:00 2001 From: Maddie Ford Date: Mon, 3 Jul 2023 12:47:15 -0700 Subject: [PATCH] rename scripts to match test suite name --- .../agent_ext_workflow/extension_workflow.py | 22 +++++++++---------- ...ext_workflow-assert_operation_sequence.py} | 0 ...t_ext_workflow-check_data_in_agent_log.py} | 0 ..._between_agent_start_and_gs_processing.py} | 0 4 files changed, 11 insertions(+), 11 deletions(-) rename tests_e2e/tests/scripts/{extension_workflow-assert_operation_sequence.py => agent_ext_workflow-assert_operation_sequence.py} (100%) rename tests_e2e/tests/scripts/{extension_workflow-check_data_in_agent_log.py => agent_ext_workflow-check_data_in_agent_log.py} (100%) rename tests_e2e/tests/scripts/{extension_workflow-validate_no_lag_between_agent_start_and_gs_processing.py => agent_ext_workflow-validate_no_lag_between_agent_start_and_gs_processing.py} (100%) diff --git a/tests_e2e/tests/agent_ext_workflow/extension_workflow.py b/tests_e2e/tests/agent_ext_workflow/extension_workflow.py index 69915f2986..09520fc702 100644 --- a/tests_e2e/tests/agent_ext_workflow/extension_workflow.py +++ b/tests_e2e/tests/agent_ext_workflow/extension_workflow.py @@ -158,7 +158,7 @@ def assert_scenario(self, file_name: str, command_args: str, assert_status: bool log.info("Restart completed:\n%s", output) for args in restart_agent: - self.execute_assertion_script('extension_workflow-assert_operation_sequence.py', args) + self.execute_assertion_script('agent_ext_workflow-assert_operation_sequence.py', args) if assert_status: self.assert_instance_view() @@ -199,13 +199,13 @@ def run(self): # Install test extension on the VM dcr_ext.modify_ext_settings_and_enable() - # command_args are the args we pass to the extension_workflow-assert_operation_sequence.py file to verify + # command_args are the args we pass to the agent_ext_workflow-assert_operation_sequence.py file to verify # the operation sequence for the current test command_args = f"--start-time {start_time} " \ f"normal_ops_sequence " \ f"--version {dcr_ext.version} " \ f"--ops install enable" - # restart_agentcommand_args are the args we pass to the extension_workflow-assert_operation_sequence.py file + # restart_agentcommand_args are the args we pass to the agent_ext_workflow-assert_operation_sequence.py file # to verify the operation sequence after restarting the agent. Restarting agent should just run enable again # and rerun the same settings restart_agent_command_args = [f"--start-time {start_time} " @@ -216,7 +216,7 @@ def run(self): # Assert the operation sequence to confirm the agent executed the operations in the correct chronological # order dcr_ext.assert_scenario( - file_name='extension_workflow-assert_operation_sequence.py', + file_name='agent_ext_workflow-assert_operation_sequence.py', command_args=command_args, assert_status=True, restart_agent=restart_agent_command_args @@ -241,7 +241,7 @@ def run(self): f"--ops enable enable"] dcr_ext.assert_scenario( - file_name='extension_workflow-assert_operation_sequence.py', + file_name='agent_ext_workflow-assert_operation_sequence.py', command_args=command_args, assert_status=True, restart_agent=restart_agent_command_args @@ -273,7 +273,7 @@ def run(self): # logged atleast once in the agent log to ensure that there were no errors when handling special characters # in the agent dcr_ext.assert_scenario( - file_name='extension_workflow-check_data_in_agent_log.py', + file_name='agent_ext_workflow-check_data_in_agent_log.py', command_args=command_args, assert_status=True, data=test_guid @@ -299,7 +299,7 @@ def run(self): f"--ops disable uninstall"] dcr_ext.assert_scenario( - file_name='extension_workflow-assert_operation_sequence.py', + file_name='agent_ext_workflow-assert_operation_sequence.py', command_args=command_args, restart_agent=restart_agent_command_args ) @@ -361,7 +361,7 @@ def run(self): ] dcr_ext.assert_scenario( - file_name='extension_workflow-assert_operation_sequence.py', + file_name='agent_ext_workflow-assert_operation_sequence.py', command_args=command_args, assert_status=True, restart_agent=restart_agent_command_args @@ -426,7 +426,7 @@ def run(self): ] dcr_ext.assert_scenario( - file_name='extension_workflow-assert_operation_sequence.py', + file_name='agent_ext_workflow-assert_operation_sequence.py', command_args=command_args, assert_status=True, restart_agent=restart_agent_command_args @@ -436,8 +436,8 @@ def run(self): log.info("*******Verifying no lag between agent start and gs processing*******") log.info("") - log.info("Running extension_workflow-validate_no_lag_between_agent_start_and_gs_processing.py remotely...") - result = self._ssh_client.run_command("extension_workflow-validate_no_lag_between_agent_start_and_gs_processing.py", use_sudo=True) + log.info("Running agent_ext_workflow-validate_no_lag_between_agent_start_and_gs_processing.py remotely...") + result = self._ssh_client.run_command("agent_ext_workflow-validate_no_lag_between_agent_start_and_gs_processing.py", use_sudo=True) log.info(result) log.info("Validation for no lag time between agent start and gs processing completed successfully") diff --git a/tests_e2e/tests/scripts/extension_workflow-assert_operation_sequence.py b/tests_e2e/tests/scripts/agent_ext_workflow-assert_operation_sequence.py similarity index 100% rename from tests_e2e/tests/scripts/extension_workflow-assert_operation_sequence.py rename to tests_e2e/tests/scripts/agent_ext_workflow-assert_operation_sequence.py diff --git a/tests_e2e/tests/scripts/extension_workflow-check_data_in_agent_log.py b/tests_e2e/tests/scripts/agent_ext_workflow-check_data_in_agent_log.py similarity index 100% rename from tests_e2e/tests/scripts/extension_workflow-check_data_in_agent_log.py rename to tests_e2e/tests/scripts/agent_ext_workflow-check_data_in_agent_log.py diff --git a/tests_e2e/tests/scripts/extension_workflow-validate_no_lag_between_agent_start_and_gs_processing.py b/tests_e2e/tests/scripts/agent_ext_workflow-validate_no_lag_between_agent_start_and_gs_processing.py similarity index 100% rename from tests_e2e/tests/scripts/extension_workflow-validate_no_lag_between_agent_start_and_gs_processing.py rename to tests_e2e/tests/scripts/agent_ext_workflow-validate_no_lag_between_agent_start_and_gs_processing.py