PTFE-1959 support deletion of non-existent vsphere vm (#667)

scality · Aug 30, 2024 · 3d04d0b · 3d04d0b
1 parent 2d4bb12
commit 3d04d0b
Show file tree

Hide file tree

Showing 3 changed files with 1,872 additions and 1 deletion.
diff --git a/runner_manager/backend/vsphere.py b/runner_manager/backend/vsphere.py
@@ -4,6 +4,7 @@
 
 from com.vmware.content.library_client import Item
 from com.vmware.content_client import Library
+from com.vmware.vapi.std.errors_client import NotFound
 from com.vmware.vcenter.ovf_client import (
     DiskProvisioningType,
     LibraryItem,
@@ -167,7 +168,12 @@ def create(self, runner: Runner) -> Runner:
     def delete(self, runner: Runner):
         client = self._create_client()
         if runner.instance_id is not None:
-            state = client.vcenter.vm.Power.get(runner.instance_id)
+            try:
+                state = client.vcenter.vm.Power.get(runner.instance_id)
+                log.debug(f"VM {runner.name} state: {state}")
+            except NotFound:
+                log.info(f"VM {runner.name} not found.")
+                return super().delete(runner)
             if state == Power.Info(state=Power.State.POWERED_ON):
                 client.vcenter.vm.Power.stop(runner.instance_id)
             elif state == Power.Info(state=Power.State.SUSPENDED):

diff --git a/tests/unit/backend/test_vsphere.py b/tests/unit/backend/test_vsphere.py
@@ -40,6 +40,9 @@ def vsphere_group(settings) -> RunnerGroup:
 
 @mark.skipif(not os.getenv("GOVC_URL"), reason="GOVC_URL environment variable not set")
 def test_vsphere_client(vsphere_group: RunnerGroup, runner: Runner):
+    # deleting the runner should not raise an exception
+    runner.instance_id = "i-1234"
+    vsphere_group.backend.delete(runner)
     runner = vsphere_group.backend.create(runner)
     assert runner.instance_id is not None
     vsphere_group.backend.delete(runner)