MTV refactor, order files and classes (#2246)

* remove MTV resource, Move Resource constants to class

* remove MTV resource, Move Resource constants to class

* Use `dict`, list` and `|` for typing

* Remove NOQA

Author: myakove

ocp_resources/benchmark.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional
 
-from ocp_resources.constants import NOT_FOUND_ERROR_EXCEPTION_DICT, TIMEOUT_30SEC
+from ocp_resources.utils.constants import NOT_FOUND_ERROR_EXCEPTION_DICT, TIMEOUT_30SEC
 from ocp_resources.resource import NamespacedResource
 from timeout_sampler import TimeoutSampler
 

ocp_resources/cdi_config.py

@@ -1,7 +1,7 @@
 # Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md
 
 from typing import Any, Dict, List, Optional
-from ocp_resources.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINUTES
+from ocp_resources.utils.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINUTES
 from ocp_resources.resource import Resource
 from timeout_sampler import TimeoutSampler
 

ocp_resources/daemonset.py

@@ -1,6 +1,6 @@
 import kubernetes
 
-from ocp_resources.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINUTES
+from ocp_resources.utils.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINUTES
 from ocp_resources.resource import NamespacedResource
 from timeout_sampler import TimeoutSampler
 

ocp_resources/datavolume.py

@@ -1,4 +1,4 @@
-from ocp_resources.constants import (
+from ocp_resources.utils.constants import (
     TIMEOUT_1MINUTE,
     TIMEOUT_2MINUTES,
     TIMEOUT_4MINUTES,

ocp_resources/deployment.py

@@ -3,7 +3,7 @@
 from typing import Any, Dict, Optional
 from timeout_sampler import TimeoutSampler, TimeoutWatch
 
-from ocp_resources.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINUTES
+from ocp_resources.utils.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINUTES
 from ocp_resources.resource import NamespacedResource, MissingRequiredArgumentError
 
 

ocp_resources/endpoint_slice.py

@@ -1,4 +1,4 @@
-from ocp_resources.constants import TIMEOUT_4MINUTES
+from ocp_resources.utils.constants import TIMEOUT_4MINUTES
 from ocp_resources.resource import MissingRequiredArgumentError, NamespacedResource
 
 

ocp_resources/endpoints.py

@@ -1,4 +1,4 @@
-from ocp_resources.constants import TIMEOUT_4MINUTES
+from ocp_resources.utils.constants import TIMEOUT_4MINUTES
 from ocp_resources.resource import MissingRequiredArgumentError, NamespacedResource
 
 

ocp_resources/forklift_controller.py

@@ -1,8 +1,7 @@
-from ocp_resources.mtv import MTV
 from ocp_resources.resource import NamespacedResource
 
 
-class ForkliftController(NamespacedResource, MTV):
+class ForkliftController(NamespacedResource):
     """
     Migration Toolkit For Virtualization (MTV) ForkliftController Resource
     """

ocp_resources/hook.py

@@ -1,9 +1,8 @@
-from ocp_resources.constants import TIMEOUT_4MINUTES
-from ocp_resources.mtv import MTV
+from ocp_resources.utils.constants import TIMEOUT_4MINUTES
 from ocp_resources.resource import NamespacedResource
 
 
-class Hook(NamespacedResource, MTV):
+class Hook(NamespacedResource):
     """
     Migration Tool for Virtualization (MTV) Plan's Hook Resource.
     """

ocp_resources/host.py

@@ -1,9 +1,8 @@
-from ocp_resources.constants import TIMEOUT_4MINUTES
-from ocp_resources.mtv import MTV
+from ocp_resources.utils.constants import TIMEOUT_4MINUTES
 from ocp_resources.resource import NamespacedResource
 
 
-class Host(NamespacedResource, MTV):
+class Host(NamespacedResource):
     """
     Migration Toolkit For Virtualization (MTV) Host resource.
     """
@@ -41,7 +40,6 @@ def __init__(
         self.provider_namespace = provider_namespace
         self.secret_name = secret_name or f"{self.name}-secret"
         self.secret_namespace = secret_namespace or self.namespace
-        self.condition_message_ready = self.ConditionMessage.HOST_READY
 
     def to_dict(self) -> None:
         super().to_dict()