openshift-python-wrapper 11.0.141__tar.gz → 11.0.142__tar.gz

{openshift_python_wrapper-11.0.141 → openshift_python_wrapper-11.0.142}/.gitignore

@@ -143,3 +143,6 @@ package-lock.json
 
 # Large schema files (we keep the compressed versions)
 class_generator/schema/__resources-mappings.json
+
+# graft's local graph cache — regenerable, not committed (run `graft build`).
+/graft/

openshift_python_wrapper-11.0.142/.ignore

@@ -0,0 +1,5 @@
+# graft's cards are gitignored but should stay greppable: ripgrep reads
+# .ignore before .gitignore, so this re-admits the tree to search only.
+!graft/
+graft/.cache/
+graft/.graph/

{openshift_python_wrapper-11.0.141 → openshift_python_wrapper-11.0.142}/.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
       - id: check-toml
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.3.0
+    rev: 7.4.1
     hooks:
       - id: flake8
         args: [--config=.flake8]
@@ -46,7 +46,7 @@ repos:
           ]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.16.5
+    rev: v0.16.10
     hooks:
       - id: ruff
       - id: ruff-format
@@ -57,7 +57,7 @@ repos:
       - id: gitleaks
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v2.3.1
+    rev: v2.4.0
     hooks:
       - id: mypy
         exclude: ^(tests/|examples/|docs/)

{openshift_python_wrapper-11.0.141 → openshift_python_wrapper-11.0.142}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: openshift-python-wrapper
-Version: 11.0.141
+Version: 11.0.142
 Summary: Wrapper around https://github.com/kubernetes-client/python
 Project-URL: homepage, https://github.com/RedHatQE/openshift-python-wrapper
 Project-URL: documentation, https://openshift-python-wrapper.readthedocs.io/en/latest/

{openshift_python_wrapper-11.0.141 → openshift_python_wrapper-11.0.142}/ocp_resources/migration.py

@@ -1,3 +1,8 @@
+from datetime import date
+from typing import Any
+
+from kubernetes.dynamic import DynamicClient
+
 from ocp_resources.resource import NamespacedResource
 from ocp_resources.utils.constants import TIMEOUT_4MINUTES
 
@@ -9,7 +14,9 @@ class Migration(NamespacedResource):
     Args:
         plan_name (str): MTV Plan CR name.
         plan_namespace (str): MTV Plan CR namespace.
-        cut_over (date): For Warm Migration Only.Cut Over Phase Start Date & Time.
+        cut_over (date): For Warm Migration Only. Cut Over Phase Start Date & Time.
+        resume_conversion (bool): Resume only the conversion phase of a failed warm
+            migration, reusing preserved PVCs from the prior disk copy.
 
     """
 
@@ -17,17 +24,19 @@ class Migration(NamespacedResource):
 
     def __init__(
         self,
-        name=None,
-        namespace=None,
-        plan_name=None,
-        plan_namespace=None,
-        cut_over=None,
-        client=None,
-        teardown=True,
-        yaml_file=None,
-        delete_timeout=TIMEOUT_4MINUTES,
-        **kwargs,
-    ):
+        name: str | None = None,
+        namespace: str | None = None,
+        plan_name: str | None = None,
+        plan_namespace: str | None = None,
+        cut_over: date | None = None,
+        client: DynamicClient | None = None,
+        teardown: bool = True,
+        yaml_file: str | None = None,
+        delete_timeout: int = TIMEOUT_4MINUTES,
+        *,
+        resume_conversion: bool | None = None,
+        **kwargs: Any,
+    ) -> None:
         super().__init__(
             name=name,
             namespace=namespace,
@@ -40,6 +49,7 @@ class Migration(NamespacedResource):
         self.plan_name = plan_name
         self.plan_namespace = plan_namespace
         self.cut_over = cut_over
+        self.resume_conversion = resume_conversion
 
     def to_dict(self) -> None:
         super().to_dict()
@@ -55,3 +65,6 @@ class Migration(NamespacedResource):
 
             if self.cut_over:
                 self.res["spec"]["cutover"] = self.cut_over.strftime(format="%Y-%m-%dT%H:%M:%SZ")
+
+            if self.resume_conversion:
+                self.res["spec"]["resumeConversion"] = True

{openshift_python_wrapper-11.0.141 → openshift_python_wrapper-11.0.142}/ocp_resources/nemo_guardrails.py

@@ -18,8 +18,10 @@ class NemoGuardrails(NamespacedResource):
         self,
         ca_bundle_config: dict[str, Any] | None = None,
         env: list[Any] | None = None,
+        expose_route: bool | None = None,
         nemo_configs: list[Any] | None = None,
         replicas: int | None = None,
+        template: dict[str, Any] | None = None,
         **kwargs: Any,
     ) -> None:
         r"""
@@ -29,19 +31,26 @@ class NemoGuardrails(NamespacedResource):
 
             env (list[Any]): Define Env information for the main container
 
+            expose_route (bool): ExposeRoute controls whether an external route to the NeMo Guardrails
+              server is created. Defaults to true.
+
             nemo_configs (list[Any]): NemoConfig should be the names of the configmaps containing NeMO
               server configuration files. All files in NemoConfigs will be
               mounted to /app/config/$Name
 
             replicas (int): Number of replicas for the NeMo Guardrails deployment
 
+            template (dict[str, Any]): Template describes the pod template used by the deployment
+
         """
         super().__init__(**kwargs)
 
         self.ca_bundle_config = ca_bundle_config
         self.env = env
+        self.expose_route = expose_route
         self.nemo_configs = nemo_configs
         self.replicas = replicas
+        self.template = template
 
     def to_dict(self) -> None:
 
@@ -62,7 +71,13 @@ class NemoGuardrails(NamespacedResource):
             if self.env is not None:
                 _spec["env"] = self.env
 
+            if self.expose_route is not None:
+                _spec["exposeRoute"] = self.expose_route
+
             if self.replicas is not None:
                 _spec["replicas"] = self.replicas
 
+            if self.template is not None:
+                _spec["template"] = self.template
+
     # End of generated code

{openshift_python_wrapper-11.0.141 → openshift_python_wrapper-11.0.142}/ocp_resources/plan.py

@@ -36,6 +36,9 @@ class Plan(NamespacedResource):
         preserve_static_ips (bool, optional): Whether to preserve static IPs during migration.
         target_node_selector (dict, optional): Node selector for the target VM. Specifies which node labels
                                              should be used for NodeSelector parameter of VMI resource.
+        convertor_node_selector (dict[str, str], optional): Node selector for virt-v2v conversion pods.
+                                                             For vSphere warm migrations using VDDK, this
+                                                             selector is also applied to CDI importer pods.
         target_labels (dict, optional): Labels to be applied to the target VM. Specifies which labels
                                       should be added to the target VM resource.
         target_affinity (dict, optional): Affinity rules for the target VM. Specifies which affinity
@@ -89,6 +92,7 @@ class Plan(NamespacedResource):
         run_preflight_inspection: bool | None = None,
         rdm_as_lun: bool | None = None,
         scsi_reservation: bool | None = None,
+        convertor_node_selector: dict[str, str] | None = None,
         **kwargs: Any,
     ) -> None:
         super().__init__(**kwargs)
@@ -120,6 +124,7 @@ class Plan(NamespacedResource):
         self.migrate_shared_disks = migrate_shared_disks
         self.preserve_static_ips = preserve_static_ips
         self.target_node_selector = target_node_selector
+        self.convertor_node_selector = convertor_node_selector
         self.target_labels = target_labels
         self.target_affinity = target_affinity
         self.enable_nested_virtualization = enable_nested_virtualization
@@ -219,6 +224,9 @@ class Plan(NamespacedResource):
             if self.target_node_selector is not None:
                 spec["targetNodeSelector"] = self.target_node_selector
 
+            if self.convertor_node_selector is not None:
+                spec["convertorNodeSelector"] = self.convertor_node_selector
+
             if self.target_labels is not None:
                 spec["targetLabels"] = self.target_labels
 

{openshift_python_wrapper-11.0.141 → openshift_python_wrapper-11.0.142}/pyproject.toml

@@ -75,7 +75,7 @@ include = [
 [project]
 requires-python = ">=3.10"
 name = "openshift-python-wrapper"
-version = "11.0.141"
+version = "11.0.142"
 description = "Wrapper around https://github.com/kubernetes-client/python"
 readme = "README.md"
 license = "Apache-2.0"

openshift_python_wrapper-11.0.142/tests/test_resources/test_migration.py

@@ -0,0 +1,87 @@
+import pytest
+
+from fake_kubernetes_client.dynamic_client import FakeDynamicClient
+from ocp_resources.migration import Migration
+from ocp_resources.utils.constants import TIMEOUT_4MINUTES
+
+
+@pytest.mark.incremental
+class TestMigration:
+    @pytest.fixture(scope="class")
+    def migration(self, fake_client: FakeDynamicClient) -> Migration:
+        return Migration(
+            client=fake_client,
+            name="test-migration",
+            namespace="default",
+            plan_name="test-plan",
+            plan_namespace="default",
+        )
+
+    def test_01_create_migration(self, migration: Migration) -> None:
+        """Test creating Migration"""
+        deployed_resource = migration.deploy()
+        assert deployed_resource
+        assert deployed_resource.name == "test-migration"
+        assert migration.exists
+
+    def test_02_get_migration(self, migration: Migration) -> None:
+        """Test getting Migration"""
+        assert migration.instance
+        assert migration.kind == "Migration"
+
+    def test_03_migration_spec(self, migration: Migration) -> None:
+        """Test that Migration spec contains plan details"""
+        resource_dict = migration.instance.to_dict()
+        assert resource_dict["spec"]["plan"]["name"] == "test-plan"
+        assert resource_dict["spec"]["plan"]["namespace"] == "default"
+
+    def test_04_update_migration(self, migration: Migration) -> None:
+        """Test updating Migration"""
+        resource_dict = migration.instance.to_dict()
+        resource_dict["metadata"]["labels"] = {"updated": "true"}
+        migration.update(resource_dict=resource_dict)
+        assert migration.labels["updated"] == "true"
+
+    def test_05_delete_migration(self, migration: Migration) -> None:
+        """Test deleting Migration"""
+        migration.clean_up(wait=False)
+        # Verify resource no longer exists after deletion
+        assert not migration.exists
+
+    def test_06_migration_with_resume_conversion(self, fake_client: FakeDynamicClient) -> None:
+        """Test Migration with resume_conversion parameter"""
+        migration = Migration(
+            client=fake_client,
+            name="test-migration-resume",
+            namespace="default",
+            plan_name="test-plan",
+            plan_namespace="default",
+            resume_conversion=True,
+        )
+        deployed_resource = migration.deploy()
+        assert deployed_resource
+        resource_dict = deployed_resource.instance.to_dict()
+        assert resource_dict["spec"]["resumeConversion"] is True
+        deployed_resource.clean_up(wait=False)
+
+    def test_07_migration_with_positional_client(self, fake_client: FakeDynamicClient) -> None:
+        """Preserve the existing positional constructor arguments.
+
+        Args:
+            fake_client (FakeDynamicClient): Fake Kubernetes client supplied by the fixture.
+        """
+        migration = Migration(
+            "test-migration-positional",
+            "default",
+            "test-plan",
+            "default",
+            None,
+            fake_client,
+            True,
+            None,
+            TIMEOUT_4MINUTES,
+        )
+        assert migration.client is fake_client
+        deployed_resource = migration.deploy()
+        assert "resumeConversion" not in deployed_resource.instance.to_dict()["spec"]
+        deployed_resource.clean_up(wait=False)