Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CNV-51680: migrate or cancel migration and fix storage migration #2315

Merged
merged 1 commit into from
Dec 13, 2024
Merged

CNV-51680: migrate or cancel migration and fix storage migration #2315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/views/virtualmachines/actions/VirtualMachineActionFactory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export const VirtualMachineActionFactory = {
label: t('Storage'),
};
},
migrationActions: (...migrationActions): ActionDropdownItemType => ({
migrationActions: (migrationActions): ActionDropdownItemType => ({
id: 'migration-menu',
label: 'Migration',
options: migrationActions,
Expand Down
8 changes: 5 additions & 3 deletions src/views/virtualmachines/actions/components/VirtualMachineMigration/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ import { getRandomChars, isEmpty } from '@kubevirt-utils/utils/utils';
import { k8sCreate, k8sDelete, k8sPatch, Patch } from '@openshift-console/dynamic-plugin-sdk';

const getBlankDataVolume = (
originName: string,
dataVolumeName: string,
namespace: string,
storageClassName: string,
storage: string,
): V1beta1DataVolume => {
const randomChars = getRandomChars();
const namePrefix = `clone-${originName}`.substring(0, MAX_NAME_LENGTH - 6 - randomChars.length);

const originName = dataVolumeName.replace(/-mig-\d+$/, '');
const namePrefix = `${originName}-mig`.substring(0, MAX_NAME_LENGTH - 5 - randomChars.length);

return {
apiVersion: `${DataVolumeModel.apiGroup}/${DataVolumeModel.apiVersion}`,
Expand Down Expand Up @@ -156,7 +158,7 @@ export const migrateVM = async (
patchData.push({
op: 'add',
path: '/spec/updateVolumesStrategy',
value: 'migration',
value: 'Migration',
});

try {
Expand Down
16 changes: 10 additions & 6 deletions src/views/virtualmachines/actions/hooks/useVirtualMachineActionsProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ const useVirtualMachineActionsProvider: UseVirtualMachineActionsProvider = (
const printableStatus = vm?.status?.printableStatus;
const { Migrating, Paused } = printableVMStatus;

const isMigrating =
printableStatus === Migrating ||
(vmim && ![vmimStatuses.Failed, vmimStatuses.Succeeded].includes(vmim?.status?.phase));

const startOrStop = ((printableStatusMachine) => {
const map = {
default: VirtualMachineActionFactory.stop(vm),
Expand All @@ -44,14 +48,14 @@ const useVirtualMachineActionsProvider: UseVirtualMachineActionsProvider = (
return map[printableStatusMachine] || map.default;
})(printableStatus);

const migrateOrCancelMigrationCompute =
printableStatus === Migrating ||
(vmim && ![vmimStatuses.Failed, vmimStatuses.Succeeded].includes(vmim?.status?.phase))
? VirtualMachineActionFactory.cancelMigrationCompute(vm, vmim, isSingleNodeCluster)
: VirtualMachineActionFactory.migrateCompute(vm, isSingleNodeCluster);
const migrateCompute = VirtualMachineActionFactory.migrateCompute(vm, isSingleNodeCluster);

const migrateStorage = VirtualMachineActionFactory.migrateStorage(vm, createModal);

const migrationActions = isMigrating
? [VirtualMachineActionFactory.cancelMigrationCompute(vm, vmim, isSingleNodeCluster)]
: [migrateCompute, migrateStorage];

const pauseOrUnpause =
printableStatus === Paused
? VirtualMachineActionFactory.unpause(vm)
Expand All @@ -63,7 +67,7 @@ const useVirtualMachineActionsProvider: UseVirtualMachineActionsProvider = (
pauseOrUnpause,
VirtualMachineActionFactory.clone(vm, createModal),
VirtualMachineActionFactory.snapshot(vm, createModal),
VirtualMachineActionFactory.migrationActions(migrateOrCancelMigrationCompute, migrateStorage),
VirtualMachineActionFactory.migrationActions(migrationActions),
VirtualMachineActionFactory.copySSHCommand(vm, virtctlCommand),
VirtualMachineActionFactory.moveToFolder(vm, createModal),
VirtualMachineActionFactory.delete(vm, createModal),
Expand Down
2 changes: 1 addition & 1 deletion src/views/virtualmachines/actions/tests/useVirtualMachineActionsProvider.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,6 @@ describe('useVirtualMachineActionsProvider tests', () => {
'vm-action-delete',
]);

expect(migratingSubmenuIds).toEqual(['vm-action-cancel-migrate', 'vm-migrate-storage']);
expect(migratingSubmenuIds).toEqual(['vm-action-cancel-migrate']);
});
});
Loading