Address the review comments

Signed-off-by: Akarsha-rai <[email protected]>

ocs_ci/helpers/dr_helpers.py

@@ -16,7 +16,7 @@
 from ocs_ci.ocs.resources.pod import get_all_pods
 from ocs_ci.ocs.resources.pv import get_all_pvs
 from ocs_ci.ocs.resources.pvc import get_all_pvc_objs
-from ocs_ci.ocs.node import gracefully_reboot_nodes
+from ocs_ci.ocs.node import gracefully_reboot_nodes, get_node_objs
 from ocs_ci.ocs.utils import (
     get_non_acm_cluster_config,
     get_active_acm_index,
@@ -1036,12 +1036,12 @@ def restore_backup():
 
     restore_index = config.cur_index
     config.switch_ctx(get_passive_acm_index())
-    backup_schedule = templating.load_yaml(constants.DR_RESTORE_YAML)
-    backup_schedule_yaml = tempfile.NamedTemporaryFile(
+    restore_schedule = templating.load_yaml(constants.DR_RESTORE_YAML)
+    restore_schedule_yaml = tempfile.NamedTemporaryFile(
         mode="w+", prefix="restore", delete=False
     )
-    templating.dump_data_to_temp_yaml(backup_schedule, backup_schedule_yaml.name)
-    run_cmd(f"oc create -f {backup_schedule_yaml.name}")
+    templating.dump_data_to_temp_yaml(restore_schedule, restore_schedule_yaml.name)
+    run_cmd(f"oc create -f {restore_schedule_yaml.name}")
     config.switch_ctx(restore_index)
 
 
@@ -1091,3 +1091,133 @@ def verify_drpolicy_cli(switch_ctx=None):
         raise UnexpectedBehaviour(
             f"DRPolicy is not in succeeded or validated state: {status}"
         )
+
+
+@retry(UnexpectedBehaviour, tries=40, delay=5, backoff=5)
+def verify_backup_is_taken():
+
+    """
+    Function to verify backup is taken
+
+    """
+    backup_index = config.cur_index
+    config.switch_ctx(get_active_acm_index())
+    backup_obj = ocp.OCP(
+        kind=constants.ACM_BACKUP_SCHEDULE, namespace=constants.ACM_HUB_BACKUP_NAMESPACE
+    )
+    cmd_output = backup_obj.exec_oc_cmd(command="get BackupSchedule -oyaml")
+    status = cmd_output["items"][0]["status"]["phase"]
+    if status == "Enabled":
+        logger.info("Backup enabled successfully")
+    else:
+        logger.error(f"Backup failed with some errors: {cmd_output}")
+        raise UnexpectedBehaviour("Backup failed with some errors")
+    config.switch_ctx(backup_index)
+
+
+def get_nodes_from_active_zone(namespace):
+    """
+    Get the nodes list and index from active zone
+
+    Args:
+        namespace (str): Namespace of the app workload
+
+    Returns:
+        active_hub_index (int): Index of the active hub cluster
+        active_hub_cluster_node_objs (list): Node list of the active hub nodes
+        managed_cluster_index (int): Index of the active zone managed cluster
+        managed_cluster_node_objs (list): Node list of the active zone managed cluster
+        ceph_node_ips (list): Ceph node list which are running in active zone
+
+    """
+
+    # Get nodes from zone where active hub running
+    config.switch_ctx(get_active_acm_index())
+    active_hub_index = config.cur_index
+    zone = config.ENV_DATA.get("zone")
+    active_hub_cluster_node_objs = get_node_objs()
+    set_current_primary_cluster_context(namespace)
+    if config.ENV_DATA.get("zone") == zone:
+        managed_cluster_index = config.cur_index
+        managed_cluster_node_objs = get_node_objs()
+    else:
+        set_current_secondary_cluster_context(namespace)
+        managed_cluster_index = config.cur_index
+        managed_cluster_node_objs = get_node_objs()
+    external_cluster_node_roles = config.EXTERNAL_MODE.get(
+        "external_cluster_node_roles"
+    )
+    ceph_node_ips = []
+    for ceph_node in external_cluster_node_roles:
+        if (
+            external_cluster_node_roles[ceph_node].get("location").get("datacenter")
+            != "zone-b"
+        ):
+            continue
+        else:
+            ceph_node_ips.append(
+                external_cluster_node_roles[ceph_node].get("ip_address")
+            )
+
+    return (
+        active_hub_index,
+        active_hub_cluster_node_objs,
+        managed_cluster_index,
+        managed_cluster_node_objs,
+        ceph_node_ips,
+    )
+
+
+def create_klusterlet_config():
+    """
+    Create klusterlet config only on new hub or present active hub
+
+    """
+    old_ctx = config.cur_index
+    config.switch_ctx(get_passive_acm_index())
+    klusterlet_config = templating.load_yaml(constants.KLUSTERLET_CONFIG_YAML)
+    klusterlet_config_yaml = tempfile.NamedTemporaryFile(
+        mode="w+", prefix="klusterlet_config", delete=False
+    )
+    templating.dump_data_to_temp_yaml(klusterlet_config, klusterlet_config_yaml.name)
+    run_cmd(f"oc create -f {klusterlet_config_yaml.name}")
+    config.switch_ctx(old_ctx)
+
+
+def remove_parameter_klusterlet_config():
+    """
+    Edit the global KlusterletConfig on the new hub and
+    remove the parameter appliedManifestWorkEvictionGracePeriod and its value
+
+    """
+    old_ctx = config.cur_index
+    config.switch_ctx(get_passive_acm_index())
+    klusterlet_config_obj = ocp.OCP(kind=constants.KLUSTERLET_CONFIG)
+    name = klusterlet_config_obj.get().get("items")[0].get("metadata").get("name")
+    remove_op = [{"op": "remove", "path": "/spec"}]
+    klusterlet_config_obj.patch(
+        resource_name=name, params=json.dumps(remove_op), format_type="json"
+    )
+    config.switch_ctx(old_ctx)
+
+
+def add_label_to_appsub(workloads, label="test", value="test1"):
+    """
+    Args:
+        workloads (list): List of workloads created
+        label (str): Name of label to be added
+        value (str): Value to be added
+
+    """
+    old_ctx = config.cur_index
+    config.switch_ctx(get_passive_acm_index())
+    for wl in workloads:
+        if wl.workload_type == constants.SUBSCRIPTION:
+            sub_obj = ocp.OCP(
+                kind=constants.SUBSCRIPTION, namespace=wl.workload_namespace
+            )
+            name = sub_obj.get().get("items")[0].get("metadata").get("name")
+            run_cmd(
+                f"oc label appsub -n {wl.workload_namespace} {name} {label}={value}"
+            )
+    config.switch_ctx(old_ctx)

ocs_ci/ocs/constants.py

@@ -1112,6 +1112,9 @@
 MDR_DPA = "dpa-1"
 MULTICLUSTER_ENGINE = "multiclusterengine"
 BACKUP_SCHEDULE_YAML = os.path.join(TEMPLATE_MULTICLUSTER_DIR, "backupschedule.yaml")
+KLUSTERLET_CONFIG_YAML = os.path.join(
+    TEMPLATE_MULTICLUSTER_DIR, "klusterlet_config.yaml"
+)
 MDR_BACKUP_SCHEDULE_RESOURCE = "schedule-acm"
 ACM_POLICY_COMPLIANT = "Compliant"
 ACM_POLICY_NONCOMPLIANT = "NonCompliant"
@@ -2623,6 +2626,8 @@
 OADP_NS_YAML = os.path.join(TEMPLATE_DIR, "oadp-deployment", "namespace_opg_oadp.yaml")
 ACM_HUB_BACKUP_NAMESPACE = "open-cluster-management-backup"
 ACM_HUB_RESTORE = "Restore"
+ACM_BACKUP_SCHEDULE = "BackupSchedule"
+KLUSTERLET_CONFIG = "KlusterletConfig"
 
 # Vault encryption KMS types for PV encryption
 VAULT_TOKEN = "vaulttokens"

ocs_ci/templates/ocs-deployment/multicluster/klusterlet_config.yaml

@@ -0,0 +1,6 @@
+apiVersion: config.open-cluster-management.io/v1alpha1
+kind: KlusterletConfig
+metadata:
+  name: global
+spec:
+  appliedManifestWorkEvictionGracePeriod: "24h"