diff --git a/managed/src/main/resources/swagger-strict.json b/managed/src/main/resources/swagger-strict.json
index 35e68bbc15d9..2e1f27e9cd63 100644
--- a/managed/src/main/resources/swagger-strict.json
+++ b/managed/src/main/resources/swagger-strict.json
@@ -1683,11 +1683,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -3570,11 +3566,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -5629,11 +5621,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -5957,11 +5945,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -6816,11 +6800,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -9831,11 +9811,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -10385,11 +10361,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -10759,11 +10731,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -11749,11 +11717,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -11906,11 +11870,7 @@
         },
         "taskType" : {
           "description" : "Type of task to be scheduled.",
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "userEmail" : {
@@ -11933,11 +11893,7 @@
         },
         "taskTypes" : {
           "items" : {
-<<<<<<< HEAD
-            "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-            "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+            "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
             "type" : "string"
           },
           "type" : "array",
@@ -12326,11 +12282,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -12899,11 +12851,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -13503,11 +13451,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -13763,11 +13707,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -14228,11 +14168,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -14462,11 +14398,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -14696,11 +14628,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -15190,11 +15118,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -15874,11 +15798,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
diff --git a/managed/src/main/resources/swagger.json b/managed/src/main/resources/swagger.json
index da5fa0c148fc..bd518b64a2fe 100644
--- a/managed/src/main/resources/swagger.json
+++ b/managed/src/main/resources/swagger.json
@@ -1695,11 +1695,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -3605,11 +3601,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -5664,11 +5656,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -5996,11 +5984,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -6859,11 +6843,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -9922,11 +9902,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -10489,11 +10465,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -10863,11 +10835,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -11861,11 +11829,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -12018,11 +11982,7 @@
         },
         "taskType" : {
           "description" : "Type of task to be scheduled.",
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "userEmail" : {
@@ -12045,11 +12005,7 @@
         },
         "taskTypes" : {
           "items" : {
-<<<<<<< HEAD
-            "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-            "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+            "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
             "type" : "string"
           },
           "type" : "array",
@@ -12438,11 +12394,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -13011,11 +12963,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -13615,11 +13563,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -13875,11 +13819,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -14340,11 +14280,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -14574,11 +14510,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -14808,11 +14740,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -15302,11 +15230,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {
@@ -16027,11 +15951,7 @@
           "type" : "boolean"
         },
         "updatingTask" : {
-<<<<<<< HEAD
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
-=======
-          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
->>>>>>> db2eaf8100 ([PLAT-14888]: Store PITR parmas during create DR and allow users to edit them.)
+          "enum" : [ "CloudBootstrap", "CloudCleanup", "CreateCassandraTable", "CreateUniverse", "ReadOnlyClusterCreate", "ReadOnlyKubernetesClusterDelete", "ReadOnlyClusterDelete", "CreateKubernetesUniverse", "ReadOnlyKubernetesClusterCreate", "DestroyUniverse", "PauseUniverse", "ResumeUniverse", "DestroyKubernetesUniverse", "DeleteTable", "BackupUniverse", "RestoreBackup", "MultiTableBackup", "CreateBackup", "ConfigureDBApis", "ConfigureDBApisKubernetes", "CreatePitrConfig", "DeletePitrConfig", "RestoreSnapshotSchedule", "EditUniverse", "EditKubernetesUniverse", "ExternalScript", "ImportIntoTable", "RunApiTriggeredHooks", "AddOnClusterCreate", "AddOnClusterDelete", "UpgradeUniverse", "UpdateLoadBalancerConfig", "RestartUniverse", "RestartUniverseKubernetesUpgrade", "SoftwareUpgrade", "SoftwareKubernetesUpgrade", "KubernetesOverridesUpgrade", "GFlagsUpgrade", "GFlagsKubernetesUpgrade", "CertsRotate", "CertsRotateKubernetesUpgrade", "TlsToggle", "VMImageUpgrade", "SystemdUpgrade", "RebootUniverse", "UpgradeKubernetesUniverse", "DeleteNodeFromUniverse", "StopNodeInUniverse", "StartNodeInUniverse", "AddNodeToUniverse", "RemoveNodeFromUniverse", "RebootNodeInUniverse", "ReleaseInstanceFromUniverse", "RotateAccessKey", "SetUniverseKey", "CreateAndRotateAccessKey", "CreateKMSConfig", "EditKMSConfig", "DeleteKMSConfig", "UpdateDiskSize", "UpdateKubernetesDiskSize", "StartMasterOnNode", "DeleteXClusterConfig", "SyncXClusterConfig", "CreateSupportBundle", "CreateXClusterConfig", "EditXClusterConfig", "RestartXClusterConfig", "RestartDrConfig", "SyncDrConfig", "SetTablesDrConfig", "SetDatabasesDrConfig", "CreateDrConfig", "DeleteDrConfig", "FailoverDrConfig", "SwitchoverDrConfig", "EditDrConfig", "EditDrConfigParams", "ReinstallNodeAgent", "DeleteCustomerConfig", "DeleteCustomerStorageConfig", "ResizeNode", "CreateTableSpacesInUniverse", "ThirdpartySoftwareUpgrade", "ModifyAuditLoggingConfig", "InstallYbcSoftware", "UpgradeUniverseYbc", "UpgradeYbcGFlags", "DisableYbc", "AddGFlagMetadata", "CloudProviderDelete", "CreateBackupSchedule", "CreateBackupScheduleKubernetes", "DeleteBackupSchedule", "DeleteBackupScheduleKubernetes", "EditBackupSchedule", "EditBackupScheduleKubernetes", "CloudProviderEdit", "SoftwareUpgradeYB", "SoftwareKubernetesUpgradeYB", "FinalizeUpgrade", "RollbackUpgrade", "RollbackKubernetesUpgrade", "LdapUniverseSync", "ReprovisionNode", "ReplaceNodeInUniverse", "UpdateProxyConfig", "RecommissionNodeInstance", "MasterFailover", "SyncMasterAddresses", "CreateYbaBackup", "RestoreYbaBackup", "RestoreContinuousBackup", "KubernetesCheckVolumeExpansion", "KubernetesPostExpansionCheckVolume", "NodeCertReloadTask", "UpdateUniverseConfig", "CreateRootVolumes", "ReplaceRootVolume", "ChangeInstanceType", "PersistResizeNode", "PersistSystemdUpgrade", "UpdateNodeDetails", "AddAuthorizedKey", "AnsibleClusterServerCtl", "AnsibleConfigureServers", "AnsibleDestroyServer", "PauseServer", "ResumeServer", "AnsibleSetupServer", "AnsibleCreateServer", "PrecheckNode", "PrecheckNodeDetached", "AnsibleUpdateNodeInfo", "BulkImport", "ChangeMasterConfig", "ChangeAdminPassword", "CreateTable", "DeleteNode", "DeleteBackup", "DeleteBackupYb", "UpdateNodeProcess", "DeleteTableFromUniverse", "DeleteTablesFromUniverse", "DeleteKeyspace", "LoadBalancerStateChange", "ModifyBlackList", "CheckUnderReplicatedTablets", "CheckFollowerLag", "CheckNodeSafeToDelete", "ManipulateDnsRecordTask", "RemoveUniverseEntry", "SetFlagInMemory", "SetNodeState", "SwamperTargetsFileUpdate", "UniverseUpdateSucceeded", "UpdateAndPersistGFlags", "UpdateAndPersistKubernetesOverrides", "UpdatePlacementInfo", "UpdateSoftwareVersion", "UpdateUniverseYbcDetails", "YBCBackupSucceeded", "UpdateUniverseYbcGflagsDetails", "VerifyNodeSSHAccess", "WaitForDataMove", "WaitForLeaderBlacklistCompletion", "WaitForFollowerLag", "WaitForLoadBalance", "WaitForMasterLeader", "WaitForServer", "WaitForYbcServer", "WaitForTServerHeartBeats", "DeleteClusterFromUniverse", "InstanceActions", "WaitForServerReady", "WaitForClockSync", "WaitForDuration", "RunExternalScript", "RemoveAuthorizedKey", "UpdateUniverseAccessKey", "ManageLoadBalancerGroup", "BootstrapProducer", "CheckBootstrapRequired", "DeleteBootstrapIds", "DeleteReplication", "DeleteXClusterConfigEntry", "DeleteXClusterTableConfigEntry", "DeleteDrConfigEntry", "WaitForReplicationDrain", "ResetXClusterConfigEntry", "SetReplicationPaused", "ChangeXClusterRole", "SetDrStates", "UpdateDrConfigParams", "XClusterAddNamespaceToOutboundReplicationGroup", "AddNamespaceToXClusterReplication", "XClusterRemoveNamespaceFromTargetUniverse", "XClusterRemoveNamespaceFromOutboundReplication", "SetRestoreTime", "XClusterConfigSetup", "XClusterConfigSetStatus", "XClusterConfigSetStatusForTables", "XClusterConfigSetStatusForNamespaces", "XClusterConfigModifyTables", "XClusterConfigRename", "XClusterConfigSync", "XClusterConfigUpdateMasterAddresses", "XClusterInfoPersist", "ReplicateNamespaces", "CheckXUniverseAutoFlags", "PromoteSecondaryConfigToMainConfig", "DeleteRemnantStreams", "CreateOutboundReplicationGroup", "XClusterDbReplicationSetup", "DeleteReplicationOnSource", "DeleteXClusterBackupRestoreEntries", "SetRestoreState", "CloudAccessKeyCleanup", "CloudAccessKeySetup", "CloudInitializer", "CloudProviderCleanup", "CloudRegionCleanup", "CloudRegionSetup", "CloudSetup", "BackupTable", "BackupTableYb", "BackupTableYbc", "BackupUniverseKeys", "RestoreBackupYb", "RestoreBackupYbc", "RestoreUniverseKeys", "RestoreUniverseKeysYb", "RestoreUniverseKeysYbc", "SetBackupHiddenState", "SetRestoreHiddenState", "RestorePreflightValidate", "BackupPreflightValidate", "WaitForLeadersOnPreferredOnly", "EnableEncryptionAtRest", "DisableEncryptionAtRest", "DestroyEncryptionAtRest", "KubernetesCommandExecutor", "KubernetesWaitForPod", "KubernetesCheckNumPod", "SetActiveUniverseKeys", "WaitForEncryptionKeyInMemory", "UnivSetCertificate", "CreateAlertDefinitions", "ManageAlertDefinitions", "UniverseSetTlsParams", "UniverseUpdateRootCert", "ResetUniverseVersion", "DeleteCertificate", "SetNodeStatus", "CheckMasterLeader", "CheckMasters", "CheckTServers", "WaitForTServerHBs", "CreatePrometheusSwamperConfig", "PreflightNodeCheck", "RunYsqlUpgrade", "PromoteAutoFlags", "RollbackAutoFlags", "StoreAutoFlagConfigVersion", "CheckUpgrade", "CheckCertificateConfig", "CheckMemory", "CheckLocale", "CheckGlibc", "CheckSoftwareVersion", "UpdateMountedDisks", "TransferXClusterCerts", "CreateTableSpaces", "ManageOtelCollector", "UpdateAndPersistAuditLoggingConfig", "MarkUniverseForHealthScriptReUpload", "RebootServer", "HardRebootServer", "RunHooks", "UpdateUniverseTags", "UpgradeYbc", "InstallYbcSoftwareOnK8s", "InstanceExistCheck", "DeleteRootVolumes", "InstallingThirdPartySoftware", "InstallNodeAgent", "WaitForNodeAgent", "CloudImageBundleSetup", "UpdateClusterUserIntent", "UpdateClusterAPIDetails", "UpdateUniverseState", "UpdateUniverseCommunicationPorts", "UpdateUniverseIntent", "UpdateConsistencyCheck", "FreezeUniverse", "QueryLdapServer", "DbLdapSync", "CheckForClusterServers", "CheckLeaderlessTablets", "CheckNodesAreSafeToTakeDown", "ValidateNodeDiskSize", "CheckNodeReachable", "WaitStartingFromTime", "RemoveNodeAgent", "UpdateUniverseFields", "RunNodeCommand" ],
           "type" : "string"
         },
         "updatingTaskUUID" : {