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 1875347: can't have a disk provision source and use cdrom type as a disk #6537

Merged
merged 1 commit into from Sep 6, 2020
Merged

Bug 1875347: can't have a disk provision source and use cdrom type as a disk #6537

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
6 changes: 2 additions & 4 deletions ...bevirt-plugin/src/components/create-vm-wizard/redux/validations/storage-tab-validation.ts
View file
Open in desktop
Expand Up @@ -67,9 +67,7 @@ export const setStoragesTabValidity = (options: UpdateOptions) => {
const { id, dispatch, getState } = options;
const state = getState();

const iStorages = iGetStorages(state, id).filter(
(iStorage) => !iGetIn(iStorage, ['disk', 'cdrom']),
);
const iStorages = iGetStorages(state, id);
let error = null;

let hasAllRequiredFilled = iStorages.every((iStorage) =>
Expand All @@ -80,7 +78,7 @@ export const setStoragesTabValidity = (options: UpdateOptions) => {
const hasBootSource = !!iStorages.find(
(storageBundle) =>
iGetIn(storageBundle, ['disk', 'bootOrder']) === 1 &&
iGetIn(storageBundle, ['disk', 'disk']) &&
(iGetIn(storageBundle, ['disk', 'disk']) || iGetIn(storageBundle, ['disk', 'cdrom'])) &&
(iGetIn(storageBundle, ['volume', 'persistentVolumeClaim']) ||
iGetIn(storageBundle, ['dataVolume', 'spec', 'source', 'pvc']) ||
iGetIn(storageBundle, ['dataVolume', 'spec', 'source', 'http'])),
Expand Down