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

Jump to bottom

Bug 1869633: Show only boot-order at pending changes warning on boot order change #6354

Merged
merged 1 commit into from Aug 19, 2020
Merged

Bug 1869633: Show only boot-order at pending changes warning on boot order change #6354

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions frontend/packages/kubevirt-plugin/src/k8s/wrapper/vm/disk-wrapper.ts
View file
Open in desktop
Expand Up @@ -72,13 +72,20 @@ export class DiskWrapper extends ObjectWithTypePropertyWrapper<
}
}

isDiskEqual = (otherDisk: V1Disk, omitRuntimeData?: boolean): boolean => {
isDiskEqual = (
otherDisk: V1Disk,
omitRuntimeData?: boolean,
omitBootOrder?: boolean,
): boolean => {
if (!otherDisk) {
return false;
}

const currDisk = omitBootOrder ? _.omit(this.data, 'bootOrder') : this.data;
const othrDisk = omitBootOrder ? _.omit(otherDisk, 'bootOrder') : otherDisk;

if (!omitRuntimeData) {
return _.isEqual(this.data, otherDisk);
return _.isEqual(currDisk, othrDisk);
}

const diskWrapper = new DiskWrapper(otherDisk);
Expand All @@ -91,11 +98,11 @@ export class DiskWrapper extends ObjectWithTypePropertyWrapper<
switch (thisDiskType) {
case DiskType.CDROM:
return _.isEqual(
_.omit(this.data, 'cdrom.readonly', 'cdrom.tray'),
_.omit(otherDisk, 'cdrom.readonly', 'cdrom.tray'),
_.omit(currDisk, 'cdrom.readonly', 'cdrom.tray'),
_.omit(othrDisk, 'cdrom.readonly', 'cdrom.tray'),
);
default:
return _.isEqual(this.data, otherDisk);
return _.isEqual(currDisk, othrDisk);
}
};
}
19 changes: 15 additions & 4 deletions frontend/packages/kubevirt-plugin/src/selectors/vm-like/next-run-changes.ts
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ import { getSimpleName } from '../utils';
import { V1Disk } from '../../types/vm/disk/V1Disk';
import { VolumeWrapper } from '../../k8s/wrapper/vm/volume-wrapper';
import { DiskWrapper } from '../../k8s/wrapper/vm/disk-wrapper';
import { V1NetworkInterface } from '../../types/vm/index';

const cpuOmitPaths = ['dedicatedCpuPlacement', 'features', 'isolateEmulatorThread', 'model'];

Expand Down Expand Up @@ -53,7 +54,7 @@ export const changedDisks = (
const diskWrapper = new DiskWrapper(vmDiskLookup[vol.name]);

diskEquality =
!!vmiDiskLookup[vol.name] && diskWrapper.isDiskEqual(vmiDiskLookup[vol.name], true);
!!vmiDiskLookup[vol.name] && diskWrapper.isDiskEqual(vmiDiskLookup[vol.name], true, true);

if (diskEquality) {
const volWrapper = new VolumeWrapper(vol);
Expand Down Expand Up @@ -104,12 +105,22 @@ export const changedNics = (vm: VMWrapper, vmi: VMIWrapper): string[] => {
const vmNics = vm.getNetworkInterfaces();
const vmiNics = vmi.getNetworkInterfaces();

const vmNicsLookup = createBasicLookup(vmNics, getSimpleName);
const vmiNicsLookup = createBasicLookup(vmiNics, getSimpleName);
const vmNicsLookup: { [name: string]: V1NetworkInterface } = createBasicLookup(
vmNics,
getSimpleName,
);
const vmiNicsLookup: { [name: string]: V1NetworkInterface } = createBasicLookup(
vmiNics,
getSimpleName,
);

return Object.keys(vmNicsLookup).reduce(
(acc, nicName) =>
!vmiNicsLookup[nicName] || !_.isEqual(vmiNicsLookup[nicName], vmNicsLookup[nicName])
!vmiNicsLookup[nicName] ||
!_.isEqual(
_.omit(vmiNicsLookup[nicName], 'bootOrder'),
_.omit(vmNicsLookup[nicName], 'bootOrder'),
)
? [...acc, nicName]
: [...acc],
[],
Expand Down