-
Notifications
You must be signed in to change notification settings - Fork 1.3k
api,server: allow cleaning up vm extraconfig #11974
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.
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
Open
shwstppr
wants to merge
8
commits into
apache:main
Choose a base branch
from
shapeblue:add-cleanupextraconfig-updatevm
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
6bd4f62
api,server: allow cleaning up vm extraconfig
shwstppr 7856a37
Merge remote-tracking branch 'apache/main' into add-cleanupextraconfi…
shwstppr 3793688
ui change
shwstppr b24f8cc
update
shwstppr 189f291
change
shwstppr e1772fe
Merge branch 'main' into add-cleanupextraconfig-updatevm
shwstppr b98a95b
Merge remote-tracking branch 'apache/main' into add-cleanupextraconfi…
shwstppr c3b6012
handle cleanupExtraConfig separately
shwstppr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
engine/schema/src/test/java/com/cloud/vm/dao/VMInstanceDetailsDaoImplTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package com.cloud.vm.dao; | ||
|
|
||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.ArgumentMatchers.anyString; | ||
| import static org.mockito.Mockito.doReturn; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.InjectMocks; | ||
| import org.mockito.Mockito; | ||
| import org.mockito.Spy; | ||
| import org.mockito.junit.MockitoJUnitRunner; | ||
|
|
||
| import com.cloud.utils.db.SearchBuilder; | ||
| import com.cloud.utils.db.SearchCriteria; | ||
| import com.cloud.vm.VMInstanceDetailVO; | ||
|
|
||
| @RunWith(MockitoJUnitRunner.class) | ||
| public class VMInstanceDetailsDaoImplTest { | ||
| @Spy | ||
| @InjectMocks | ||
| private VMInstanceDetailsDaoImpl vmInstanceDetailsDaoImpl; | ||
|
|
||
| @Test | ||
| public void removeDetailsWithPrefixReturnsZeroWhenPrefixIsBlank() { | ||
| Assert.assertEquals(0, vmInstanceDetailsDaoImpl.removeDetailsWithPrefix(1L, "")); | ||
| Assert.assertEquals(0, vmInstanceDetailsDaoImpl.removeDetailsWithPrefix(1L, " ")); | ||
| Assert.assertEquals(0, vmInstanceDetailsDaoImpl.removeDetailsWithPrefix(1L, null)); | ||
| } | ||
|
|
||
| @Test | ||
| public void removeDetailsWithPrefixRemovesMatchingDetails() { | ||
| SearchBuilder<VMInstanceDetailVO> sb = mock(SearchBuilder.class); | ||
| VMInstanceDetailVO entity = mock(VMInstanceDetailVO.class); | ||
| when(sb.entity()).thenReturn(entity); | ||
| when(sb.and(anyString(), any(), any(SearchCriteria.Op.class))).thenReturn(sb); | ||
| SearchCriteria<VMInstanceDetailVO> sc = mock(SearchCriteria.class); | ||
| when(sb.create()).thenReturn(sc); | ||
| when(vmInstanceDetailsDaoImpl.createSearchBuilder()).thenReturn(sb); | ||
| doReturn(3).when(vmInstanceDetailsDaoImpl).remove(sc); | ||
| int removedCount = vmInstanceDetailsDaoImpl.removeDetailsWithPrefix(1L, "testPrefix"); | ||
| Assert.assertEquals(3, removedCount); | ||
| Mockito.verify(sc).setParameters("vmId", 1L); | ||
| Mockito.verify(sc).setParameters("prefix", "testPrefix%"); | ||
| Mockito.verify(vmInstanceDetailsDaoImpl, Mockito.times(1)).remove(sc); | ||
| } | ||
|
|
||
| @Test | ||
| public void removeDetailsWithPrefixDoesNotRemoveWhenNoMatch() { | ||
| SearchBuilder<VMInstanceDetailVO> sb = mock(SearchBuilder.class); | ||
| VMInstanceDetailVO entity = mock(VMInstanceDetailVO.class); | ||
| when(sb.entity()).thenReturn(entity); | ||
| when(sb.and(anyString(), any(), any(SearchCriteria.Op.class))).thenReturn(sb); | ||
| SearchCriteria<VMInstanceDetailVO> sc = mock(SearchCriteria.class); | ||
| when(sb.create()).thenReturn(sc); | ||
| when(vmInstanceDetailsDaoImpl.createSearchBuilder()).thenReturn(sb); | ||
| doReturn(0).when(vmInstanceDetailsDaoImpl).remove(sc); | ||
|
|
||
| int removedCount = vmInstanceDetailsDaoImpl.removeDetailsWithPrefix(1L, "nonExistentPrefix"); | ||
|
|
||
| Assert.assertEquals(0, removedCount); | ||
| Mockito.verify(sc).setParameters("vmId", 1L); | ||
| Mockito.verify(sc).setParameters("prefix", "nonExistentPrefix%"); | ||
| Mockito.verify(vmInstanceDetailsDaoImpl, Mockito.times(1)).remove(sc); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -425,6 +425,8 @@ export default { | |||||||||||
| } | ||||||||||||
| if (values.extraconfig && values.extraconfig.length > 0) { | ||||||||||||
| params.extraconfig = encodeURIComponent(values.extraconfig) | ||||||||||||
|
Comment on lines
426
to
427
|
||||||||||||
| if (values.extraconfig && values.extraconfig.length > 0) { | |
| params.extraconfig = encodeURIComponent(values.extraconfig) | |
| const extraConfig = typeof values.extraconfig === 'string' ? values.extraconfig.trim() : values.extraconfig | |
| if (extraConfig && extraConfig.length > 0) { | |
| params.extraconfig = encodeURIComponent(extraConfig) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This bit gives me to think that we might want to include these in a DbConstants, similar to the ApiConstants. No critisism on this PR as I know this is the general practice atm.