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
RedHatQE · Dec 25, 2024 · 4637251 · 4637251
1 parent 30e8ca8
commit 4637251
Show file tree

Hide file tree

Showing 51 changed files with 208 additions and 344 deletions.
diff --git a/ocp_resources/benchmark.py b/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
 

diff --git a/ocp_resources/cdi_config.py b/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
 

diff --git a/ocp_resources/daemonset.py b/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
 

diff --git a/ocp_resources/datavolume.py b/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,

diff --git a/ocp_resources/deployment.py b/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
 
 

diff --git a/ocp_resources/endpoint_slice.py b/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
 
 

diff --git a/ocp_resources/endpoints.py b/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
 
 

diff --git a/ocp_resources/forklift_controller.py b/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
     """

diff --git a/ocp_resources/hook.py b/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.
     """

diff --git a/ocp_resources/host.py b/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()

diff --git a/ocp_resources/hostpath_provisioner.py b/ocp_resources/hostpath_provisioner.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from ocp_resources.constants import TIMEOUT_4MINUTES
+from ocp_resources.utils.constants import TIMEOUT_4MINUTES
 from ocp_resources.resource import Resource
 
 

diff --git a/ocp_resources/hyperconverged.py b/ocp_resources/hyperconverged.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 NamespacedResource
 
 

diff --git a/ocp_resources/image_stream.py b/ocp_resources/image_stream.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 NamespacedResource
 
 

diff --git a/ocp_resources/job.py b/ocp_resources/job.py
@@ -1,6 +1,6 @@
 import kubernetes
 
-from ocp_resources.constants import TIMEOUT_4MINUTES
+from ocp_resources.utils.constants import TIMEOUT_4MINUTES
 from ocp_resources.resource import NamespacedResource
 
 

diff --git a/ocp_resources/lease.py b/ocp_resources/lease.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 NamespacedResource
 
 

diff --git a/ocp_resources/machine_health_check.py b/ocp_resources/machine_health_check.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 NamespacedResource
 
 

diff --git a/ocp_resources/machine_set.py b/ocp_resources/machine_set.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 NamespacedResource
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 

diff --git a/ocp_resources/migration.py b/ocp_resources/migration.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 Migration(NamespacedResource, MTV):
+class Migration(NamespacedResource):
     """
     Migration Toolkit For Virtualization (MTV) Migration object.
 
@@ -41,7 +40,6 @@ def __init__(
         self.plan_name = plan_name
         self.plan_namespace = plan_namespace
         self.cut_over = cut_over
-        self.condition_message_succeeded = self.ConditionMessage.MIGRATION_SUCCEEDED
 
     def to_dict(self) -> None:
         super().to_dict()

diff --git a/ocp_resources/mtv.py b/ocp_resources/mtv.py
diff --git a/ocp_resources/network_map.py b/ocp_resources/network_map.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 NetworkMap(NamespacedResource, MTV):
+class NetworkMap(NamespacedResource):
     """
     Migration Toolkit For Virtualization (MTV) NetworkMap object.
 
@@ -56,7 +55,24 @@ def __init__(
         self.source_provider_namespace = source_provider_namespace
         self.destination_provider_name = destination_provider_name
         self.destination_provider_namespace = destination_provider_namespace
-        self.condition_message_ready = self.ConditionMessage.NETWORK_MAP_READY
+
+    @property
+    def map_to_dict(self):
+        return {
+            "spec": {
+                "map": self.mapping,
+                "provider": {
+                    "source": {
+                        "name": self.source_provider_name,
+                        "namespace": self.source_provider_namespace,
+                    },
+                    "destination": {
+                        "name": self.destination_provider_name,
+                        "namespace": self.destination_provider_namespace,
+                    },
+                },
+            }
+        }
 
     def to_dict(self) -> None:
         super().to_dict()

diff --git a/ocp_resources/node_maintenance.py b/ocp_resources/node_maintenance.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 Resource
 
 

diff --git a/ocp_resources/node_network_configuration_policy.py b/ocp_resources/node_network_configuration_policy.py
@@ -2,7 +2,7 @@
 
 from kubernetes.dynamic.exceptions import ConflictError
 
-from ocp_resources.constants import TIMEOUT_4MINUTES
+from ocp_resources.utils.constants import TIMEOUT_4MINUTES
 from ocp_resources.exceptions import NNCPConfigurationFailed
 from ocp_resources.node import Node
 from ocp_resources.node_network_configuration_enactment import (

diff --git a/ocp_resources/node_network_state.py b/ocp_resources/node_network_state.py
@@ -2,7 +2,7 @@
 
 from kubernetes.dynamic.exceptions import ConflictError
 
-from ocp_resources.constants import TIMEOUT_4MINUTES
+from ocp_resources.utils.constants import TIMEOUT_4MINUTES
 from ocp_resources.resource import Resource
 from timeout_sampler import TimeoutSampler
 

diff --git a/ocp_resources/ocs_initialization.py b/ocp_resources/ocs_initialization.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 NamespacedResource
 
 

diff --git a/ocp_resources/operator_group.py b/ocp_resources/operator_group.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 NamespacedResource
 
 

diff --git a/ocp_resources/operator_source.py b/ocp_resources/operator_source.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 NamespacedResource
 
 

diff --git a/ocp_resources/persistent_volume_claim.py b/ocp_resources/persistent_volume_claim.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from ocp_resources.constants import TIMEOUT_4MINUTES
+from ocp_resources.utils.constants import TIMEOUT_4MINUTES
 from ocp_resources.resource import NamespacedResource