CSTACKEX-301: resolving comments

Author: sathvikaragi

test/integration/plugins/ontap/iscsi/instance/test_vm_volume_attach.py

@@ -696,15 +696,7 @@ def test_06_stop_vm_lun_unmapped(self):
 
         cmd = stopVirtualMachineAPI.stopVirtualMachineCmd()
         cmd.id = self.__class__.vm.id
-        try:
-            self.apiClient.stopVirtualMachine(cmd)
-        except Exception as exc:
-            # Marvin can lose the management API connection while polling an
-            # already-submitted async stop job. The VM state is authoritative,
-            # so continue polling before treating the stop as failed.
-            logger.warning(
-                "stopVirtualMachine polling failed; checking VM state: %s",
-                exc)
+        self.apiClient.stopVirtualMachine(cmd)
 
         result = self._poll_vm_state(self.__class__.vm.id, "Stopped",
                                      timeout=300)

test/integration/plugins/ontap/nfs3/instance/test_vm_volume_attach.py

@@ -650,15 +650,7 @@ def test_06_stop_vm_export_retained(self):
 
         cmd = stopVirtualMachineAPI.stopVirtualMachineCmd()
         cmd.id = vm.id
-        try:
-            self.apiClient.stopVirtualMachine(cmd)
-        except Exception as exc:
-            # Marvin can lose the management API connection while polling an
-            # already-submitted async stop job. The VM state is authoritative,
-            # so continue polling before treating the stop as failed.
-            logger.warning(
-                "stopVirtualMachine polling failed; checking VM state: %s",
-                exc)
+        self.apiClient.stopVirtualMachine(cmd)
 
         result = self._poll_vm_state(vm.id, "Stopped", timeout=300)
         self.assertEqual(