From 382457e541dc99f56b552ae104db6135cfe81830 Mon Sep 17 00:00:00 2001 From: John Feng Date: Wed, 20 Mar 2024 10:51:16 -0700 Subject: [PATCH 1/4] remove try exception and blank space --- .../vm_extensions/linux_patch_extension.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/microsoft/testsuites/vm_extensions/linux_patch_extension.py b/microsoft/testsuites/vm_extensions/linux_patch_extension.py index 15ab59a012..6dc05671f4 100644 --- a/microsoft/testsuites/vm_extensions/linux_patch_extension.py +++ b/microsoft/testsuites/vm_extensions/linux_patch_extension.py @@ -1,8 +1,6 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT license. - -import time from assertpy.assertpy import assert_that from lisa.base_tools.service import Service from lisa.sut_orchestrator.azure.common import ( @@ -22,7 +20,6 @@ ) from lisa.sut_orchestrator.azure.platform_ import AzurePlatform -from lisa.util import LisaException def _verify_vm_agent_running(node: Node, log: Logger) -> None: service = node.tools[Service] @@ -40,7 +37,6 @@ def _verify_vm_agent_running(node: Node, log: Logger) -> None: description="Test for Linux Patch Extension", requirement=simple_requirement(unsupported_os=[]), ) - class LinuxPatchExtensionBVT(TestSuite): @TestCaseMetadata( description=""" @@ -59,15 +55,12 @@ def verify_vm_assess_patches(self, node:Node, environment:Environment, log:Logge resource_group_name = node_context.resource_group_name vm_name = node_context.vm_name - # verify vm agent is running + # verify vm agent service is running, lpe is a dependent of vm agent service _verify_vm_agent_running(node, log) - try: - operation = compute_client.virtual_machines.begin_assess_patches(resource_group_name=resource_group_name,vm_name=vm_name) - # set wait operation timeout 10 min, status file should be generated before timeout - assess_result = wait_operation(operation, 600) - except Exception as e: - raise e + operation = compute_client.virtual_machines.begin_assess_patches(resource_group_name=resource_group_name,vm_name=vm_name) + # set wait operation timeout 10 min, status file should be generated before timeout + assess_result = wait_operation(operation, 600) assert assess_result, "assess_result shouldn't be None" assert_that(assess_result["status"]).described_as( @@ -77,5 +70,4 @@ def verify_vm_assess_patches(self, node:Node, environment:Environment, log:Logge assert_that(assess_result["error"]['code']).described_as( "Expected no error in assess patches operation" ).is_equal_to("0") - \ No newline at end of file From aee35da3dd9db8d85186d637051b0aeeef1b91ac Mon Sep 17 00:00:00 2001 From: John Feng Date: Wed, 20 Mar 2024 11:33:14 -0700 Subject: [PATCH 2/4] reformat py file --- .../vm_extensions/linux_patch_extension.py | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/microsoft/testsuites/vm_extensions/linux_patch_extension.py b/microsoft/testsuites/vm_extensions/linux_patch_extension.py index 6dc05671f4..9a2d475b7f 100644 --- a/microsoft/testsuites/vm_extensions/linux_patch_extension.py +++ b/microsoft/testsuites/vm_extensions/linux_patch_extension.py @@ -1,5 +1,4 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT license. +# Copyright (c) Microsoft Corporation. Licensed under the MIT license. from assertpy.assertpy import assert_that from lisa.base_tools.service import Service @@ -18,19 +17,24 @@ TestSuiteMetadata, simple_requirement, ) - from lisa.sut_orchestrator.azure.platform_ import AzurePlatform + def _verify_vm_agent_running(node: Node, log: Logger) -> None: service = node.tools[Service] - is_vm_agent_running = service.is_service_running("walinuxagent.service") or service.is_service_running("waagent.service") - - log.debug(f"verify walinuxagent or waagent service is running: {is_vm_agent_running}") - + is_vm_agent_running = service.is_service_running( + "walinuxagent.service" + ) or service.is_service_running("waagent.service") + + log.debug( + f"verify walinuxagent or waagent service running:{is_vm_agent_running}" + ) + assert_that(is_vm_agent_running).described_as( "Expected walinuxagent or waagent service is running" ).is_true() + @TestSuiteMetadata( area="vm_extension", category="functional", @@ -40,26 +44,34 @@ def _verify_vm_agent_running(node: Node, log: Logger) -> None: class LinuxPatchExtensionBVT(TestSuite): @TestCaseMetadata( description=""" - Verify walinuxagent or waagent service is running on virtual machine. - Perform assess patches to trigger Microsoft.CPlat.Core.LinuxPatchExtension creation in a virtual machine. - Verify status file response for validity. + Verify walinuxagent or waagent service is running on vm. Perform assess + patches to trigger Microsoft.CPlat.Core.LinuxPatchExtension creation in + vm. Verify status file response for validity. """, priority=1, ) - def verify_vm_assess_patches(self, node:Node, environment:Environment, log:Logger)->None: + def verify_vm_assess_patches( + self, node: Node, environment: Environment, log: Logger + ) -> None: assert environment.platform, "platform shouldn't be None." platform: AzurePlatform = environment.platform # type: ignore - assert isinstance(platform, AzurePlatform), "platform should be AzurePlatform instance" + assert isinstance( + platform, AzurePlatform + ), "platform should be AzurePlatform instance" compute_client = get_compute_client(platform) node_context = get_node_context(node) resource_group_name = node_context.resource_group_name vm_name = node_context.vm_name - # verify vm agent service is running, lpe is a dependent of vm agent service + # verify vm agent service is running, lpe is a dependent of vm agent + # service _verify_vm_agent_running(node, log) - operation = compute_client.virtual_machines.begin_assess_patches(resource_group_name=resource_group_name,vm_name=vm_name) - # set wait operation timeout 10 min, status file should be generated before timeout + operation = compute_client.virtual_machines.begin_assess_patches( + resource_group_name=resource_group_name, vm_name=vm_name + ) + # set wait operation timeout 10 min, status file should be generated + # before timeout assess_result = wait_operation(operation, 600) assert assess_result, "assess_result shouldn't be None" @@ -67,7 +79,6 @@ def verify_vm_assess_patches(self, node:Node, environment:Environment, log:Logge "Expected the assess patches to succeed" ).is_equal_to("Succeeded") - assert_that(assess_result["error"]['code']).described_as( + assert_that(assess_result["error"]["code"]).described_as( "Expected no error in assess patches operation" ).is_equal_to("0") - \ No newline at end of file From b679c9ecbddcc136f926fb3778b67c4afe130190 Mon Sep 17 00:00:00 2001 From: John Feng Date: Wed, 20 Mar 2024 12:14:10 -0700 Subject: [PATCH 3/4] resort the imports --- .../vm_extensions/linux_patch_extension.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/microsoft/testsuites/vm_extensions/linux_patch_extension.py b/microsoft/testsuites/vm_extensions/linux_patch_extension.py index 9a2d475b7f..c66a148708 100644 --- a/microsoft/testsuites/vm_extensions/linux_patch_extension.py +++ b/microsoft/testsuites/vm_extensions/linux_patch_extension.py @@ -1,12 +1,6 @@ # Copyright (c) Microsoft Corporation. Licensed under the MIT license. from assertpy.assertpy import assert_that -from lisa.base_tools.service import Service -from lisa.sut_orchestrator.azure.common import ( - get_compute_client, - get_node_context, - wait_operation, -) from lisa import ( Environment, @@ -17,6 +11,12 @@ TestSuiteMetadata, simple_requirement, ) +from lisa.base_tools.service import Service +from lisa.sut_orchestrator.azure.common import ( + get_compute_client, + get_node_context, + wait_operation, +) from lisa.sut_orchestrator.azure.platform_ import AzurePlatform From 530a56fbf415268e5ed0bc3b9a7a20c5aa8a9a01 Mon Sep 17 00:00:00 2001 From: John Feng Date: Wed, 20 Mar 2024 13:56:35 -0700 Subject: [PATCH 4/4] fix flake8 pylint issue --- microsoft/testsuites/vm_extensions/linux_patch_extension.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/microsoft/testsuites/vm_extensions/linux_patch_extension.py b/microsoft/testsuites/vm_extensions/linux_patch_extension.py index c66a148708..ba9aa22ffa 100644 --- a/microsoft/testsuites/vm_extensions/linux_patch_extension.py +++ b/microsoft/testsuites/vm_extensions/linux_patch_extension.py @@ -26,9 +26,7 @@ def _verify_vm_agent_running(node: Node, log: Logger) -> None: "walinuxagent.service" ) or service.is_service_running("waagent.service") - log.debug( - f"verify walinuxagent or waagent service running:{is_vm_agent_running}" - ) + log.debug(f"verify walinuxagent or waagent running:{is_vm_agent_running}") assert_that(is_vm_agent_running).described_as( "Expected walinuxagent or waagent service is running"