Merge pull request red-hat-storage#11050 from vavuthu/fix_mcg_cli_del…

…ete__when_obj_doesnot_exist

mcg-cli delete for object which doesn't exist

ocs_ci/ocs/resources/mcg.py

@@ -861,7 +861,9 @@ def _check_state():
             )
             assert False
 
-    def exec_mcg_cmd(self, cmd, namespace=None, use_yes=False, **kwargs):
+    def exec_mcg_cmd(
+        self, cmd, namespace=None, use_yes=False, ignore_error=False, **kwargs
+    ):
         """
         Executes an MCG CLI command through the noobaa-operator pod's CLI binary
 
@@ -887,12 +889,14 @@ def exec_mcg_cmd(self, cmd, namespace=None, use_yes=False, **kwargs):
         if use_yes:
             result = exec_cmd(
                 [f"yes | {constants.NOOBAA_OPERATOR_LOCAL_CLI_PATH} {cmd} {namespace}"],
+                ignore_error=ignore_error,
                 shell=True,
                 **kwargs,
             )
         else:
             result = exec_cmd(
                 f"{constants.NOOBAA_OPERATOR_LOCAL_CLI_PATH} {cmd} {namespace}",
+                ignore_error=ignore_error,
                 **kwargs,
             )
         result.stdout = result.stdout.decode()

ocs_ci/ocs/resources/objectbucket.py

@@ -383,9 +383,19 @@ def internal_delete(self):
             NotFoundError: In case the OBC was not found
 
         """
-        result = self.mcg.exec_mcg_cmd(f"obc delete {self.name}")
-        if "deleting" and self.name not in result.stderr.lower():
-            raise NotFoundError(result)
+        try:
+            result = self.mcg.exec_mcg_cmd(f"obc delete {self.name}")
+            if (
+                "deleting" not in result.stderr.lower()
+                and self.name not in result.stderr.lower()
+            ):
+                raise NotFoundError(result)
+        except CommandFailed as e:
+            result = self.mcg.exec_mcg_cmd(f"obc delete {self.name}", ignore_error=True)
+            if f'Not Found: ObjectBucketClaim "{self.name}"' in str(
+                result.stderr
+            ) and "does not exist" in str(result.stderr):
+                raise NotFoundError(e)
 
     @property
     def internal_status(self):