qontract-reconcile 0.10.1rc445__py3-none-any.whl → 0.10.1rc449__py3-none-any.whl

{qontract_reconcile-0.10.1rc445.dist-info → qontract_reconcile-0.10.1rc449.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc445
+Version: 0.10.1rc449
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc445.dist-info → qontract_reconcile-0.10.1rc449.dist-info}/RECORD

@@ -16,7 +16,7 @@ reconcile/dashdotdb_cso.py,sha256=FoXrWGpOwXG5jf0eklN84tjJVUAYzKat7rtq_28JMlQ,36
 reconcile/dashdotdb_dora.py,sha256=FINH-8dU3_r8EgUOMiF_fbxD9fKs6LFDxe6rufQ9XcM,17214
 reconcile/dashdotdb_dvo.py,sha256=YXqpI6fBQAql-ybGI0grj9gWMzmKiAvPE__pNju6obk,8996
 reconcile/dashdotdb_slo.py,sha256=bf1WSh5JP9obHVQsMy0OO71_VTYZgwAopElFZM6DmRo,6714
-reconcile/database_access_manager.py,sha256=1FWsBA7hgp2Wxo-khLfEyamkdi70u_0DvMHmkatqTBI,25486
+reconcile/database_access_manager.py,sha256=AoeCrDIxC60sLct31M3gjbjry6DWjItjn9Y_3tA11s4,25586
 reconcile/dynatrace_token_provider.py,sha256=HWItJ_LavPcUJlpYz5fmfnfOpP2-0Qjkar0EAzBJ5Cw,16602
 reconcile/email_sender.py,sha256=-5L-Ag_jaEYSzYRoMr52KQBRXz1E8yx9GqLbg2X4XFU,3533
 reconcile/gabi_authorized_users.py,sha256=rCosZv8Iu9jhWG88YiwK-gftX475aJ1R-PYIJYp_svY,4342
@@ -56,7 +56,7 @@ reconcile/ocm_clusters.py,sha256=ibK0o0rXhAnq4TF522aPkVlH7i0bdtgD8-IKmZ8PHjs,134
 reconcile/ocm_external_configuration_labels.py,sha256=imEpDv1RBpCSj8tHDv0R76hmNCFtcUzVNgS1yOVl8vs,3870
 reconcile/ocm_github_idp.py,sha256=IlSpoUlUhYOahqWee6azJiN-N5EZNxNAWh-lrPXTfEc,3946
 reconcile/ocm_groups.py,sha256=_kiMUndKc6as6cbbvXxVnq8V_Lj7X5lxMJVCuRWuUFE,2888
-reconcile/ocm_machine_pools.py,sha256=YGIokK6cWhakPB4pj3h4F6w9Rn12kqsXf4TT4mdj1w8,15218
+reconcile/ocm_machine_pools.py,sha256=eebJ6iiTdUcuKE5zBcfNxW1OGmPOvgBtmVu3xNVOoyY,16608
 reconcile/ocm_update_recommended_version.py,sha256=IYkfLXIprOW1jguZeELcGP1iBPuj-b53R-FTqKulMl8,4204
 reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=Kti53htd5yeTSXzMW6jKvQojfaRIN7rMGe5-cC4k7N4,4105
 reconcile/openshift_base.py,sha256=PFV3XoshiayqSHjOMtW7cOB2jhFLrPN8wq9km1SiWio,47332
@@ -118,11 +118,11 @@ reconcile/vpc_peerings_validator.py,sha256=oiYwmQ2yYBobFhIixmHNUP1GxzUADocMPJnCB
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=BxQU2O037MXopmTfcAaBDus4RJI4acXe05WqTKuPk_s,21098
 reconcile/aus/aus_label_source.py,sha256=X6FD4NYcX27llMUSmmBcCh-pG7U5FnBd0zl-0zwCj2U,4118
-reconcile/aus/base.py,sha256=MCR0QAtBifRut6N4g72ognryPYuRp1cQ2YBz_4jKnG4,43486
+reconcile/aus/base.py,sha256=h_4MJbMHALy2TeaGs-d5KVTksu7EOGCBFljeFUERQbk,43635
 reconcile/aus/cluster_version_data.py,sha256=j4UyEBi5mQuvPq5Lo7a_L_0blxvH790wJV07uAiikFU,7126
-reconcile/aus/metrics.py,sha256=CI5H3kzWh5VUYjt8NfzcYdJ8L4HdTCcUQTZiLdwdLFc,3506
+reconcile/aus/metrics.py,sha256=lUNIjCCyAvU9f4aTx4i5RkQrjKjKD37i4AE4LlTriHs,3544
 reconcile/aus/models.py,sha256=oBSVZ-3JTngxKg_bH1vAfREpz55t8K-Y3eC9TA4pOTw,6849
-reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=4f4AOoEUBxYdTIUnyev1ECPvbfVHSESQhXl7fuU-iGk,8811
+reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=fshslI27hrqT40qrVsVOQaWxD-jkmzcVZryXzX7plhY,8960
 reconcile/aus/ocm_upgrade_scheduler.py,sha256=7cK2SakCFkl5EdnqUEAYdUo4pUnnf-SsUR10uytAGyE,3058
 reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=OBgE5mnVdQQV4tMH0AE2V_PDt9Gy6d-LyuPceqjORts,2331
 reconcile/aus/upgrades.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -376,7 +376,7 @@ reconcile/test/test_checkpoint.py,sha256=sbDtqTbfw5yMZ_mCltMXxkyyGueVLGUjTDtcWhP
 reconcile/test/test_cli.py,sha256=qx_iBwh4Z-YkK3sbjK1wEziPTgn060EN-baf9DNvR3k,1096
 reconcile/test/test_closedbox_endpoint_monitoring.py,sha256=isMHYwRWMFARU2nbJgbl69kD6H0eA86noCM4MPVI1fo,7151
 reconcile/test/test_dashdotdb_dora.py,sha256=XDMdnLDvup8sSqQEynxdPhXQZAafYbd2IUo9flSRJ8I,7917
-reconcile/test/test_database_access_manager.py,sha256=wc2Ov9GX8iAc7_ubwPJxsLZQUYt0KpaRzEIF6gfnsqM,19497
+reconcile/test/test_database_access_manager.py,sha256=9yGFmsDt5ar6fy1WvKxBovbFETX5kmkUMOykMe2fEDU,19594
 reconcile/test/test_gabi_authorized_users.py,sha256=6XnV5Q9inxP81ktGMVKyWucjBTUj8Imy2L0HG3YHyUE,2496
 reconcile/test/test_github_org.py,sha256=j3KeB4OnSln1gm2hidce49xdMru-j75NS3cM-AEgzZc,4511
 reconcile/test/test_github_repo_invites.py,sha256=QJ0VFk5B59rx4XtHoT6XOGWw9xRIZMen_cgtviN_Vi8,3419
@@ -392,7 +392,7 @@ reconcile/test/test_make.py,sha256=zTdjgq-3idFlec_0qJenk9wWw0QMLvSpJfPsptXmync,6
 reconcile/test/test_ocm_additional_routers.py,sha256=dtbpUnD5un6Q3VoLbuFRb_njmt5SSCnBzvSSBcO_Xxs,4248
 reconcile/test/test_ocm_clusters.py,sha256=MLH6r5G-T3e53tYDoyJYfC6X1oEZGmakk1SXR1w3jJw,22490
 reconcile/test/test_ocm_clusters_manifest_updates.py,sha256=jFRVfc5jby1kI2x_gT6wcqPPgkav1et9wZH6JqQbNSY,3278
-reconcile/test/test_ocm_machine_pools.py,sha256=4z-U3-vGVvYZPdvxP0d1HHfHoD5yXvo7Ek4N2Wyofvo,23547
+reconcile/test/test_ocm_machine_pools.py,sha256=uPtu3XG1xmRiEIZ3Uw_RTsZIgRkm_n6EGURWXqTyGyU,29789
 reconcile/test/test_ocm_update_recommended_version.py,sha256=ONY3slwUHwEdonvIYRI2Z8nWPDMTSSLGZ2I1dqaz7fg,4328
 reconcile/test/test_ocm_upgrade_scheduler_org_updater.py,sha256=zYRGUX7pAmxSv9oFYw2ZnPGa-YAPgDfmqXOJM4eE-8A,4353
 reconcile/test/test_openshift_base.py,sha256=owJsyyatl_7z6igUEDeJcMMV5_jIwcV2Yj7YgsmYkXs,27035
@@ -646,8 +646,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=dmEcNwZltP1rd_4DbxIYakO
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc445.dist-info/METADATA,sha256=NGeStfO_tsa4WmT8aV_sX16TDRH-_jxeqYhw7dHCf_s,2348
-qontract_reconcile-0.10.1rc445.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc445.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc445.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc445.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc449.dist-info/METADATA,sha256=E2bO2KPEa-O0CBcDnYqJkEyOOndI0tpzL0CDdBumIDM,2348
+qontract_reconcile-0.10.1rc449.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc449.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc449.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc449.dist-info/RECORD,,

reconcile/aus/base.py

@@ -296,6 +296,8 @@ class AdvancedUpgradeSchedulerBaseIntegration(
                         cluster_upgrade_spec.upgrade_policy.conditions.soak_days or 0
                     ),
                     workloads=",".join(cluster_upgrade_spec.upgrade_policy.workloads),
+                    product=cluster_upgrade_spec.cluster.product.id,
+                    hypershift=cluster_upgrade_spec.cluster.hypershift.enabled,
                 ),
             )
 

reconcile/aus/metrics.py

@@ -66,6 +66,8 @@ class AUSClusterUpgradePolicyInfoMetric(AUSBaseMetric, InfoMetric):
     mutexes: str
     soak_days: str
     workloads: str
+    product: str
+    hypershift: bool
 
     @classmethod
     def name(cls) -> str:

reconcile/aus/ocm_addons_upgrade_scheduler_org.py

@@ -211,6 +211,8 @@ class OCMAddonsUpgradeSchedulerOrgIntegration(
                     ),
                     workloads=",".join(cluster_upgrade_spec.upgrade_policy.workloads),
                     addon=cluster_upgrade_spec.addon.id,
+                    product=cluster_upgrade_spec.cluster.product.id,
+                    hypershift=cluster_upgrade_spec.cluster.hypershift.enabled,
                 ),
             )
 

reconcile/database_access_manager.py

@@ -102,9 +102,13 @@ REVOKE ALL ON DATABASE "{self._get_db()}" FROM public;
 
 \\c "{self._get_db()}"
 
-select 'CREATE ROLE "{self._get_user()}"  WITH LOGIN PASSWORD ''{self.connection_parameter.password}'' VALID UNTIL ''infinity'''
+select 'CREATE ROLE "{self._get_user()}"'
 WHERE NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = '{self._get_db()}');\\gexec
 
+ALTER ROLE "{self._get_user()}" WITH LOGIN  PASSWORD '{self.connection_parameter.password}' VALID UNTIL 'infinity';
+
+GRANT CONNECT ON DATABASE "{self._get_db()}" to "{self._get_user()}";
+
 -- rds specific, grant role to admin or create schema fails
 GRANT "{self._get_user()}" to "{self._get_admin_user()}";
 CREATE SCHEMA IF NOT EXISTS "{self._get_user()}" AUTHORIZATION "{self._get_user()}";"""
@@ -272,7 +276,7 @@ def get_job_spec(job_data: JobData) -> OpenshiftResource:
                                 command,
                             ],
                             "args": [
-                                "-ae",
+                                "-b",
                                 "--host=$(db.host)",
                                 "--port=$(db.port)",
                                 "--username=$(db.user)",

reconcile/ocm_machine_pools.py

@@ -4,6 +4,7 @@ from abc import (
     abstractmethod,
 )
 from collections.abc import Mapping
+from enum import Enum
 from typing import (
     Iterable,
     Optional,
@@ -11,6 +12,7 @@ from typing import (
 
 from pydantic import (
     BaseModel,
+    Field,
     root_validator,
 )
 
@@ -24,6 +26,7 @@ from reconcile.typed_queries.clusters import get_clusters
 from reconcile.utils.differ import diff_mappings
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.ocm import (
+    DEFAULT_OCM_MACHINE_POOL_ID,
     OCM,
     OCMMap,
 )
@@ -31,6 +34,12 @@ from reconcile.utils.ocm import (
 QONTRACT_INTEGRATION = "ocm-machine-pools"
 
 
+class ClusterType(Enum):
+    OSD = "osd"
+    ROSA_CLASSIC = "rosa"
+    ROSA_HCP = "hypershift"
+
+
 class InvalidUpdateError(Exception):
     pass
 
@@ -95,6 +104,7 @@ class AbstractPool(ABC, BaseModel):
     taints: Optional[list[Mapping[str, str]]]
     labels: Optional[Mapping[str, str]]
     cluster: str
+    cluster_type: ClusterType = Field(..., exclude=True)
     autoscaling: Optional[AbstractAutoscaling]
 
     @root_validator()
@@ -180,10 +190,19 @@ class MachinePool(AbstractPool):
         return None
 
     def deletable(self) -> bool:
-        return True
+        # OSD NON CCS clusters can't delete default worker machine pool
+        return not (
+            self.cluster_type == ClusterType.OSD
+            and self.id == DEFAULT_OCM_MACHINE_POOL_ID
+        )
 
     @classmethod
-    def create_from_gql(cls, pool: ClusterMachinePoolV1, cluster: str):
+    def create_from_gql(
+        cls,
+        pool: ClusterMachinePoolV1,
+        cluster: str,
+        cluster_type: ClusterType,
+    ):
         autoscaling: Optional[MachinePoolAutoscaling] = None
         if pool.autoscale:
             autoscaling = MachinePoolAutoscaling(
@@ -198,6 +217,7 @@ class MachinePool(AbstractPool):
             taints=[p.dict(by_alias=True) for p in pool.taints or []],
             labels=pool.labels,
             cluster=cluster,
+            cluster_type=cluster_type,
         )
 
 
@@ -254,11 +274,15 @@ class NodePool(AbstractPool):
         return None
 
     def deletable(self) -> bool:
-        # As of now, you can not delete the first worker pool(s)
-        return not self.id.startswith("workers")
+        return True
 
     @classmethod
-    def create_from_gql(cls, pool: ClusterMachinePoolV1, cluster: str):
+    def create_from_gql(
+        cls,
+        pool: ClusterMachinePoolV1,
+        cluster: str,
+        cluster_type: ClusterType,
+    ):
         autoscaling: Optional[NodePoolAutoscaling] = None
         if pool.autoscale:
             autoscaling = NodePoolAutoscaling(
@@ -277,6 +301,7 @@ class NodePool(AbstractPool):
             labels=pool.labels,
             subnet=pool.subnet,
             cluster=cluster,
+            cluster_type=cluster_type,
         )
 
 
@@ -303,7 +328,7 @@ class PoolHandler(BaseModel):
 
 class DesiredMachinePool(BaseModel):
     cluster_name: str
-    hypershift: bool
+    cluster_type: ClusterType
     pools: list[ClusterMachinePoolV1]
 
     def build_pool_handler(
@@ -312,11 +337,13 @@ class DesiredMachinePool(BaseModel):
         pool: ClusterMachinePoolV1,
     ) -> PoolHandler:
         pool_builder = (
-            NodePool.create_from_gql if self.hypershift else MachinePool.create_from_gql
+            NodePool.create_from_gql
+            if self.cluster_type == ClusterType.ROSA_HCP
+            else MachinePool.create_from_gql
         )
         return PoolHandler(
             action=action,
-            pool=pool_builder(pool, self.cluster_name),
+            pool=pool_builder(pool, self.cluster_name, self.cluster_type),
         )
 
 
@@ -330,12 +357,25 @@ def fetch_current_state(
     }
 
 
-def _is_hypershift(cluster: ClusterV1) -> bool:
-    return bool(cluster.spec and cluster.spec.hypershift)
+def _classify_cluster_type(cluster: ClusterV1) -> ClusterType:
+    if cluster.spec is None:
+        raise ValueError(f"cluster {cluster.name} is missing spec")
+    match cluster.spec.product:
+        case "osd":
+            return ClusterType.OSD
+        case "rosa":
+            return (
+                ClusterType.ROSA_HCP
+                if cluster.spec.hypershift
+                else ClusterType.ROSA_CLASSIC
+            )
+        case _:
+            raise ValueError(f"unknown cluster type for cluster {cluster.name}")
 
 
 def fetch_current_state_for_cluster(cluster, ocm):
-    if _is_hypershift(cluster):
+    cluster_type = _classify_cluster_type(cluster)
+    if cluster_type == ClusterType.ROSA_HCP:
         return [
             NodePool(
                 id=node_pool["id"],
@@ -354,6 +394,7 @@ def fetch_current_state_for_cluster(cluster, ocm):
                 labels=node_pool.get("labels"),
                 subnet=node_pool.get("subnet"),
                 cluster=cluster.name,
+                cluster_type=cluster_type,
             )
             for node_pool in ocm.get_node_pools(cluster.name)
         ]
@@ -371,6 +412,7 @@ def fetch_current_state_for_cluster(cluster, ocm):
             taints=machine_pool.get("taints"),
             labels=machine_pool.get("labels"),
             cluster=cluster.name,
+            cluster_type=cluster_type,
         )
         for machine_pool in ocm.get_machine_pools(cluster.name)
     ]
@@ -382,7 +424,7 @@ def create_desired_state_from_gql(
     return {
         cluster.name: DesiredMachinePool(
             cluster_name=cluster.name,
-            hypershift=_is_hypershift(cluster),
+            cluster_type=_classify_cluster_type(cluster),
             pools=cluster.machine_pools,
         )
         for cluster in clusters
@@ -452,6 +494,12 @@ def calculate_diff(
                     pool=current_machine_pool,
                 )
             )
+        else:
+            errors.append(
+                InvalidUpdateError(
+                    f"can not delete machine pool {current_machine_pool.id} for cluster {cluster_name}"
+                )
+            )
 
     return diffs, errors
 

reconcile/test/test_database_access_manager.py

@@ -131,7 +131,9 @@ def openshift_resource_secet() -> OpenshiftResource:
 def _assert_create_script(script: str) -> None:
     assert 'CREATE DATABASE "test"' in script
     assert "REVOKE ALL ON DATABASE" in script
-    assert 'CREATE ROLE "test"  WITH LOGIN PASSWORD' in script
+    assert 'CREATE ROLE "test"' in script
+    assert 'ALTER ROLE "test" WITH LOGIN' in script
+    assert 'GRANT CONNECT ON DATABASE "test" to "test"' in script
     assert "CREATE SCHEMA IF NOT EXISTS" in script
     assert 'GRANT "test" to "admin";' in script
 

reconcile/test/test_ocm_machine_pools.py

@@ -19,6 +19,7 @@ from reconcile.gql_definitions.common.clusters import (
 from reconcile.ocm_machine_pools import (
     AbstractPool,
     AWSNodePool,
+    ClusterType,
     DesiredMachinePool,
     InvalidUpdateError,
     MachinePool,
@@ -63,6 +64,7 @@ def test_pool() -> TestPool:
         labels=None,
         taints=None,
         cluster="cluster1",
+        cluster_type=ClusterType.OSD,
     )
 
 
@@ -77,6 +79,7 @@ def current_with_pool() -> Mapping[str, list[AbstractPool]]:
                 labels=None,
                 taints=None,
                 cluster="cluster1",
+                cluster_type=ClusterType.OSD,
             )
         ]
     }
@@ -90,6 +93,7 @@ def node_pool() -> NodePool:
         labels=None,
         taints=None,
         cluster="cluster1",
+        cluster_type=ClusterType.ROSA_HCP,
         subnet="subnet1",
         aws_node_pool=AWSNodePool(
             instance_type="m5.xlarge",
@@ -105,7 +109,7 @@ def machine_pool() -> MachinePool:
         labels=None,
         taints=None,
         cluster="cluster1",
-        subnet="subnet1",
+        cluster_type=ClusterType.OSD,
         instance_type="m5.xlarge",
     )
 
@@ -129,7 +133,7 @@ def ocm_mock():
 
 
 def test_diff__has_diff_autoscale(cluster_machine_pool: ClusterMachinePoolV1):
-    pool = TestPool(id="pool1", cluster="cluster1")
+    pool = TestPool(id="pool1", cluster="cluster1", cluster_type=ClusterType.OSD)
 
     assert cluster_machine_pool.autoscale is None
     assert not pool._has_diff_autoscale(cluster_machine_pool)
@@ -165,7 +169,7 @@ def test_calculate_diff_create():
     desired = {
         "cluster1": DesiredMachinePool(
             cluster_name="cluster1",
-            hypershift=False,
+            cluster_type=ClusterType.OSD,
             pools=[
                 ClusterMachinePoolV1(
                     id="pool1",
@@ -190,7 +194,7 @@ def test_calculate_diff_noop(current_with_pool):
     desired = {
         "cluster1": DesiredMachinePool(
             cluster_name="cluster1",
-            hypershift=False,
+            cluster_type=ClusterType.OSD,
             pools=[
                 ClusterMachinePoolV1(
                     id="pool1",
@@ -213,7 +217,7 @@ def test_calculate_diff_update(current_with_pool):
     desired = {
         "cluster1": DesiredMachinePool(
             cluster_name="cluster1",
-            hypershift=False,
+            cluster_type=ClusterType.OSD,
             pools=[
                 ClusterMachinePoolV1(
                     id="pool1",
@@ -245,6 +249,7 @@ def current_with_2_pools() -> Mapping[str, list[AbstractPool]]:
                 labels=None,
                 taints=None,
                 cluster="cluster1",
+                cluster_type=ClusterType.OSD,
             ),
             MachinePool(
                 id="workers",
@@ -253,6 +258,7 @@ def current_with_2_pools() -> Mapping[str, list[AbstractPool]]:
                 labels=None,
                 taints=None,
                 cluster="cluster1",
+                cluster_type=ClusterType.OSD,
             ),
         ]
     }
@@ -262,7 +268,7 @@ def test_calculate_diff_delete(current_with_2_pools):
     desired = {
         "cluster1": DesiredMachinePool(
             cluster_name="cluster1",
-            hypershift=False,
+            cluster_type=ClusterType.OSD,
             pools=[
                 ClusterMachinePoolV1(
                     id="pool1",
@@ -287,7 +293,7 @@ def test_calculate_diff_delete_all_fail_validation(current_with_pool):
     desired = {
         "cluster1": DesiredMachinePool(
             cluster_name="cluster1",
-            hypershift=False,
+            cluster_type=ClusterType.OSD,
             pools=[],
         ),
     }
@@ -450,7 +456,33 @@ def test_run_no_action(mocker: MockerFixture) -> None:
 
 
 @pytest.fixture
-def ocm_cluster_builder(
+def osd_cluster_builder(
+    gql_class_factory: Callable[..., ClusterV1],
+) -> Callable[..., ClusterV1]:
+    def builder(machine_pools: list[dict]) -> ClusterV1:
+        return gql_class_factory(
+            ClusterV1,
+            {
+                "name": "ocm-cluster",
+                "auth": [],
+                "spec": {
+                    "product": "osd",
+                },
+                "ocm": {
+                    "name": "ocm-name",
+                    "environment": {
+                        "accessTokenClientSecret": {},
+                    },
+                },
+                "machinePools": machine_pools,
+            },
+        )
+
+    return builder
+
+
+@pytest.fixture
+def rosa_cluster_builder(
     gql_class_factory: Callable[..., ClusterV1],
 ) -> Callable[..., ClusterV1]:
     def builder(machine_pools: list[dict]) -> ClusterV1:
@@ -459,6 +491,9 @@ def ocm_cluster_builder(
             {
                 "name": "ocm-cluster",
                 "auth": [],
+                "spec": {
+                    "product": "rosa",
+                },
                 "ocm": {
                     "name": "ocm-name",
                     "environment": {
@@ -482,11 +517,19 @@ def default_worker_machine_pool() -> dict:
 
 
 @pytest.fixture
-def ocm_cluster_with_default_machine_pool(
-    ocm_cluster_builder: Callable[..., ClusterV1],
+def osd_cluster_with_default_machine_pool(
+    osd_cluster_builder,
+    default_worker_machine_pool: dict,
+) -> ClusterV1:
+    return osd_cluster_builder([default_worker_machine_pool])
+
+
+@pytest.fixture
+def rosa_cluster_with_default_machine_pool(
+    rosa_cluster_builder,
     default_worker_machine_pool: dict,
 ) -> ClusterV1:
-    return ocm_cluster_builder([default_worker_machine_pool])
+    return rosa_cluster_builder([default_worker_machine_pool])
 
 
 @pytest.fixture
@@ -499,12 +542,26 @@ def new_workers_machine_pool() -> dict:
 
 
 @pytest.fixture
-def ocm_cluster_with_default_and_new_machine_pools(
-    ocm_cluster_builder: Callable[..., ClusterV1],
+def osd_cluster_with_default_and_new_machine_pools(
+    osd_cluster_builder,
+    default_worker_machine_pool: dict,
+    new_workers_machine_pool: dict,
+) -> ClusterV1:
+    return osd_cluster_builder(
+        [
+            default_worker_machine_pool,
+            new_workers_machine_pool,
+        ]
+    )
+
+
+@pytest.fixture
+def rosa_cluster_with_default_and_new_machine_pools(
+    rosa_cluster_builder,
     default_worker_machine_pool: dict,
     new_workers_machine_pool: dict,
 ) -> ClusterV1:
-    return ocm_cluster_builder(
+    return rosa_cluster_builder(
         [
             default_worker_machine_pool,
             new_workers_machine_pool,
@@ -525,22 +582,42 @@ def expected_ocm_machine_pool_create_payload() -> dict:
     }
 
 
-def test_run_create_machine_pool(
+def test_run_create_machine_pool_for_osd_cluster(
     mocker: MockerFixture,
-    ocm_cluster_with_default_and_new_machine_pools: ClusterV1,
+    osd_cluster_with_default_and_new_machine_pools: ClusterV1,
     default_worker_machine_pool: dict,
     expected_ocm_machine_pool_create_payload: dict,
 ) -> None:
     mocks = setup_mocks(
         mocker,
-        clusters=[ocm_cluster_with_default_and_new_machine_pools],
+        clusters=[osd_cluster_with_default_and_new_machine_pools],
         machine_pools=[default_worker_machine_pool],
     )
 
     run(False)
 
     mocks["OCM"].create_machine_pool.assert_called_once_with(
-        ocm_cluster_with_default_and_new_machine_pools.name,
+        osd_cluster_with_default_and_new_machine_pools.name,
+        expected_ocm_machine_pool_create_payload,
+    )
+
+
+def test_run_create_machine_pool_for_rosa_cluster(
+    mocker: MockerFixture,
+    rosa_cluster_with_default_and_new_machine_pools: ClusterV1,
+    default_worker_machine_pool: dict,
+    expected_ocm_machine_pool_create_payload: dict,
+) -> None:
+    mocks = setup_mocks(
+        mocker,
+        clusters=[rosa_cluster_with_default_and_new_machine_pools],
+        machine_pools=[default_worker_machine_pool],
+    )
+
+    run(False)
+
+    mocks["OCM"].create_machine_pool.assert_called_once_with(
+        rosa_cluster_with_default_and_new_machine_pools.name,
         expected_ocm_machine_pool_create_payload,
     )
 
@@ -564,22 +641,42 @@ def expected_ocm_machine_pool_update_payload() -> dict:
     }
 
 
-def test_run_update_machine_pool(
+def test_run_update_machine_pool_for_osd_cluster(
+    mocker: MockerFixture,
+    osd_cluster_with_default_machine_pool: ClusterV1,
+    existing_updated_default_machine_pool: dict,
+    expected_ocm_machine_pool_update_payload: dict,
+) -> None:
+    mocks = setup_mocks(
+        mocker,
+        clusters=[osd_cluster_with_default_machine_pool],
+        machine_pools=[existing_updated_default_machine_pool],
+    )
+
+    run(False)
+
+    mocks["OCM"].update_machine_pool.assert_called_once_with(
+        osd_cluster_with_default_machine_pool.name,
+        expected_ocm_machine_pool_update_payload,
+    )
+
+
+def test_run_update_machine_pool_for_rosa_cluster(
     mocker: MockerFixture,
-    ocm_cluster_with_default_machine_pool: ClusterV1,
+    rosa_cluster_with_default_machine_pool: ClusterV1,
     existing_updated_default_machine_pool: dict,
     expected_ocm_machine_pool_update_payload: dict,
 ) -> None:
     mocks = setup_mocks(
         mocker,
-        clusters=[ocm_cluster_with_default_machine_pool],
+        clusters=[rosa_cluster_with_default_machine_pool],
         machine_pools=[existing_updated_default_machine_pool],
     )
 
     run(False)
 
     mocks["OCM"].update_machine_pool.assert_called_once_with(
-        ocm_cluster_with_default_machine_pool.name,
+        rosa_cluster_with_default_machine_pool.name,
         expected_ocm_machine_pool_update_payload,
     )
 
@@ -593,14 +690,32 @@ def existing_default_machine_pool_with_different_instance_type() -> dict:
     }
 
 
-def test_run_update_machine_pool_error(
+def test_run_update_machine_pool_error_for_osd_cluster(
     mocker: MockerFixture,
-    ocm_cluster_with_default_machine_pool: ClusterV1,
+    osd_cluster_with_default_machine_pool: ClusterV1,
     existing_default_machine_pool_with_different_instance_type: dict,
 ) -> None:
     setup_mocks(
         mocker,
-        clusters=[ocm_cluster_with_default_machine_pool],
+        clusters=[osd_cluster_with_default_machine_pool],
+        machine_pools=[existing_default_machine_pool_with_different_instance_type],
+    )
+
+    with pytest.raises(ExceptionGroup) as eg:
+        run(False)
+
+    assert len(eg.value.exceptions) == 1
+    assert isinstance(eg.value.exceptions[0], InvalidUpdateError)
+
+
+def test_run_update_machine_pool_error_for_rosa_cluster(
+    mocker: MockerFixture,
+    rosa_cluster_with_default_machine_pool: ClusterV1,
+    existing_default_machine_pool_with_different_instance_type: dict,
+) -> None:
+    setup_mocks(
+        mocker,
+        clusters=[rosa_cluster_with_default_machine_pool],
         machine_pools=[existing_default_machine_pool_with_different_instance_type],
     )
 
@@ -624,42 +739,70 @@ def expected_ocm_machine_pool_delete_payload() -> dict:
     }
 
 
-def test_run_delete_machine_pool(
+def test_run_delete_machine_pool_for_osd_cluster(
+    mocker: MockerFixture,
+    osd_cluster_with_default_machine_pool: ClusterV1,
+    default_worker_machine_pool: dict,
+    new_workers_machine_pool: dict,
+    expected_ocm_machine_pool_delete_payload: dict,
+) -> None:
+    mocks = setup_mocks(
+        mocker,
+        clusters=[osd_cluster_with_default_machine_pool],
+        machine_pools=[default_worker_machine_pool, new_workers_machine_pool],
+    )
+
+    run(False)
+
+    mocks["OCM"].delete_machine_pool.assert_called_once_with(
+        osd_cluster_with_default_machine_pool.name,
+        expected_ocm_machine_pool_delete_payload,
+    )
+
+
+def test_run_delete_machine_pool_for_rosa_cluster(
     mocker: MockerFixture,
-    ocm_cluster_with_default_machine_pool: ClusterV1,
-    default_worker_machine_pool,
+    rosa_cluster_with_default_machine_pool: ClusterV1,
+    default_worker_machine_pool: dict,
     new_workers_machine_pool: dict,
     expected_ocm_machine_pool_delete_payload: dict,
 ) -> None:
     mocks = setup_mocks(
         mocker,
-        clusters=[ocm_cluster_with_default_machine_pool],
+        clusters=[rosa_cluster_with_default_machine_pool],
         machine_pools=[default_worker_machine_pool, new_workers_machine_pool],
     )
 
     run(False)
 
     mocks["OCM"].delete_machine_pool.assert_called_once_with(
-        ocm_cluster_with_default_machine_pool.name,
+        rosa_cluster_with_default_machine_pool.name,
         expected_ocm_machine_pool_delete_payload,
     )
 
 
 @pytest.fixture
-def ocm_cluster_without_machine_pools(
-    ocm_cluster_builder: Callable[..., ClusterV1],
+def osd_cluster_without_machine_pools(
+    osd_cluster_builder,
 ) -> ClusterV1:
-    return ocm_cluster_builder([])
+    return osd_cluster_builder([])
 
 
-def test_run_delete_machine_pool_fail_validation(
+@pytest.fixture
+def rosa_cluster_without_machine_pools(
+    rosa_cluster_builder,
+) -> ClusterV1:
+    return rosa_cluster_builder([])
+
+
+def test_run_delete_machine_pool_fail_validation_for_osd_cluster(
     mocker: MockerFixture,
-    ocm_cluster_without_machine_pools: ClusterV1,
-    default_worker_machine_pool,
+    osd_cluster_without_machine_pools: ClusterV1,
+    default_worker_machine_pool: dict,
 ) -> None:
     setup_mocks(
         mocker,
-        clusters=[ocm_cluster_without_machine_pools],
+        clusters=[osd_cluster_without_machine_pools],
         machine_pools=[default_worker_machine_pool],
     )
 
@@ -670,6 +813,76 @@ def test_run_delete_machine_pool_fail_validation(
     assert isinstance(eg.value.exceptions[0], InvalidUpdateError)
 
 
+def test_run_delete_machine_pool_fail_validation_for_rosa_cluster(
+    mocker: MockerFixture,
+    rosa_cluster_without_machine_pools: ClusterV1,
+    default_worker_machine_pool: dict,
+) -> None:
+    setup_mocks(
+        mocker,
+        clusters=[rosa_cluster_without_machine_pools],
+        machine_pools=[default_worker_machine_pool],
+    )
+
+    with pytest.raises(ExceptionGroup) as eg:
+        run(False)
+
+    assert len(eg.value.exceptions) == 1
+    assert isinstance(eg.value.exceptions[0], InvalidUpdateError)
+
+
+@pytest.fixture
+def osd_cluster_with_new_machine_pool(
+    osd_cluster_builder,
+    new_workers_machine_pool: dict,
+) -> ClusterV1:
+    return osd_cluster_builder([new_workers_machine_pool])
+
+
+@pytest.fixture
+def rosa_cluster_with_new_machine_pool(
+    rosa_cluster_builder,
+    new_workers_machine_pool: dict,
+) -> ClusterV1:
+    return rosa_cluster_builder([new_workers_machine_pool])
+
+
+def test_run_delete_default_machine_pool_fail_validation_for_osd_cluster(
+    mocker: MockerFixture,
+    osd_cluster_with_new_machine_pool: ClusterV1,
+    default_worker_machine_pool: dict,
+    new_workers_machine_pool: dict,
+) -> None:
+    setup_mocks(
+        mocker,
+        clusters=[osd_cluster_with_new_machine_pool],
+        machine_pools=[default_worker_machine_pool, new_workers_machine_pool],
+    )
+
+    with pytest.raises(ExceptionGroup) as eg:
+        run(False)
+
+    assert len(eg.value.exceptions) == 1
+    assert isinstance(eg.value.exceptions[0], InvalidUpdateError)
+
+
+def test_run_delete_default_machine_pool_success_for_rosa_cluster(
+    mocker: MockerFixture,
+    rosa_cluster_with_new_machine_pool: ClusterV1,
+    default_worker_machine_pool: dict,
+    new_workers_machine_pool: dict,
+) -> None:
+    mocks = setup_mocks(
+        mocker,
+        clusters=[rosa_cluster_with_new_machine_pool],
+        machine_pools=[default_worker_machine_pool, new_workers_machine_pool],
+    )
+
+    run(False)
+
+    mocks["OCM"].delete_machine_pool.assert_called_once()
+
+
 @pytest.fixture
 def hypershift_cluster_builder(
     gql_class_factory: Callable[..., ClusterV1],
@@ -687,6 +900,7 @@ def hypershift_cluster_builder(
                     },
                 },
                 "spec": {
+                    "product": "rosa",
                     "hypershift": True,
                 },
                 "machinePools": machine_pools,
@@ -880,7 +1094,7 @@ def existing_multiple_hypershift_node_pools_with_defaults() -> list[dict]:
     ]
 
 
-def test_run_delete_node_pool_skip_workers_ones(
+def test_run_delete_default_node_pool(
     mocker: MockerFixture,
     hypershift_cluster_without_default_worker_machine_pools: ClusterV1,
     existing_multiple_hypershift_node_pools_with_defaults: list[dict],
@@ -893,4 +1107,4 @@ def test_run_delete_node_pool_skip_workers_ones(
 
     run(False)
 
-    mocks["OCM"].delete_node_pool.assert_not_called()
+    mocks["OCM"].delete_node_pool.assert_called()