api,server,ui: improve listing public ip for associate #11591
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,7 @@ | |
| import java.lang.reflect.Field; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.apache.cloudstack.annotation.dao.AnnotationDao; | ||
|
|
@@ -258,14 +259,14 @@ public void setParametersTestWhenStateIsFreeAndSystemVmPublicIsTrue() throws Ill | |
| Mockito.when(cmd.getId()).thenReturn(null); | ||
| Mockito.when(cmd.isSourceNat()).thenReturn(null); | ||
| Mockito.when(cmd.isStaticNat()).thenReturn(null); | ||
| Mockito.when(cmd.getTags()).thenReturn(null); | ||
| List<IpAddress.State> states = Collections.singletonList(IpAddress.State.Free); | ||
| spy.setParameters(sc, cmd, VlanType.VirtualNetwork, Boolean.FALSE, states); | ||
|
|
||
| Mockito.verify(sc, Mockito.times(1)).setJoinParameters("vlanSearch", "vlanType", VlanType.VirtualNetwork); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("display", false); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("sourceNetworkId", 10L); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("state", states.toArray()); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("forsystemvms", false); | ||
| } | ||
|
|
||
|
|
@@ -281,14 +282,14 @@ public void setParametersTestWhenStateIsFreeAndSystemVmPublicIsFalse() throws No | |
| Mockito.when(cmd.getId()).thenReturn(null); | ||
| Mockito.when(cmd.isSourceNat()).thenReturn(null); | ||
| Mockito.when(cmd.isStaticNat()).thenReturn(null); | ||
| Mockito.when(cmd.getTags()).thenReturn(null); | ||
| List<IpAddress.State> states = Collections.singletonList(IpAddress.State.Free); | ||
| spy.setParameters(sc, cmd, VlanType.VirtualNetwork, Boolean.FALSE, states); | ||
|
|
||
| Mockito.verify(sc, Mockito.times(1)).setJoinParameters("vlanSearch", "vlanType", VlanType.VirtualNetwork); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("display", false); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("sourceNetworkId", 10L); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("state", states.toArray()); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("forsystemvms", false); | ||
| } | ||
|
|
||
|
|
@@ -304,13 +305,13 @@ public void setParametersTestWhenStateIsNullAndSystemVmPublicIsFalse() throws No | |
| Mockito.when(cmd.getId()).thenReturn(null); | ||
| Mockito.when(cmd.isSourceNat()).thenReturn(null); | ||
| Mockito.when(cmd.isStaticNat()).thenReturn(null); | ||
| Mockito.when(cmd.getTags()).thenReturn(null); | ||
| spy.setParameters(sc, cmd, VlanType.VirtualNetwork, Boolean.TRUE, Collections.emptyList()); | ||
|
|
||
| Mockito.verify(sc, Mockito.times(1)).setJoinParameters("vlanSearch", "vlanType", VlanType.VirtualNetwork); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("display", false); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("sourceNetworkId", 10L); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("state", IpAddress.State.Allocated); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("forsystemvms", false); | ||
| } | ||
|
|
||
|
|
@@ -326,13 +327,13 @@ public void setParametersTestWhenStateIsNullAndSystemVmPublicIsTrue() throws NoS | |
| Mockito.when(cmd.getId()).thenReturn(null); | ||
| Mockito.when(cmd.isSourceNat()).thenReturn(null); | ||
| Mockito.when(cmd.isStaticNat()).thenReturn(null); | ||
| Mockito.when(cmd.getTags()).thenReturn(null); | ||
| spy.setParameters(sc, cmd, VlanType.VirtualNetwork, Boolean.TRUE, Collections.emptyList()); | ||
|
|
||
| Mockito.verify(sc, Mockito.times(1)).setJoinParameters("vlanSearch", "vlanType", VlanType.VirtualNetwork); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("display", false); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("sourceNetworkId", 10L); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("state", IpAddress.State.Allocated); | ||
| Mockito.verify(sc, Mockito.times(1)).setParameters("forsystemvms", false); | ||
| } | ||
|
|
||
|
|
@@ -1033,4 +1034,49 @@ public void testGetExternalVmConsole() { | |
| Assert.assertNotNull(spy.getExternalVmConsole(virtualMachine, host)); | ||
| Mockito.verify(extensionManager).getInstanceConsole(virtualMachine, host); | ||
| } | ||
|
|
||
| @Test | ||
| public void getStatesForIpAddressSearchReturnsValidStates() { | ||
| ListPublicIpAddressesCmd cmd = Mockito.mock(ListPublicIpAddressesCmd.class); | ||
| Mockito.when(cmd.getState()).thenReturn("Allocated ,free"); | ||
| List<IpAddress.State> result = spy.getStatesForIpAddressSearch(cmd); | ||
| Assert.assertEquals(2, result.size()); | ||
| Assert.assertTrue(result.contains(IpAddress.State.Allocated)); | ||
| Assert.assertTrue(result.contains(IpAddress.State.Free)); | ||
| } | ||
|
|
||
| @Test | ||
| public void getStatesForIpAddressSearchReturnsEmptyListForNullState() { | ||
| ListPublicIpAddressesCmd cmd = Mockito.mock(ListPublicIpAddressesCmd.class); | ||
| Mockito.when(cmd.getState()).thenReturn(null); | ||
| List<IpAddress.State> result = spy.getStatesForIpAddressSearch(cmd); | ||
| Assert.assertTrue(result.isEmpty()); | ||
| } | ||
|
|
||
| @Test | ||
| public void getStatesForIpAddressSearchReturnsEmptyListForBlankState() { | ||
| ListPublicIpAddressesCmd cmd = Mockito.mock(ListPublicIpAddressesCmd.class); | ||
| Mockito.when(cmd.getState()).thenReturn(" "); | ||
| List<IpAddress.State> result = spy.getStatesForIpAddressSearch(cmd); | ||
| Assert.assertTrue(result.isEmpty()); | ||
| } | ||
|
|
||
| @Test(expected = InvalidParameterValueException.class) | ||
| public void getStatesForIpAddressSearchThrowsExceptionForInvalidState() { | ||
| ListPublicIpAddressesCmd cmd = Mockito.mock(ListPublicIpAddressesCmd.class); | ||
| Mockito.when(cmd.getState()).thenReturn("InvalidState"); | ||
| spy.getStatesForIpAddressSearch(cmd); | ||
| } | ||
|
|
||
| @Test | ||
| public void getStatesForIpAddressSearchHandlesMixedValidAndInvalidStates() { | ||
| ListPublicIpAddressesCmd cmd = Mockito.mock(ListPublicIpAddressesCmd.class); | ||
| Mockito.when(cmd.getState()).thenReturn("Allocated,InvalidState"); | ||
| try { | ||
| spy.getStatesForIpAddressSearch(cmd); | ||
| Assert.fail("Expected InvalidParameterValueException to be thrown"); | ||
| } catch (InvalidParameterValueException e) { | ||
| Assert.assertEquals("Invalid state: InvalidState", e.getMessage()); | ||
| } | ||
| } | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -43,6 +43,7 @@ | |
| - defaultOption (Object, optional): Preselected object to include initially | ||
| - showIcon (Boolean, optional): Whether to show icon for the options. Default is true | ||
| - defaultIcon (String, optional): Icon to be shown when there is no resource icon for the option. Default is 'cloud-outlined' | ||
| - autoSelectFirstOption (Boolean, optional): Whether to automatically select the first option when options are loaded. Default is false | ||
|
|
||
| Events: | ||
| - @change-option-value (Function): Emits the selected option value(s) when value(s) changes. Do not use @change as it will give warnings and may not work | ||
|
|
@@ -81,7 +82,7 @@ | |
| <resource-icon v-if="option.icon && option.icon.base64image" :image="option.icon.base64image" size="1x" style="margin-right: 5px"/> | ||
| <render-icon v-else :icon="defaultIcon" style="margin-right: 5px" /> | ||
| </span> | ||
| <span>{{ optionLabelFn ? optionLabelFn(option) : option[optionLabelKey] }}</span> | ||
| </span> | ||
| </a-select-option> | ||
| </a-select> | ||
|
|
@@ -120,6 +121,10 @@ export default { | |
| type: String, | ||
| default: 'name' | ||
| }, | ||
| optionLabelFn: { | ||
| type: Function, | ||
| default: null | ||
| }, | ||
| defaultOption: { | ||
| type: Object, | ||
| default: null | ||
|
|
@@ -135,6 +140,10 @@ export default { | |
| pageSize: { | ||
| type: Number, | ||
| default: null | ||
| }, | ||
| autoSelectFirstOption: { | ||
| type: Boolean, | ||
| default: false | ||
| } | ||
| }, | ||
| data () { | ||
|
|
@@ -147,11 +156,12 @@ export default { | |
| searchTimer: null, | ||
| scrollHandlerAttached: false, | ||
| preselectedOptionValue: null, | ||
| successiveFetches: 0, | ||
| canSelectFirstOption: false | ||
| } | ||
| }, | ||
| created () { | ||
| this.addDefaultOptionIfNeeded() | ||
| }, | ||
| mounted () { | ||
| this.preselectedOptionValue = this.$attrs.value | ||
|
|
@@ -208,6 +218,7 @@ export default { | |
| }).catch(error => { | ||
| this.$notifyError(error) | ||
| }).finally(() => { | ||
| this.canSelectFirstOption = true | ||
| if (this.successiveFetches === 0) { | ||
| this.loading = false | ||
| } | ||
|
|
@@ -218,6 +229,12 @@ export default { | |
| (Array.isArray(this.preselectedOptionValue) && this.preselectedOptionValue.length === 0) || | ||
| this.successiveFetches >= this.maxSuccessiveFetches) { | ||
| this.resetPreselectedOptionValue() | ||
| if (!this.canSelectFirstOption && this.autoSelectFirstOption && this.options.length > 0) { | ||
shwstppr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| this.$nextTick(() => { | ||
| this.preselectedOptionValue = this.options[0][this.optionValueKey] | ||
| this.onChange(this.preselectedOptionValue) | ||
| }) | ||
| } | ||
| return | ||
| } | ||
| const matchValue = Array.isArray(this.preselectedOptionValue) ? this.preselectedOptionValue[0] : this.preselectedOptionValue | ||
|
|
@@ -239,6 +256,7 @@ export default { | |
| }, | ||
| addDefaultOptionIfNeeded () { | ||
| if (this.defaultOption) { | ||
| this.canSelectFirstOption = true | ||
shwstppr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| this.options.push(this.defaultOption) | ||
| } | ||
| }, | ||
|
|
||
Oops, something went wrong.
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.
we cannot have a null here, so no biggy but maybe reverse the checks and even use
Arrays?