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

[2.8 Backport] Fix vSphere hostsystem false error #10574

Merged
merged 1 commit into from
Mar 6, 2024
Merged

[2.8 Backport] Fix vSphere hostsystem false error #10574

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
97 changes: 87 additions & 10 deletions shell/machine-config/__tests__/vmwarevsphere.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ import { cleanHtmlDirective } from '@shell/plugins/clean-html-directive';

describe('component: vmwarevsphere', () => {
const defaultGetters = { 'i18n/t': jest.fn().mockImplementation((key: string) => key) };
const defaultSetup = {
const poolId = 'poolId';
const baseSetup = {
propsData: {
poolId: 'poolId',
poolId,
credentialId: 'credentialId',
disabled: false,
mode: 'create',
value: { initted: false },
provider: 'vmwarevsphere'
},
mocks: {
Expand All @@ -20,9 +19,25 @@ describe('component: vmwarevsphere', () => {
stubs: { CodeMirror: true },
directives: { cleanHtmlDirective }
};
const defaultCreateSetup = {
...baseSetup,
propsData: {
...baseSetup.propsData,
mode: 'create',
value: { initted: false },
}
};
const defaultEditSetup = {
...baseSetup,
propsData: {
...baseSetup.propsData,
mode: 'edit',
value: { initted: false },
}
};

it('should mount successfully with correct default values', () => {
const wrapper = mount(vmwarevsphere, defaultSetup);
const wrapper = mount(vmwarevsphere, defaultCreateSetup);

const dataCenterElement = wrapper.find(`[data-testid="datacenter"]`).element;
const resourcePoolElement = wrapper.find(`[data-testid="resourcePool"]`).element;
Expand Down Expand Up @@ -78,7 +93,7 @@ describe('component: vmwarevsphere', () => {
];

it.each(testCases)('should generate label/value object without manipultion', (rawData, expected) => {
const wrapper = mount(vmwarevsphere, defaultSetup);
const wrapper = mount(vmwarevsphere, defaultCreateSetup);

expect(wrapper.vm.mapPathOptionsToContent(rawData)).toStrictEqual(expected);
});
Expand All @@ -95,7 +110,7 @@ describe('component: vmwarevsphere', () => {
];

it.each(testCases)('should generate label/value object for host options properly', (rawData, expected) => {
const wrapper = mount(vmwarevsphere, defaultSetup);
const wrapper = mount(vmwarevsphere, defaultCreateSetup);

expect(wrapper.vm.mapHostOptionsToContent(rawData)).toStrictEqual(expected);
});
Expand All @@ -114,7 +129,7 @@ describe('component: vmwarevsphere', () => {
];

it.each(testCases)('should generate label/value object for folder options properly', (rawData, expected) => {
const wrapper = mount(vmwarevsphere, defaultSetup);
const wrapper = mount(vmwarevsphere, defaultCreateSetup);

expect(wrapper.vm.mapFolderOptionsToContent(rawData)).toStrictEqual(expected);
});
Expand All @@ -127,7 +142,7 @@ describe('component: vmwarevsphere', () => {
];

it.each(testCases)('should generate label/value object for custom attributes options properly', (rawData, expected) => {
const wrapper = mount(vmwarevsphere, defaultSetup);
const wrapper = mount(vmwarevsphere, defaultCreateSetup);

expect(wrapper.vm.mapCustomAttributesToContent(rawData)).toStrictEqual(expected);
});
Expand All @@ -143,9 +158,71 @@ describe('component: vmwarevsphere', () => {
const expectedReslut = [{
...tag, label: `${ tag.category } / ${ tag.name }`, value: tag.id
}];
const wrapper = mount(vmwarevsphere, defaultSetup);
const wrapper = mount(vmwarevsphere, defaultCreateSetup);

expect(wrapper.vm.mapTagsToContent([tag])).toStrictEqual(expectedReslut);
});
});

describe('resetValueIfNecessary', () => {
const hostsystemOptions = ['', '/Datacenter/host/Cluster/111.11.11.1'];
const folderOptions = ['', '/Datacenter/vm', '/Datacenter/vm/sub-folder'];

it('should add errors to validationError collection when values are no in the options', () => {
const setup = {
...defaultEditSetup,
propsData: {
...defaultEditSetup.propsData,
value: {
...defaultEditSetup.propsData.value,
hostsystem: 'something that is not included in the options',
folder: 'again, something that is not included in the options'
}
}
};

const wrapper = mount(vmwarevsphere, setup);

const hostsystemContent = wrapper.vm.mapHostOptionsToContent(hostsystemOptions);

wrapper.vm.resetValueIfNecessary('hostsystem', hostsystemContent, hostsystemOptions);

const folderContent = wrapper.vm.mapHostOptionsToContent(folderOptions);

wrapper.vm.resetValueIfNecessary('folder', folderContent, folderOptions);

expect(wrapper.vm.$data.validationErrors[poolId]).toContain('hostsystem');
expect(wrapper.vm.$data.validationErrors[poolId]).toContain('folder');
});

describe('hostsystem and folder', () => {
const testCases = [null, ''];

it.each(testCases)('should NOT be added to validationError collection if they are null or ""', (data) => {
const setup = {
...defaultEditSetup,
propsData: {
...defaultEditSetup.propsData,
value: {
...defaultEditSetup.propsData.value,
hostsystem: data,
folder: data
}
}
};

const wrapper = mount(vmwarevsphere, setup);

const hostsystemContent = wrapper.vm.mapHostOptionsToContent(hostsystemOptions);

wrapper.vm.resetValueIfNecessary('hostsystem', hostsystemContent, hostsystemOptions);

const folderContent = wrapper.vm.mapHostOptionsToContent(folderOptions);

wrapper.vm.resetValueIfNecessary('folder', folderContent, folderOptions);

expect(wrapper.vm.$data.validationErrors[poolId]).toBeUndefined();
});
});
});
});
13 changes: 7 additions & 6 deletions shell/machine-config/vmwarevsphere.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,15 +646,16 @@ export default {
};

if (!isValueInContent()) {
if (this.mode === _CREATE) {
const value = isArray ? [] : content[0]?.value;
const value = isArray ? [] : content[0]?.value;
// null and "" are valid values for hostsystem and folder
const isFolderNullOrEmpty = key === 'folder' && (this.value.folder === null || this.value.folder === '');
const isHostsystemNullOrEmpty = key === 'hostsystem' && (this.value.hostsystem === null || this.value.hostsystem === '');

if (value !== SENTINEL) {
set(this.value, key, value);
}
if (this.mode === _CREATE && value !== SENTINEL) {
set(this.value, key, value);
}

if ([_EDIT, _VIEW].includes(this.mode)) {
if ([_EDIT, _VIEW].includes(this.mode) && !isFolderNullOrEmpty && !isHostsystemNullOrEmpty) {
this.manageErrors(errorActions.CREATE, key);
}
} else {
Expand Down
Loading