clean_up, add timeout arg (#2069)

* clean_up, add `timeout` arg

* Remove clean_up from Project

ocp_resources/project.py

@@ -1,11 +1,13 @@
 from warnings import warn
 
-from ocp_resources.project_project_openshift_io import Project  # noqa: F401
+from ocp_resources.project_project_openshift_io import Project, ProjectRequest  # noqa: F401
+
 
 warn(
     f"The module {__name__} is deprecated and will be removed in version 4.17, "
     "`Project` should be either imported from `ocp_resources.project_project_openshift_io` or "
-    "`ocp_resources.project_config_openshift_io` depending on the API group.",
+    "`ocp_resources.project_config_openshift_io` depending on the API group."
+    "`ProjectRequest` should be imported from `ocp_resources.project_project_openshift_io`",
     DeprecationWarning,
     stacklevel=2,
 )

ocp_resources/project_project_openshift_io.py

@@ -82,5 +82,5 @@ def to_dict(self) -> None:
             if self.display_name:
                 self.res["displayName"] = self.display_name
 
-    def clean_up(self, wait: bool = True) -> bool:
-        return Project(name=self.name).delete(wait=wait)
+    def clean_up(self, wait: bool = True, timeout: Optional[int] = None) -> bool:
+        return Project(name=self.name).clean_up(wait=wait, timeout=timeout)

ocp_resources/resource.py

@@ -557,13 +557,14 @@ def deploy(self, wait: bool = False) -> "Resource":
         self.create(wait=wait)
         return self
 
-    def clean_up(self, wait: bool = True) -> bool:
+    def clean_up(self, wait: bool = True, timeout: Optional[int] = None) -> bool:
         """
         For debug, export SKIP_RESOURCE_TEARDOWN to skip resource teardown.
         Spaces are important in the export dict
 
         Args:
             wait (bool, optional): Wait for resource deletion. Defaults to True.
+            timeout (int, optional): Timeout in seconds to wait for resource to be deleted. Defaults to 240.
 
         Returns:
             bool: True if resource was deleted else False.
@@ -594,7 +595,7 @@ def clean_up(self, wait: bool = True) -> bool:
             )
             return False
 
-        return self.delete(wait=wait, timeout=self.delete_timeout)
+        return self.delete(wait=wait, timeout=timeout or self.delete_timeout)
 
     @classmethod
     def _prepare_resources(