PullRequest: 40 fix: return None when delete non-exist resource

Merge branch fix_delete of [email protected]:oceanbase/OBShell-SDK-Python.git into master
https://code.alipay.com/oceanbase/OBShell-SDK-Python/pull_requests/40

Signed-off-by: 阿绿 <[email protected]>


* fix: return None when delete non-exist resource

Author: Junkrat77

obshell/service/client_v1.py

@@ -236,6 +236,7 @@ def remove(self, ip: str, port: int) -> task.DagDetailDTO:
 
         Returns:
             Task detail as task.DagDetailDTO.
+            return None if the agent is not in the uninitialized cluster.
 
         Raises:
             OBShellHandleError: error message return by OBShell server.
@@ -256,7 +257,7 @@ def remove_sync(self, ip: str, port: int) -> task.DagDetailDTO:
                 include the failed task detail and logs.
         """
         dag = self.remove(ip, port)
-        return self.wait_dag_succeed(dag.generic_id)
+        return None if dag is None else self.wait_dag_succeed(dag.generic_id)
 
     def config_observer(self,
                         configs: dict,
@@ -1138,6 +1139,7 @@ def drop_tenant_sync(self, tenant_name: str, need_recycle: bool = False) -> task
 
         Returns:
             Task detail as task.DagDetailDTO.
+            Return None if tenant not exist.
 
         Raises:
             OBShellHandleError: error message return by OBShell server.
@@ -1237,14 +1239,15 @@ def delete_tenant_replica_sync(self, tenant_name: str, zones: List[str]) -> task
 
         Returns:
             Task detail as task.DagDetailDTO.
+            Return None if there is no replica on zones.
 
         Raises:
             OBShellHandleError: error message return by OBShell server.
             TaskExecuteFailedError: raise when the task failed,
                 include the failed task detail and logs.
         """
         dag = self.delete_tenant_replica(tenant_name, zones)
-        return self.wait_dag_succeed(dag.generic_id)
+        return None if dag is None else self.wait_dag_succeed(dag.generic_id)
 
     def modify_tenant_replica(self, tenant_name: str, zone_list: List[tenant.ModifyReplicaParam]) -> task.DagDetailDTO:
         """Modifies tenant replicas.
@@ -1423,7 +1426,7 @@ def purge_recyclebin_tenant(self, object_or_original_name: str) -> task.DagDetai
             f"/api/v1/recyclebin/tenant/{object_or_original_name}", "DELETE")
         return self.__handle_task_ret_request(req)
 
-    def purge_recyclebin_tenant_sync(self, object_or_original_name: str) -> bool:
+    def purge_recyclebin_tenant_sync(self, object_or_original_name: str) -> task.DagDetailDTO:
         """Purges the tenant in recyclebin synchronously.
 
         Args:
@@ -1433,7 +1436,8 @@ def purge_recyclebin_tenant_sync(self, object_or_original_name: str) -> bool:
                 The resource of the tenant won't be recycled.
 
         Returns:
-            bool: True if success.
+            Task detail as task.DagDetailDTO.
+            Return None if the tenant not exist in recyclebin.
 
         Raises:
             OBShellHandleError: Error message return by OBShell server.