qontract-reconcile 0.9.1rc298__py3-none-any.whl → 0.10.1.dev1203__py3-none-any.whl

reconcile/utils/ocm/ocm.py

@@ -1,41 +1,23 @@
 from __future__ import annotations
 
 import functools
-import logging
-import random
 import re
-import string
-from abc import abstractmethod
-from collections.abc import (
-    Iterable,
-    Mapping,
-)
-from dataclasses import (
-    dataclass,
-    field,
-)
-from typing import (
-    Any,
-    Optional,
-    Union,
-)
+from collections.abc import Mapping
+from typing import Any
 
 from sretoolbox.utils import retry
 
 import reconcile.utils.aws_helper as awsh
 from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 from reconcile.ocm.types import (
-    OCMClusterAutoscale,
-    OCMClusterNetwork,
-    OCMClusterSpec,
-    OCMOidcIdp,
     OCMSpec,
-    OSDClusterSpec,
-    ROSAClusterAWSAccount,
-    ROSAClusterSpec,
-    ROSAOcmAwsAttrs,
 )
-from reconcile.utils.exceptions import ParameterError
+from reconcile.utils.ocm.clusters import get_node_pools
+from reconcile.utils.ocm.products import (
+    OCMProduct,
+    OCMProductPortfolio,
+    build_product_portfolio,
+)
 from reconcile.utils.ocm_base_client import (
     OCMAPIClientConfiguration,
     OCMBaseClient,
@@ -49,11 +31,24 @@ STATUS_DELETING = "deleting"
 
 AMS_API_BASE = "/api/accounts_mgmt"
 CS_API_BASE = "/api/clusters_mgmt"
-KAS_API_BASE = "/api/kafkas_mgmt"
 
-MACHINE_POOL_DESIRED_KEYS = {"id", "instance_type", "replicas", "labels", "taints"}
+MACHINE_POOL_DESIRED_KEYS = {
+    "id",
+    "instance_type",
+    "replicas",
+    "autoscaling",
+    "labels",
+    "taints",
+}
 UPGRADE_CHANNELS = {"stable", "fast", "candidate"}
-UPGRADE_POLICY_DESIRED_KEYS = {"id", "schedule_type", "schedule", "next_run", "version"}
+UPGRADE_POLICY_DESIRED_KEYS = {
+    "id",
+    "schedule_type",
+    "schedule",
+    "next_run",
+    "version",
+    "state",
+}
 ADDON_UPGRADE_POLICY_DESIRED_KEYS = {
     "id",
     "addon_id",
@@ -68,511 +63,8 @@ CLUSTER_ADDON_DESIRED_KEYS = {"id", "parameters"}
 
 DISABLE_UWM_ATTR = "disable_user_workload_monitoring"
 CLUSTER_ADMIN_LABEL_KEY = "capability.cluster.manage_cluster_admin"
-BYTES_IN_GIGABYTE = 1024**3
 REQUEST_TIMEOUT_SEC = 60
 
-SPEC_ATTR_ACCOUNT = "account"
-SPEC_ATTR_DISABLE_UWM = "disable_user_workload_monitoring"
-SPEC_ATTR_AUTOSCALE = "autoscale"
-SPEC_ATTR_INSTANCE_TYPE = "instance_type"
-SPEC_ATTR_PRIVATE = "private"
-SPEC_ATTR_CHANNEL = "channel"
-SPEC_ATTR_NODES = "nodes"
-SPEC_ATTR_LOAD_BALANCERS = "load_balancers"
-SPEC_ATTR_STORAGE = "storage"
-SPEC_ATTR_ID = "id"
-SPEC_ATTR_EXTERNAL_ID = "external_id"
-SPEC_ATTR_PROVISION_SHARD_ID = "provision_shard_id"
-SPEC_ATTR_VERSION = "version"
-SPEC_ATTR_INITIAL_VERSION = "initial_version"
-SPEC_ATTR_MULTI_AZ = "multi_az"
-SPEC_ATTR_HYPERSHIFT = "hypershift"
-SPEC_ATTR_SUBNET_IDS = "subnet_ids"
-SPEC_ATTR_AVAILABILITY_ZONES = "availability_zones"
-
-SPEC_ATTR_NETWORK = "network"
-
-SPEC_ATTR_CONSOLE_URL = "consoleUrl"
-SPEC_ATTR_SERVER_URL = "serverUrl"
-SPEC_ATTR_ELBFQDN = "elbFQDN"
-SPEC_ATTR_PATH = "path"
-
-OCM_PRODUCT_OSD = "osd"
-OCM_PRODUCT_ROSA = "rosa"
-
-
-class OCMProduct:
-
-    ALLOWED_SPEC_UPDATE_FIELDS: set[str]
-    EXCLUDED_SPEC_FIELDS: set[str]
-
-    @staticmethod
-    @abstractmethod
-    def create_cluster(ocm: OCM, name: str, cluster: OCMSpec, dry_run: bool):
-        pass
-
-    @staticmethod
-    @abstractmethod
-    def update_cluster(ocm: OCM, cluster_name: str, update_spec: Mapping[str, Any]):
-        pass
-
-    @staticmethod
-    @abstractmethod
-    def get_ocm_spec(
-        ocm: OCM, cluster: Mapping[str, Any], init_provision_shards: bool
-    ) -> OCMSpec:
-        pass
-
-
-class OCMProductOsd(OCMProduct):
-    ALLOWED_SPEC_UPDATE_FIELDS = {
-        SPEC_ATTR_STORAGE,
-        SPEC_ATTR_LOAD_BALANCERS,
-        SPEC_ATTR_PRIVATE,
-        SPEC_ATTR_CHANNEL,
-        SPEC_ATTR_AUTOSCALE,
-        SPEC_ATTR_NODES,
-        SPEC_ATTR_DISABLE_UWM,
-    }
-
-    EXCLUDED_SPEC_FIELDS = {
-        SPEC_ATTR_ID,
-        SPEC_ATTR_EXTERNAL_ID,
-        SPEC_ATTR_PROVISION_SHARD_ID,
-        SPEC_ATTR_VERSION,
-        SPEC_ATTR_INITIAL_VERSION,
-        SPEC_ATTR_HYPERSHIFT,
-    }
-
-    @staticmethod
-    def create_cluster(ocm: OCM, name: str, cluster: OCMSpec, dry_run: bool):
-        ocm_spec = OCMProductOsd._get_create_cluster_spec(name, cluster)
-        api = f"{CS_API_BASE}/v1/clusters"
-        params = {}
-        if dry_run:
-            params["dryRun"] = "true"
-
-        ocm._post(api, ocm_spec, params)
-
-    @staticmethod
-    def update_cluster(ocm: OCM, cluster_name: str, update_spec: Mapping[str, Any]):
-        ocm_spec = OCMProductOsd._get_update_cluster_spec(update_spec)
-        cluster_id = ocm.cluster_ids.get(cluster_name)
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}"
-        params: dict[str, Any] = {}
-        ocm._patch(api, ocm_spec, params)
-
-    @staticmethod
-    def get_ocm_spec(
-        ocm: OCM, cluster: Mapping[str, Any], init_provision_shards: bool
-    ) -> OCMSpec:
-        if init_provision_shards:
-            provision_shard_id = ocm.get_provision_shard(cluster["id"])["id"]
-        else:
-            provision_shard_id = None
-
-        autoscale = cluster["nodes"].get("autoscale_compute")
-        autoscale_spec = (
-            OCMClusterAutoscale(
-                max_replicas=autoscale.get("max_replicas"),
-                min_replicas=autoscale.get("min_replicas"),
-            )
-            if autoscale
-            else None
-        )
-
-        spec = OCMClusterSpec(
-            product=cluster["product"]["id"],
-            id=cluster["id"],
-            external_id=cluster["external_id"],
-            provider=cluster["cloud_provider"]["id"],
-            region=cluster["region"]["id"],
-            channel=cluster["version"]["channel_group"],
-            version=cluster["version"]["raw_id"],
-            multi_az=cluster["multi_az"],
-            instance_type=cluster["nodes"]["compute_machine_type"]["id"],
-            private=cluster["api"]["listening"] == "internal",
-            disable_user_workload_monitoring=cluster[
-                "disable_user_workload_monitoring"
-            ],
-            provision_shard_id=provision_shard_id,
-            nodes=cluster["nodes"].get("compute"),
-            autoscale=autoscale_spec,
-            hypershift=cluster["hypershift"]["enabled"],
-        )
-
-        if not cluster["ccs"]["enabled"]:
-            cluster_spec_data = spec.dict()
-            cluster_spec_data["storage"] = (
-                cluster["storage_quota"]["value"] // BYTES_IN_GIGABYTE
-            )
-            cluster_spec_data["load_balancers"] = cluster["load_balancer_quota"]
-            spec = OSDClusterSpec(**cluster_spec_data)
-
-        network = OCMClusterNetwork(
-            type=cluster["network"].get("type") or "OVNKubernetes",
-            vpc=cluster["network"]["machine_cidr"],
-            service=cluster["network"]["service_cidr"],
-            pod=cluster["network"]["pod_cidr"],
-        )
-
-        ocm_spec = OCMSpec(
-            console_url=cluster["console"]["url"],
-            server_url=cluster["api"]["url"],
-            domain=cluster["dns"]["base_domain"],
-            spec=spec,
-            network=network,
-        )
-
-        return ocm_spec
-
-    @staticmethod
-    def _get_create_cluster_spec(cluster_name: str, cluster: OCMSpec) -> dict[str, Any]:
-        ocm_spec: dict[str, Any] = {
-            "name": cluster_name,
-            "cloud_provider": {"id": cluster.spec.provider},
-            "region": {"id": cluster.spec.region},
-            "version": {
-                "id": f"openshift-v{cluster.spec.initial_version}",
-                "channel_group": cluster.spec.channel,
-            },
-            "multi_az": cluster.spec.multi_az,
-            "nodes": {"compute_machine_type": {"id": cluster.spec.instance_type}},
-            "network": {
-                "type": cluster.network.type or "OVNKubernetes",
-                "machine_cidr": cluster.network.vpc,
-                "service_cidr": cluster.network.service,
-                "pod_cidr": cluster.network.pod,
-            },
-            "api": {"listening": "internal" if cluster.spec.private else "external"},
-            "disable_user_workload_monitoring": cluster.spec.disable_user_workload_monitoring
-            or True,
-        }
-
-        # Workaround to enable type checks.
-        # cluster.spec is a Union of pydantic models Union[OSDClusterSpec, RosaClusterSpec].
-        # In this case, cluster.spec will always be an OSDClusterSpec because the type
-        # assignment is managed by pydantic, however, mypy complains if OSD attributes are set
-        # outside the isinstance check because it checks all the types set in the Union.
-        if isinstance(cluster.spec, OSDClusterSpec):
-            ocm_spec["storage_quota"] = {
-                "value": float(cluster.spec.storage * BYTES_IN_GIGABYTE),
-            }
-            ocm_spec["load_balancer_quota"] = cluster.spec.load_balancers
-
-        provision_shard_id = cluster.spec.provision_shard_id
-        if provision_shard_id:
-            ocm_spec.setdefault("properties", {})
-            ocm_spec["properties"]["provision_shard_id"] = provision_shard_id
-
-        autoscale = cluster.spec.autoscale
-        if autoscale is not None:
-            ocm_spec["nodes"]["autoscale_compute"] = autoscale.dict()
-        else:
-            ocm_spec["nodes"]["compute"] = cluster.spec.nodes
-        return ocm_spec
-
-    @staticmethod
-    def _get_update_cluster_spec(update_spec: Mapping[str, Any]) -> dict[str, Any]:
-        ocm_spec: dict[str, Any] = {}
-
-        storage = update_spec.get("storage")
-        if storage is not None:
-            ocm_spec["storage_quota"] = {"value": float(storage * 1073741824)}  # 1024^3
-
-        load_balancers = update_spec.get("load_balancers")
-        if load_balancers is not None:
-            ocm_spec["load_balancer_quota"] = load_balancers
-
-        private = update_spec.get("private")
-        if private is not None:
-            ocm_spec["api"] = {"listening": "internal" if private else "external"}
-
-        channel = update_spec.get("channel")
-        if channel is not None:
-            ocm_spec["version"] = {"channel_group": channel}
-
-        autoscale = update_spec.get("autoscale")
-        if autoscale is not None:
-            ocm_spec["nodes"] = {"autoscale_compute": autoscale}
-
-        nodes = update_spec.get("nodes")
-        if nodes:
-            ocm_spec["nodes"] = {"compute": update_spec["nodes"]}
-
-        disable_uwm = update_spec.get("disable_user_workload_monitoring")
-        if disable_uwm is not None:
-            ocm_spec["disable_user_workload_monitoring"] = disable_uwm
-
-        return ocm_spec
-
-
-class OCMProductRosa(OCMProduct):
-    ALLOWED_SPEC_UPDATE_FIELDS = {
-        SPEC_ATTR_CHANNEL,
-        SPEC_ATTR_AUTOSCALE,
-        SPEC_ATTR_NODES,
-        SPEC_ATTR_DISABLE_UWM,
-    }
-
-    EXCLUDED_SPEC_FIELDS = {
-        SPEC_ATTR_ID,
-        SPEC_ATTR_EXTERNAL_ID,
-        SPEC_ATTR_PROVISION_SHARD_ID,
-        SPEC_ATTR_VERSION,
-        SPEC_ATTR_INITIAL_VERSION,
-        SPEC_ATTR_ACCOUNT,
-        SPEC_ATTR_HYPERSHIFT,
-        SPEC_ATTR_SUBNET_IDS,
-        SPEC_ATTR_AVAILABILITY_ZONES,
-    }
-
-    @staticmethod
-    def create_cluster(ocm: OCM, name: str, cluster: OCMSpec, dry_run: bool):
-        ocm_spec = OCMProductRosa._get_create_cluster_spec(name, cluster)
-        api = f"{CS_API_BASE}/v1/clusters"
-        params = {}
-        if dry_run:
-            params["dryRun"] = "true"
-            if cluster.spec.hypershift:
-                logging.info(
-                    "Dry-Run is not yet implemented for Hosted clusters. Here is the payload:"
-                )
-                logging.info(ocm_spec)
-                return
-        ocm._post(api, ocm_spec, params)
-
-    @staticmethod
-    def update_cluster(ocm: OCM, cluster_name: str, update_spec: Mapping[str, Any]):
-        ocm_spec = OCMProductRosa._get_update_cluster_spec(update_spec)
-        cluster_id = ocm.cluster_ids.get(cluster_name)
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}"
-        params: dict[str, Any] = {}
-        ocm._patch(api, ocm_spec, params)
-
-    @staticmethod
-    def get_ocm_spec(
-        ocm: OCM, cluster: Mapping[str, Any], init_provision_shards: bool
-    ) -> OCMSpec:
-
-        if init_provision_shards:
-            provision_shard_id = ocm.get_provision_shard(cluster["id"])["id"]
-        else:
-            provision_shard_id = None
-
-        autoscale = cluster["nodes"].get("autoscale_compute")
-        autoscale_spec = (
-            OCMClusterAutoscale(
-                max_replicas=autoscale.get("max_replicas"),
-                min_replicas=autoscale.get("min_replicas"),
-            )
-            if autoscale
-            else None
-        )
-
-        account = ROSAClusterAWSAccount(
-            uid=cluster["properties"]["rosa_creator_arn"].split(":")[4],
-            rosa=ROSAOcmAwsAttrs(
-                creator_role_arn=cluster["properties"]["rosa_creator_arn"],
-                installer_role_arn=cluster["aws"]["sts"]["role_arn"],
-                support_role_arn=cluster["aws"]["sts"]["support_role_arn"],
-                controlplane_role_arn=cluster["aws"]["sts"]["instance_iam_roles"][
-                    "master_role_arn"
-                ],
-                worker_role_arn=cluster["aws"]["sts"]["instance_iam_roles"][
-                    "worker_role_arn"
-                ],
-            ),
-        )
-
-        spec = ROSAClusterSpec(
-            product=cluster["product"]["id"],
-            account=account,
-            id=cluster["id"],
-            external_id=cluster.get("external_id"),
-            provider=cluster["cloud_provider"]["id"],
-            region=cluster["region"]["id"],
-            channel=cluster["version"]["channel_group"],
-            version=cluster["version"]["raw_id"],
-            multi_az=cluster["multi_az"],
-            instance_type=cluster["nodes"]["compute_machine_type"]["id"],
-            private=cluster["api"]["listening"] == "internal",
-            disable_user_workload_monitoring=cluster[
-                "disable_user_workload_monitoring"
-            ],
-            provision_shard_id=provision_shard_id,
-            nodes=cluster["nodes"].get("compute"),
-            autoscale=autoscale_spec,
-            hypershift=cluster["hypershift"]["enabled"],
-            subnet_ids=cluster["aws"].get("subnet_ids"),
-            availability_zones=cluster["nodes"].get("availability_zones"),
-        )
-
-        network = OCMClusterNetwork(
-            type=cluster["network"].get("type") or "OVNKubernetes",
-            vpc=cluster["network"]["machine_cidr"],
-            service=cluster["network"]["service_cidr"],
-            pod=cluster["network"]["pod_cidr"],
-        )
-
-        ocm_spec = OCMSpec(
-            console_url=cluster["console"]["url"],
-            server_url=cluster["api"]["url"],
-            domain=cluster["dns"]["base_domain"],
-            spec=spec,
-            network=network,
-        )
-
-        return ocm_spec
-
-    @staticmethod
-    def _get_create_cluster_spec(cluster_name: str, cluster: OCMSpec) -> dict[str, Any]:
-        operator_roles_prefix = "".join(
-            "".join(random.choices(string.ascii_lowercase + string.digits, k=4))
-        )
-
-        ocm_spec: dict[str, Any] = {
-            "api": {"listening": "internal" if cluster.spec.private else "external"},
-            "name": cluster_name,
-            "cloud_provider": {"id": cluster.spec.provider},
-            "region": {"id": cluster.spec.region},
-            "version": {
-                "id": f"openshift-v{cluster.spec.initial_version}",
-                "channel_group": cluster.spec.channel,
-            },
-            "hypershift": {"enabled": cluster.spec.hypershift},
-            "multi_az": cluster.spec.multi_az,
-            "nodes": {"compute_machine_type": {"id": cluster.spec.instance_type}},
-            "network": {
-                "type": cluster.network.type or "OVNKubernetes",
-                "machine_cidr": cluster.network.vpc,
-                "service_cidr": cluster.network.service,
-                "pod_cidr": cluster.network.pod,
-            },
-            "disable_user_workload_monitoring": cluster.spec.disable_user_workload_monitoring
-            or True,
-        }
-
-        provision_shard_id = cluster.spec.provision_shard_id
-        if provision_shard_id:
-            ocm_spec.setdefault("properties", {})
-            ocm_spec["properties"]["provision_shard_id"] = provision_shard_id
-
-        autoscale = cluster.spec.autoscale
-        if autoscale is not None:
-            ocm_spec["nodes"]["autoscale_compute"] = autoscale.dict()
-        else:
-            ocm_spec["nodes"]["compute"] = cluster.spec.nodes
-
-        if isinstance(cluster.spec, ROSAClusterSpec):
-            ocm_spec.setdefault("properties", {})
-            ocm_spec["properties"][
-                "rosa_creator_arn"
-            ] = cluster.spec.account.rosa.creator_role_arn
-
-            rosa_spec: dict[str, Any] = {
-                "product": {"id": "rosa"},
-                "ccs": {"enabled": True},
-                "aws": {
-                    "account_id": cluster.spec.account.uid,
-                    "sts": {
-                        "enabled": True,
-                        "auto_mode": True,
-                        "role_arn": cluster.spec.account.rosa.installer_role_arn,
-                        "support_role_arn": cluster.spec.account.rosa.support_role_arn,
-                        "instance_iam_roles": {
-                            "master_role_arn": cluster.spec.account.rosa.controlplane_role_arn,
-                            "worker_role_arn": cluster.spec.account.rosa.worker_role_arn,
-                        },
-                        "operator_role_prefix": f"{cluster_name}-{operator_roles_prefix}",
-                    },
-                },
-            }
-
-            if cluster.spec.hypershift:
-                ocm_spec["nodes"][
-                    "availability_zones"
-                ] = cluster.spec.availability_zones
-                rosa_spec["aws"]["subnet_ids"] = cluster.spec.subnet_ids
-
-        ocm_spec.update(rosa_spec)
-        return ocm_spec
-
-    @staticmethod
-    def _get_update_cluster_spec(update_spec: Mapping[str, Any]) -> dict[str, Any]:
-        ocm_spec: dict[str, Any] = {}
-
-        channel = update_spec.get(SPEC_ATTR_CHANNEL)
-        if channel is not None:
-            ocm_spec["version"] = {"channel_group": channel}
-
-        autoscale = update_spec.get(SPEC_ATTR_AUTOSCALE)
-        if autoscale is not None:
-            ocm_spec["nodes"] = {"autoscale_compute": autoscale}
-
-        nodes = update_spec.get(SPEC_ATTR_NODES)
-        if nodes:
-            ocm_spec["nodes"] = {"compute": update_spec["nodes"]}
-
-        disable_uwm = update_spec.get(SPEC_ATTR_DISABLE_UWM)
-        if disable_uwm is not None:
-            ocm_spec["disable_user_workload_monitoring"] = disable_uwm
-
-        return ocm_spec
-
-
-OCM_PRODUCTS_IMPL = {
-    OCM_PRODUCT_OSD: OCMProductOsd,
-    OCM_PRODUCT_ROSA: OCMProductRosa,
-}
-
-
-class SectorConfigError(Exception):
-    pass
-
-
-@dataclass
-class Sector:
-    name: str
-    ocm: OCM
-    dependencies: list[Sector] = field(default_factory=lambda: [])
-    cluster_infos: list[dict[Any, Any]] = field(default_factory=lambda: [])
-    _validated_dependencies: Optional[set[Sector]] = None
-
-    def __key(self):
-        return (self.ocm.name, self.name)
-
-    def __hash__(self) -> int:
-        return hash(self.__key())
-
-    def __str__(self) -> str:
-        return f"{self.ocm.name}/{self.name}"
-
-    def ocmspec(self, cluster_name: str) -> OCMSpec:
-        return self.ocm.clusters[cluster_name]
-
-    def _iter_dependencies(self) -> Iterable[Sector]:
-        """
-        iterate reccursively over all the sector dependencies
-        """
-        logging.debug(f"[{self}] checking dependencies")
-        for dep in self.dependencies or []:
-            if self == dep:
-                raise SectorConfigError(
-                    f"[{self}] infinite sector dependency loop detected: depending on itself"
-                )
-            yield dep
-            for d in dep._iter_dependencies():
-                if self == d:
-                    raise SectorConfigError(
-                        f"[{self}] infinite sector dependency loop detected under {dep} dependencies"
-                    )
-                yield d
-
-    def validate_dependencies(self) -> bool:
-        list(self._iter_dependencies())
-        return True
-
 
 class OCM:  # pylint: disable=too-many-public-methods
     """
@@ -595,18 +87,24 @@ class OCM:  # pylint: disable=too-many-public-methods
         self,
         name,
         org_id,
+        ocm_env: str,
         ocm_client: OCMBaseClient,
         init_provision_shards=False,
         init_addons=False,
         init_version_gates=False,
         blocked_versions=None,
-        sectors: Optional[list[dict[str, Any]]] = None,
-        inheritVersionData: Optional[list[dict[str, Any]]] = None,
+        inheritVersionData: list[dict[str, Any]] | None = None,
+        product_portfolio: OCMProductPortfolio | None = None,
     ):
         """Initiates access token and gets clusters information."""
         self.name = name
         self._ocm_client = ocm_client
         self.org_id = org_id
+        self.ocm_env = ocm_env
+        if product_portfolio is None:
+            self.product_portfolio = build_product_portfolio()
+        else:
+            self.product_portfolio = product_portfolio
         self._init_clusters(init_provision_shards=init_provision_shards)
 
         if init_addons:
@@ -614,8 +112,6 @@ class OCM:  # pylint: disable=too-many-public-methods
 
         self._init_blocked_versions(blocked_versions)
 
-        self.inheritVersionData = inheritVersionData or []
-
         self.init_version_gates = init_version_gates
         self.version_gates: list[Any] = []
         if init_version_gates:
@@ -629,29 +125,25 @@ class OCM:  # pylint: disable=too-many-public-methods
             self.get_aws_infrastructure_access_role_grants
         )
 
-        # organization sectors and their dependencies
-        self.sectors: dict[str, Sector] = {}
-        for sector in sectors or []:
-            sector_name = sector["name"]
-            self.sectors[sector_name] = Sector(name=sector_name, ocm=self)
-        for sector in sectors or []:
-            s = self.sectors[sector["name"]]
-            for dep in sector.get("dependencies") or []:
-                s.dependencies.append(self.sectors[dep["name"]])
+    @property
+    def ocm_api(self) -> OCMBaseClient:
+        return self._ocm_client
 
-    @staticmethod
-    def _ready_for_app_interface(cluster: dict[str, Any]) -> bool:
+    def _ready_for_app_interface(self, cluster: dict[str, Any]) -> bool:
         return (
             cluster["managed"]
             and cluster["state"] == STATUS_READY
-            and cluster["product"]["id"] in OCM_PRODUCTS_IMPL
+            and cluster["product"]["id"] in self.product_portfolio.product_names
         )
 
     def _init_clusters(self, init_provision_shards: bool):
         api = f"{CS_API_BASE}/v1/clusters"
-        params = {"search": f"organization.id='{self.org_id}'"}
+        product_csv = ",".join([f"'{p}'" for p in self.product_portfolio.product_names])
+        params = {
+            "search": f"organization.id='{self.org_id}' and managed='true' and product.id in ({product_csv})"
+        }
         clusters = self._get_json(api, params=params).get("items", [])
-        self.cluster_ids = {c["name"]: c["id"] for c in clusters}
+        self.cluster_ids: dict[str, str] = {c["name"]: c["id"] for c in clusters}
 
         self.clusters: dict[str, OCMSpec] = {}
         self.available_cluster_upgrades: dict[str, list[str]] = {}
@@ -668,30 +160,41 @@ class OCM:  # pylint: disable=too-many-public-methods
             else:
                 self.not_ready_clusters.add(cluster_name)
 
+    @property
+    def non_blocked_cluster_upgrades(self) -> dict[str, list[str]]:
+        return {
+            cluster: [v for v in versions or [] if not self.version_blocked(v)]
+            for cluster, versions in self.available_cluster_upgrades.items()
+        }
+
     def is_ready(self, cluster):
         return cluster in self.clusters
 
-    def _get_ocm_impl(self, product: str):
-        return OCM_PRODUCTS_IMPL[product]
+    def get_product_impl(
+        self, product: str, hypershift: bool | None = False
+    ) -> OCMProduct:
+        return self.product_portfolio.get_product_impl(product, hypershift)
 
     def _get_cluster_ocm_spec(
         self, cluster: Mapping[str, Any], init_provision_shards: bool
     ) -> OCMSpec:
-
-        impl = self._get_ocm_impl(cluster["product"]["id"])
-        spec = impl.get_ocm_spec(self, cluster, init_provision_shards)
+        impl = self.get_product_impl(
+            cluster["product"]["id"], cluster["hypershift"]["enabled"]
+        )
+        spec = impl.get_ocm_spec(self.ocm_api, cluster, init_provision_shards)
         return spec
 
     def create_cluster(self, name: str, cluster: OCMSpec, dry_run: bool):
-        impl = self._get_ocm_impl(cluster.spec.product)
-        impl.create_cluster(self, name, cluster, dry_run)
+        impl = self.get_product_impl(cluster.spec.product, cluster.spec.hypershift)
+        impl.create_cluster(self.ocm_api, self.org_id, name, cluster, dry_run)
 
     def update_cluster(
         self, cluster_name: str, update_spec: Mapping[str, Any], dry_run=False
     ):
         cluster = self.clusters[cluster_name]
-        impl = self._get_ocm_impl(cluster.spec.product)
-        impl.update_cluster(self, cluster_name, update_spec)
+        cluster_id = self.cluster_ids[cluster_name]
+        impl = self.get_product_impl(cluster.spec.product, cluster.spec.hypershift)
+        impl.update_cluster(self.ocm_api, cluster_id, update_spec, dry_run)
 
     def get_group_if_exists(self, cluster, group_id):
         """Returns a list of users in a group in a cluster.
@@ -749,7 +252,7 @@ class OCM:  # pylint: disable=too-many-public-methods
         )
         self._delete(api)
 
-    def get_cluster_aws_account_id(self, cluster: str) -> Optional[str]:
+    def get_cluster_aws_account_id(self, cluster: str) -> str | None:
         """Returns the AWS account id of the cluster.
         Since there is no direct API to get this information,
         we hack our way by relying on existing role grants
@@ -870,8 +373,6 @@ class OCM:  # pylint: disable=too-many-public-methods
         for idp in idps:
             if idp["type"] != "GithubIdentityProvider":
                 continue
-            if idp["mapping_method"] != "claim":
-                continue
             idp_name = idp["name"]
             idp_github = idp["github"]
 
@@ -899,7 +400,7 @@ class OCM:  # pylint: disable=too-many-public-methods
         api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/identity_providers"
         payload = {
             "type": "GithubIdentityProvider",
-            "mapping_method": "claim",
+            "mapping_method": "add",
             "name": spec["name"],
             "github": {
                 "client_id": spec["client_id"],
@@ -909,98 +410,18 @@ class OCM:  # pylint: disable=too-many-public-methods
         }
         self._post(api, payload)
 
-    def _check_oidc_idp_params(self, oidc_idp: OCMOidcIdp, attrs: Iterable[str]):
-        for attr in attrs:
-            if not getattr(oidc_idp, attr):
-                raise ParameterError(
-                    f"{attrs} are mandatory parameters cannot be empty."
-                )
+    def get_kubeconfig(self, cluster: str) -> str | None:
+        """Returns the cluster credentials (kubeconfig)
+
+        :param cluster: cluster name
 
-    def get_oidc_idps(self, cluster: str) -> list[OCMOidcIdp]:
-        """Returns a list of details of OpenID connect IDP providers."""
+        :type cluster: string
+        """
         cluster_id = self.cluster_ids.get(cluster)
         if not cluster_id:
-            return []
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/identity_providers"
-        idps = self._get_json(api).get("items")
-        if not idps:
-            return []
-
-        results = []
-        for idp in idps:
-            if idp["type"] != "OpenIDIdentityProvider":
-                continue
-            claims = idp["open_id"].get("claims", {})
-            results.append(
-                OCMOidcIdp(
-                    cluster=cluster,
-                    id=idp["id"],
-                    name=idp["name"],
-                    client_id=idp["open_id"]["client_id"],
-                    issuer=idp["open_id"]["issuer"],
-                    email_claims=claims.get("email", []),
-                    name_claims=claims.get("name", []),
-                    username_claims=claims.get("preferred_username", []),
-                    groups_claims=claims.get("groups", []),
-                )
-            )
-        return results
-
-    def create_oidc_idp(self, oidc_idp: OCMOidcIdp) -> None:
-        """Creates a new OpenID Connect IDP."""
-        cluster_id = self.cluster_ids[oidc_idp.cluster]
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/identity_providers"
-        self._check_oidc_idp_params(
-            oidc_idp,
-            attrs=["email_claims", "name_claims", "username_claims", "client_secret"],
-        )
-        payload = {
-            "type": "OpenIDIdentityProvider",
-            "name": oidc_idp.name,
-            "mapping_method": "claim",
-            "open_id": {
-                "claims": {
-                    "email": oidc_idp.email_claims,
-                    "name": oidc_idp.name_claims,
-                    "preferred_username": oidc_idp.username_claims,
-                    "groups": oidc_idp.groups_claims,
-                },
-                "client_id": oidc_idp.client_id,
-                "client_secret": oidc_idp.client_secret,
-                "issuer": oidc_idp.issuer,
-            },
-        }
-        self._post(api, payload)
-
-    def update_oidc_idp(self, id: str, oidc_idp: OCMOidcIdp) -> None:
-        """Update an existing OpenID Connect IDP."""
-        cluster_id = self.cluster_ids[oidc_idp.cluster]
-        self._check_oidc_idp_params(
-            oidc_idp,
-            attrs=["email_claims", "name_claims", "username_claims", "client_secret"],
-        )
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/identity_providers/{id}"
-        payload = {
-            "type": "OpenIDIdentityProvider",
-            "open_id": {
-                "claims": {
-                    "email": oidc_idp.email_claims,
-                    "name": oidc_idp.name_claims,
-                    "preferred_username": oidc_idp.username_claims,
-                    "groups": oidc_idp.groups_claims,
-                },
-                "client_id": oidc_idp.client_id,
-                "client_secret": oidc_idp.client_secret,
-                "issuer": oidc_idp.issuer,
-            },
-        }
-        self._patch(api, payload)
-
-    def delete_idp(self, cluster: str, idp_id: str) -> None:
-        """Delete an IDP."""
-        cluster_id = self.cluster_ids[cluster]
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/identity_providers/{idp_id}"
-        self._delete(api)
+            return None
+        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/credentials"
+        return self._get_json(api).get("kubeconfig")
 
     def get_external_configuration_labels(self, cluster: str) -> dict[str, str]:
         """Returns details of External Configurations
@@ -1066,32 +487,6 @@ class OCM:  # pylint: disable=too-many-public-methods
         )
         self._delete(api)
 
-    def _get_subscription_labels_api(self, cluster: str) -> str:
-        cluster_id = self.cluster_ids[cluster]
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}"
-        subscription_api = self._get_json(api)["subscription"]["href"]
-        return f"{subscription_api}/labels"
-
-    def is_cluster_admin_enabled(self, cluster: str) -> bool:
-        api = self._get_subscription_labels_api(cluster)
-        subcription_labels = self._get_json(api).get("items")
-
-        for sl in subcription_labels or []:
-            if sl["key"] == CLUSTER_ADMIN_LABEL_KEY and sl["value"] == "true":
-                return True
-
-        return False
-
-    def enable_cluster_admin(self, cluster: str):
-        api = self._get_subscription_labels_api(cluster)
-        data = {
-            "key": CLUSTER_ADMIN_LABEL_KEY,
-            "value": "true",
-            "internal": True,
-        }
-
-        self._post(api, data)
-
     def get_machine_pools(self, cluster):
         """Returns a list of details of Machine Pools
 
@@ -1163,6 +558,63 @@ class OCM:  # pylint: disable=too-many-public-methods
         )
         self._delete(api)
 
+    def get_node_pools(self, cluster):
+        """Returns a list of details of Node Pools
+
+        :param cluster: cluster name
+
+        :type cluster: string
+        """
+        results = []
+        cluster_id = self.cluster_ids.get(cluster)
+        if not cluster_id:
+            return results
+
+        return get_node_pools(self._ocm_client, cluster_id)
+
+    def delete_node_pool(self, cluster, spec):
+        """Deletes an existing Node Pool
+
+        :param cluster: cluster name
+        :param spec: required information for node pool update
+
+        :type cluster: string
+        :type spec: dictionary
+        """
+        cluster_id = self.cluster_ids[cluster]
+        node_pool_id = spec["id"]
+        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/node_pools/" + f"{node_pool_id}"
+        self._delete(api)
+
+    def create_node_pool(self, cluster, spec):
+        """Creates a new Node Pool
+
+        :param cluster: cluster name
+        :param spec: required information for node pool creation
+
+        :type cluster: string
+        :type spec: dictionary
+        """
+        cluster_id = self.cluster_ids[cluster]
+        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/node_pools"
+        self._post(api, spec)
+
+    def update_node_pool(self, cluster, spec):
+        """Updates an existing Node Pool
+
+        :param cluster: cluster name
+        :param spec: required information for node pool update
+
+        :type cluster: string
+        :type spec: dictionary
+        """
+        cluster_id = self.cluster_ids[cluster]
+        node_pool_id = spec["id"]
+        labels = spec.get("labels", {})
+        spec["labels"] = labels
+        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/node_pools/" + f"{node_pool_id}"
+        self._patch(api, spec)
+
     def addon_version_blocked(self, version: str, addon_id: str) -> bool:
         """Check if an addon version is blocked
 
@@ -1191,81 +643,16 @@ class OCM:  # pylint: disable=too-many-public-methods
         """
         return any(re.search(b, version) for b in self.blocked_versions)
 
-    def get_available_upgrades(self, version, channel):
-        """Get available versions to upgrade from specified version
-        in the specified channel
+    def get_available_upgrades(self, cluster_name: str) -> list[str]:
+        """Get available versions to upgrade for a specific cluster.
 
         Args:
-            version (string): OpenShift version ID
-            channel (string): Upgrade channel
-
-        Raises:
-            KeyError: if specified channel is not valid
+            cluster_name (string): cluster display name to get available upgrades for
 
         Returns:
-            list: available versions to upgrade to
-        """
-        if channel not in UPGRADE_CHANNELS:
-            raise KeyError(f"channel should be one of {UPGRADE_CHANNELS}")
-        version_id = f"openshift-v{version}"
-        if channel != "stable":
-            version_id = f"{version_id}-{channel}"
-        api = f"{CS_API_BASE}/v1/versions/{version_id}"
-        return self._get_json(api).get("available_upgrades", [])
-
-    def get_upgrade_policies(self, cluster, schedule_type=None) -> list[dict[str, Any]]:
-        """Returns a list of details of Upgrade Policies
-
-        :param cluster: cluster name
-
-        :type cluster: string
-        """
-        results: list[dict[str, Any]] = []
-        cluster_id = self.cluster_ids.get(cluster)
-        if not cluster_id:
-            return results
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/upgrade_policies"
-        items = self._get_json(api).get("items")
-        if not items:
-            return results
-
-        for item in items:
-            if schedule_type and item["schedule_type"] != schedule_type:
-                continue
-            result = {k: v for k, v in item.items() if k in UPGRADE_POLICY_DESIRED_KEYS}
-            results.append(result)
-
-        return results
-
-    def create_upgrade_policy(self, cluster, spec):
-        """Creates a new Upgrade Policy
-
-        :param cluster: cluster name
-        :param spec: required information for creation
-
-        :type cluster: string
-        :type spec: dictionary
-        """
-        cluster_id = self.cluster_ids[cluster]
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/upgrade_policies"
-        self._post(api, spec)
-
-    def delete_upgrade_policy(self, cluster, spec):
-        """Deletes an existing Upgrade Policy
-
-        :param cluster: cluster name
-        :param spec: required information for update
-
-        :type cluster: string
-        :type spec: dictionary
+            list: a non-null but potentially empty list of available versions to upgrade to
         """
-        cluster_id = self.cluster_ids[cluster]
-        upgrade_policy_id = spec["id"]
-        api = (
-            f"{CS_API_BASE}/v1/clusters/{cluster_id}/"
-            + f"upgrade_policies/{upgrade_policy_id}"
-        )
-        self._delete(api)
+        return self.available_cluster_upgrades.get(cluster_name) or []
 
     def get_additional_routers(self, cluster):
         """Returns a list of Additional Application Routers
@@ -1319,16 +706,6 @@ class OCM:  # pylint: disable=too-many-public-methods
         api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/" + f"ingresses/{router_id}"
         self._delete(api)
 
-    def get_provision_shard(self, cluster_id):
-        """Returns details of the provision shard
-
-        :param cluster: cluster id
-
-        :type cluster: string
-        """
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/provision_shard"
-        return self._get_json(api)
-
     @staticmethod
     def _get_autoscale(cluster):
         autoscale = cluster["nodes"].get("autoscale_compute", None)
@@ -1346,45 +723,6 @@ class OCM:  # pylint: disable=too-many-public-methods
         api = f"{AMS_API_BASE}/v1/access_token"
         return self._post(api)
 
-    def get_kafka_clusters(self, fields=None):
-        """Returns details of the Kafka clusters"""
-        api = f"{KAS_API_BASE}/v1/kafkas"
-        clusters = self._get_json(api)["items"]
-        if fields:
-            clusters = [
-                {k: v for k, v in cluster.items() if k in fields}
-                for cluster in clusters
-            ]
-        return clusters
-
-    def get_kafka_service_accounts(self, fields=None):
-        """Returns details of the Kafka service accounts"""
-        results = []
-        api = f"{KAS_API_BASE}/v1/service_accounts"
-        service_accounts = self._get_json(api)["items"]
-        for sa in service_accounts:
-            sa_id = sa["id"]
-            id_api = f"{api}/{sa_id}"
-            sa_details = self._get_json(id_api)
-            if fields:
-                sa_details = {k: v for k, v in sa_details.items() if k in fields}
-            results.append(sa_details)
-        return results
-
-    def create_kafka_cluster(self, data):
-        """Creates (async) a Kafka cluster"""
-        api = f"{KAS_API_BASE}/v1/kafkas"
-        params = {"async": "true"}
-        self._post(api, data, params)
-
-    def create_kafka_service_account(self, name, fields=None):
-        """Creates a Kafka service account"""
-        api = f"{KAS_API_BASE}/v1/service_accounts"
-        result = self._post(api, {"name": name})
-        if fields:
-            result = {k: v for k, v in result.items() if k in fields}
-        return result
-
     def _init_addons(self):
         """Returns a list of Addons"""
         api = f"{CS_API_BASE}/v1/addons"
@@ -1411,58 +749,6 @@ class OCM:  # pylint: disable=too-many-public-methods
                 return addon["version"]["id"]
         return None
 
-    def get_addon_upgrade_policies(
-        self, cluster_name: str, addon_id: str = ""
-    ) -> list[dict[str, Any]]:
-        results: list[dict[str, Any]] = []
-        cluster_id = self.cluster_ids.get(cluster_name)
-        if not cluster_id:
-            return results
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/addon_upgrade_policies"
-        items = self._get_json(api).get("items")
-        if not items:
-            return results
-
-        for item in items:
-            if addon_id and item["addon_id"] != addon_id:
-                continue
-            result = {
-                k: v for k, v in item.items() if k in ADDON_UPGRADE_POLICY_DESIRED_KEYS
-            }
-            results.append(result)
-
-        return results
-
-    def create_addon_upgrade_policy(self, cluster_name: str, spec: dict) -> None:
-        """Creates a new Addon Upgrade Policy
-
-        :param cluster: cluster name
-        :param spec: required information for creation
-
-        :type cluster: string
-        :type spec: dictionary
-        """
-        cluster_id = self.cluster_ids[cluster_name]
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/addon_upgrade_policies"
-        self._post(api, spec)
-
-    def delete_addon_upgrade_policy(self, cluster_name: str, spec: dict) -> None:
-        """Deletes an existing Addon Upgrade Policy
-
-        :param cluster: cluster name
-        :param spec: required information for delete
-
-        :type cluster: string
-        :type spec: dictionary
-        """
-        cluster_id = self.cluster_ids[cluster_name]
-        upgrade_policy_id = spec["id"]
-        api = (
-            f"{CS_API_BASE}/v1/clusters/{cluster_id}/"
-            + f"addon_upgrade_policies/{upgrade_policy_id}"
-        )
-        self._delete(api)
-
     def get_version_gates(
         self, version_prefix: str, sts_only: bool = False
     ) -> list[dict[str, Any]]:
@@ -1475,31 +761,17 @@ class OCM:  # pylint: disable=too-many-public-methods
             and g["sts_only"] == sts_only
         ]
 
-    def get_version_agreement(self, cluster: str) -> list[dict[str, Any]]:
-        cluster_id = self.cluster_ids.get(cluster)
-        if not cluster_id:
-            return []
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/gate_agreements"
-        agreements = self._get_json(api).get("items")
-        if agreements:
-            return agreements
-        return []
-
-    def create_version_agreement(
-        self, gate_id: str, cluster: str
-    ) -> dict[str, Union[str, bool]]:
-        cluster_id = self.cluster_ids.get(cluster)
-        if not cluster_id:
-            return {}
-        api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/gate_agreements"
-        return self._post(api, {"version_gate": {"id": gate_id}})
-
     def get_cluster_addons(
-        self, cluster: str, with_version: bool = False
+        self,
+        cluster: str,
+        with_version: bool = False,
+        required_state: str | None = None,
     ) -> list[dict[str, str]]:
         """Returns a list of Addons installed on a cluster
 
         :param cluster: cluster name
+        :param with_version: include addon version
+        :param required_state: add search parameter to filter by specified state
 
         :type cluster: string
         """
@@ -1508,7 +780,12 @@ class OCM:  # pylint: disable=too-many-public-methods
         if not cluster_id:
             return results
         api = f"{CS_API_BASE}/v1/clusters/{cluster_id}/addons"
-        items = self._get_json(api).get("items")
+
+        p: dict[str, Any] | None = None
+        if required_state:
+            p = {"search": f"state='{required_state}'"}
+
+        items = self._get_json(api, params=p).get("items")
         if not items:
             return results
 
@@ -1551,7 +828,9 @@ class OCM:  # pylint: disable=too-many-public-methods
             try:
                 re.compile(b)
             except re.error:
-                raise TypeError(f"blocked version is not a valid regex expression: {b}")
+                raise TypeError(
+                    f"blocked version is not a valid regex expression: {b}"
+                ) from None
 
     @retry(max_attempts=10)
     def _do_get_request(self, api: str, params: Mapping[str, str]) -> dict[str, Any]:
@@ -1565,7 +844,7 @@ class OCM:  # pylint: disable=too-many-public-methods
         return rs["kind"].endswith("List")
 
     def _get_json(
-        self, api: str, params: Optional[dict[str, Any]] = None, page_size: int = 100
+        self, api: str, params: dict[str, Any] | None = None, page_size: int = 100
     ) -> dict[str, Any]:
         responses = []
         if not params:
@@ -1653,11 +932,11 @@ class OCMMap:  # pylint: disable=too-many-public-methods
         init_provision_shards=False,
         init_addons=False,
         init_version_gates=False,
-    ):
+        product_portfolio: OCMProductPortfolio | None = None,
+    ) -> None:
         """Initiates OCM instances for each OCM referenced in a cluster."""
-        self.clusters_map = {}
-        self.ocm_map = {}
-        self.sector_map = {}
+        self.clusters_map: dict[str, str] = {}
+        self.ocm_map: dict[str, OCM] = {}
         self.calling_integration = integration
         self.settings = settings
 
@@ -1671,6 +950,7 @@ class OCMMap:  # pylint: disable=too-many-public-methods
                     init_provision_shards,
                     init_addons,
                     init_version_gates=init_version_gates,
+                    product_portfolio=product_portfolio,
                 )
         elif namespaces:
             for namespace_info in namespaces:
@@ -1680,6 +960,7 @@ class OCMMap:  # pylint: disable=too-many-public-methods
                     init_provision_shards,
                     init_addons,
                     init_version_gates=init_version_gates,
+                    product_portfolio=product_portfolio,
                 )
         elif ocms:
             for ocm in ocms:
@@ -1688,20 +969,21 @@ class OCMMap:  # pylint: disable=too-many-public-methods
                     init_provision_shards,
                     init_addons,
                     init_version_gates=init_version_gates,
+                    product_portfolio=product_portfolio,
                 )
         else:
             raise KeyError("expected one of clusters, namespaces or ocm.")
 
-        # check sectors dependencies loop
-        for ocm in self.ocm_map.values():
-            for sector in ocm.sectors.values():
-                sector.validate_dependencies()
-
-    def __getitem__(self, ocm_name) -> OCM:
+    def __getitem__(self, ocm_name: str) -> OCM:
         return self.ocm_map[ocm_name]
 
     def init_ocm_client_from_cluster(
-        self, cluster_info, init_provision_shards, init_addons, init_version_gates
+        self,
+        cluster_info,
+        init_provision_shards,
+        init_addons,
+        init_version_gates,
+        product_portfolio: OCMProductPortfolio | None = None,
     ):
         if self.cluster_disabled(cluster_info):
             return
@@ -1713,22 +995,20 @@ class OCMMap:  # pylint: disable=too-many-public-methods
 
         if ocm_name not in self.ocm_map:
             self.init_ocm_client(
-                ocm_info, init_provision_shards, init_addons, init_version_gates
+                ocm_info,
+                init_provision_shards,
+                init_addons,
+                init_version_gates,
+                product_portfolio,
             )
 
-        if (
-            cluster_info.get("upgradePolicy") is not None
-            and cluster_info["upgradePolicy"].get("conditions") is not None
-        ):
-            sector_name = cluster_info["upgradePolicy"]["conditions"].get("sector")
-            if sector_name:
-                ocm = self.ocm_map.get(ocm_name)
-                # ensure our cluster actually runs in an OCM org we have access to
-                if ocm and ocm.is_ready(cluster_name):
-                    ocm.sectors[sector_name].cluster_infos.append(cluster_info)
-
     def init_ocm_client(
-        self, ocm_info, init_provision_shards, init_addons, init_version_gates
+        self,
+        ocm_info,
+        init_provision_shards,
+        init_addons,
+        init_version_gates,
+        product_portfolio: OCMProductPortfolio | None = None,
     ):
         """
         Initiate OCM client.
@@ -1771,18 +1051,19 @@ class OCMMap:  # pylint: disable=too-many-public-methods
         self.ocm_map[ocm_name] = OCM(
             name,
             org_id,
+            ocm_environment["name"],
             ocm_client,
             init_provision_shards=init_provision_shards,
             init_addons=init_addons,
             blocked_versions=ocm_info.get("blockedVersions"),
             init_version_gates=init_version_gates,
-            sectors=ocm_info.get("sectors"),
             inheritVersionData=ocm_info.get("inheritVersionData"),
+            product_portfolio=product_portfolio,
         )
 
     def instances(self) -> list[str]:
         """Get list of OCM instance names initiated in the OCM map."""
-        return self.ocm_map.keys()
+        return list(self.ocm_map.keys())
 
     def cluster_disabled(self, cluster_info):
         """
@@ -1810,46 +1091,19 @@ class OCMMap:  # pylint: disable=too-many-public-methods
         :type cluster: string
         """
         ocm = self.clusters_map[cluster]
-        return self.ocm_map.get(ocm, None)
+        return self.ocm_map[ocm]
 
     def clusters(self) -> list[str]:
         """Get list of cluster names initiated in the OCM map."""
         return [k for k, v in self.clusters_map.items() if v]
 
-    def cluster_specs(self) -> tuple[dict[str, OCMSpec], list]:
+    def cluster_specs(self) -> tuple[dict[str, OCMSpec], list[str]]:
         """Get dictionary of cluster names and specs in the OCM map."""
         cluster_specs = {}
         for v in self.ocm_map.values():
             cluster_specs.update(v.clusters)
 
-        not_ready_cluster_names = []
+        not_ready_cluster_names: list[str] = []
         for v in self.ocm_map.values():
             not_ready_cluster_names.extend(v.not_ready_clusters)
         return cluster_specs, not_ready_cluster_names
-
-    def kafka_cluster_specs(self):
-        """Get dictionary of Kafka cluster names and specs in the OCM map."""
-        fields = [
-            "id",
-            "status",
-            "cloud_provider",
-            "region",
-            "multi_az",
-            "name",
-            "bootstrap_server_host",
-            "failed_reason",
-        ]
-        cluster_specs = []
-        for ocm in self.ocm_map.values():
-            clusters = ocm.get_kafka_clusters(fields=fields)
-            cluster_specs.extend(clusters)
-        return cluster_specs
-
-    def kafka_service_account_specs(self):
-        """Get dictionary of Kafka service account specs in the OCM map."""
-        fields = ["name", "client_id"]
-        service_account_specs = []
-        for ocm in self.ocm_map.values():
-            service_accounts = ocm.get_kafka_service_accounts(fields=fields)
-            service_account_specs.extend(service_accounts)
-        return service_account_specs