etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.16' into main

This commit is contained in:
Rohit Yadav 2021-11-18 14:05:53 +05:30
parent b4aabadc4d babf94f801
commit d8004871e5
95 changed files with 184 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/cloud/vm/NicProfile.java
View File

@ -147,7 +147,7 @@ public class NicProfile implements InternalIdentity, Serializable {
return networkId;
}
public void setNetworId(long networkId){
public void setNetworkId(long networkId){
this.networkId = networkId;
}

4
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
View File

@ -2052,7 +2052,6 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
//Create nic profile for migration
s_logger.debug("Creating nic profile for migration. BroadcastUri: "+broadcastUri.toString()+" NetworkId: "+ntwkId+" Vm: "+vm.getId());
final NetworkVO network = _networksDao.findById(ntwkId);
_networkModel.getNetworkRate(network.getId(), vm.getId());
final NetworkGuru guru = AdapterBase.getAdapterByName(networkGurus, network.getGuruName());
final NicProfile profile = new NicProfile();
profile.setDeviceId(255); //dummyId
@ -2066,7 +2065,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
profile.setIsolationUri(Networks.IsolationType.Vlan.toUri(publicIp.getVlanTag()));
profile.setSecurityGroupEnabled(_networkModel.isSecurityGroupSupportedInNetwork(network));
profile.setName(_networkModel.getNetworkTag(vm.getHypervisorType(), network));
profile.setNetworId(network.getId());
profile.setNetworkRate(_networkModel.getNetworkRate(network.getId(), vm.getId()));
profile.setNetworkId(network.getId());
guru.updateNicProfile(profile, network);
vm.addNic(profile);

2
server/src/main/java/com/cloud/network/Ipv6AddressManager.java
View File

@ -31,6 +31,6 @@ public interface Ipv6AddressManager extends Manager {
public String acquireGuestIpv6Address(Network network, String requestedIpv6) throws InsufficientAddressCapacityException;
public void setNicIp6Address(final NicProfile nic, final DataCenter dc, final Network network);
public void setNicIp6Address(final NicProfile nic, final DataCenter dc, final Network network) throws InsufficientAddressCapacityException;
}

15
server/src/main/java/com/cloud/network/Ipv6AddressManagerImpl.java
View File

@ -195,13 +195,15 @@ public class Ipv6AddressManagerImpl extends ManagerBase implements Ipv6AddressMa
* address information.
*/
@Override
public void setNicIp6Address(final NicProfile nic, final DataCenter dc, final Network network) {
public void setNicIp6Address(final NicProfile nic, final DataCenter dc, final Network network) throws InsufficientAddressCapacityException {
if (network.getIp6Gateway() != null) {
if (nic.getIPv6Address() == null) {
s_logger.debug("Found IPv6 CIDR " + network.getIp6Cidr() + " for Network " + network);
nic.setIPv6Cidr(network.getIp6Cidr());
nic.setIPv6Gateway(network.getIp6Gateway());
setNicPropertiesFromNetwork(nic, network);
IPv6Address ipv6addr = NetUtils.EUI64Address(network.getIp6Cidr(), nic.getMacAddress());
s_logger.info("Calculated IPv6 address " + ipv6addr + " using EUI-64 for NIC " + nic.getUuid());
nic.setIPv6Address(ipv6addr.toString());
@ -217,4 +219,15 @@ public class Ipv6AddressManagerImpl extends ManagerBase implements Ipv6AddressMa
}
}
private void setNicPropertiesFromNetwork(NicProfile nic, Network network) throws InsufficientAddressCapacityException {
if (nic.getBroadcastType() == null) {
nic.setBroadcastType(network.getBroadcastDomainType());
}
if (nic.getBroadCastUri() == null) {
nic.setBroadcastUri(network.getBroadcastUri());
}
if (nic.getMacAddress() == null) {
nic.setMacAddress(_networkModel.getNextAvailableMacAddressInNetwork(network.getId()));
}
}
}

2
server/src/test/java/com/cloud/network/Ipv6AddressManagerTest.java
View File

@ -229,7 +229,7 @@ public class Ipv6AddressManagerTest {
}
@Test
public void setNICIPv6AddressTest() {
public void setNICIPv6AddressTest() throws InsufficientAddressCapacityException {
NicProfile nic = new NicProfile();
Network network = mock(Network.class);
DataCenter dc = mock(DataCenter.class);

2
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
View File

@ -111,7 +111,7 @@ class CsDhcp(CsDataBag):
if self.config.is_dhcp() and not self.config.use_extdns():
guest_ip = self.config.address().get_guest_ip()
if guest_ip and guest_ip in dns_list and ip not in dns_list:
## Replace the default guest IP in VR with the ip in additional IP ranges, if shared network has multiple IP ranges.
# Replace the default guest IP in VR with the ip in additional IP ranges, if shared network has multiple IP ranges.
dns_list.remove(guest_ip)
dns_list.insert(0, ip)
line = "dhcp-option=tag:interface-%s-%s,6,%s" % (device, idx, ','.join(dns_list))

2
ui/src/components/view/ResourceLimitTab.vue
View File

@ -119,7 +119,7 @@ export default {
if (this.formLoading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/components/view/SearchView.vue
View File

@ -512,7 +512,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
this.paramsFilter = {}
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

6
ui/src/views/AutogenView.vue
View File

@ -1201,7 +1201,7 @@ export default {
this.modalInfo.title = this.currentAction.label
this.modalInfo.docHelp = this.currentAction.docHelp
}
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (!err) {
this.actionLoading = true
const itemsNameMap = {}
@ -1295,7 +1295,7 @@ export default {
},
execSubmit (e) {
e.preventDefault()
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}
@ -1528,7 +1528,7 @@ export default {
if (!confirmPasswordVal || confirmPasswordVal.length === 0) {
callback()
} else if (value && this.confirmDirty) {
form.validateFields(['confirmpassword'], { force: true })
form.validateFieldsAndScroll(['confirmpassword'], { force: true })
callback()
} else {
callback()

6
ui/src/views/auth/Login.vue
View File

@ -229,7 +229,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
const {
form: { validateFields },
form: { validateFieldsAndScroll },
state,
customActiveKey,
Login
@ -238,9 +238,9 @@ export default {
state.loginBtn = true
const validateFieldsKey = customActiveKey === 'cs' ? ['username', 'password', 'domain'] : ['idp']
const validateFieldsAndScrollKey = customActiveKey === 'cs' ? ['username', 'password', 'domain'] : ['idp']
validateFields(validateFieldsKey, { force: true }, (err, values) => {
validateFieldsAndScroll(validateFieldsAndScrollKey, { force: true }, (err, values) => {
if (!err) {
if (this.$config.multipleServer) {
this.axios.defaults.baseURL = (this.server.apiHost || '') + this.server.apiBase

2
ui/src/views/compute/AttachIso.vue
View File

@ -117,7 +117,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

7
ui/src/views/compute/CreateKubernetesCluster.vue
View File

@ -432,7 +432,12 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
const options = {
scroll: {
offsetTop: 10
}
}
this.form.validateFieldsAndScroll(options, (err, values) => {
if (err) {
return
}

2
ui/src/views/compute/CreateSSHKeyPair.vue
View File

@ -146,7 +146,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/compute/CreateSnapshotWizard.vue
View File

@ -112,7 +112,7 @@ export default {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) return
const params = {}

7
ui/src/views/compute/DeployVM.vue
View File

@ -1475,9 +1475,14 @@ export default {
},
handleSubmit (e) {
console.log('wizard submit')
const options = {
scroll: {
offsetTop: 90
}
}
e.preventDefault()
if (this.loading.deploy) return
this.form.validateFields(async (err, values) => {
this.form.validateFieldsAndScroll(options, async (err, values) => {
if (err) {
if (err.licensesaccepted) {
this.$notification.error({

2
ui/src/views/compute/DestroyVM.vue
View File

@ -104,7 +104,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/compute/EditVM.vue
View File

@ -200,7 +200,7 @@ export default {
},
handleSubmit (e) {
e.preventDefault()
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) return
const params = {}

2
ui/src/views/compute/InstanceTab.vue
View File

@ -159,7 +159,7 @@
<div class="modal-form">
<p class="modal-form__label">{{ $t('label.network') }}:</p>
<a-select
:defaultValue="addNetworkData.network"
:value="addNetworkData.network"
@change="e => addNetworkData.network = e"
autoFocus
showSearch

2
ui/src/views/compute/MigrateVMStorage.vue
View File

@ -122,7 +122,7 @@ export default {
},
handleSubmit (e) {
e.preventDefault()
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/compute/ScaleKubernetesCluster.vue
View File

@ -214,7 +214,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/compute/StartVirtualMachine.vue
View File

@ -206,7 +206,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/compute/UpgradeKubernetesCluster.vue
View File

@ -140,7 +140,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/compute/backup/FormSchedule.vue
View File

@ -260,7 +260,7 @@ export default {
},
handleSubmit (e) {
if (this.actionLoading) return
this.form.validateFields((error, values) => {
this.form.validateFieldsAndScroll((error, values) => {
if (error) {
return
}

7
ui/src/views/iam/AddAccount.vue
View File

@ -310,7 +310,12 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
const options = {
scroll: {
offsetTop: 10
}
}
this.form.validateFieldsAndScroll(options, (err, values) => {
if (err) {
return
}

2
ui/src/views/iam/AddLdapAccount.vue
View File

@ -364,7 +364,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/iam/AddUser.vue
View File

@ -287,7 +287,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/iam/ChangeUserPassword.vue
View File

@ -115,7 +115,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/iam/ConfigureSamlSsoAuth.vue
View File

@ -98,7 +98,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/iam/CreateRole.vue
View File

@ -144,7 +144,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/iam/DomainActionForm.vue
View File

@ -185,7 +185,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.action.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/iam/EditUser.vue
View File

@ -160,7 +160,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/iam/ImportRole.vue
View File

@ -145,7 +145,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/image/AddKubernetesSupportedVersion.vue
View File

@ -192,7 +192,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/image/IsoZones.vue
View File

@ -430,7 +430,7 @@ export default {
handleCopyIsoSubmit (e) {
e.preventDefault()
if (this.copyLoading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

7
ui/src/views/image/RegisterOrUploadIso.vue
View File

@ -307,7 +307,12 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
const options = {
scroll: {
offsetTop: 10
}
}
this.form.validateFieldsAndScroll(options, (err, values) => {
if (err) {
return
}

2
ui/src/views/image/RegisterOrUploadTemplate.vue
View File

@ -829,7 +829,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err || this.zoneError !== '') {
return
}

2
ui/src/views/image/TemplateZones.vue
View File

@ -529,7 +529,7 @@ export default {
handleCopyTemplateSubmit (e) {
e.preventDefault()
if (this.copyLoading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/image/UpdateKubernetesSupportedVersion.vue
View File

@ -113,7 +113,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

34
ui/src/views/infra/AddPrimaryStorage.vue
View File

@ -180,21 +180,23 @@
<a-input v-decorator="['vCenterDataStore', { rules: [{ required: true, message: `${$t('label.required')}` }] }]"/>
</a-form-item>
</div>
<a-form-item>
<tooltip-label slot="label" :title="$t('label.providername')" :tooltip="apiParams.provider.description"/>
<a-select
v-decorator="['provider', { initialValue: providerSelected, rules: [{ required: true, message: `${$t('label.required')}`}] }]"
@change="updateProviderAndProtocol"
showSearch
optionFilterProp="children"
:filterOption="(input, option) => {
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
}" >
<a-select-option :value="provider" v-for="(provider,idx) in providers" :key="idx">
{{ provider }}
</a-select-option>
</a-select>
</a-form-item>
<div v-if="protocolSelected !== 'Linstor'">
<a-form-item>
<tooltip-label slot="label" :title="$t('label.providername')" :tooltip="apiParams.provider.description"/>
<a-select
v-decorator="['provider', { initialValue: providerSelected, rules: [{ required: true, message: `${$t('label.required')}`}] }]"
@change="updateProviderAndProtocol"
showSearch
optionFilterProp="children"
:filterOption="(input, option) => {
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
}" >
<a-select-option :value="provider" v-for="(provider,idx) in providers" :key="idx">
{{ provider }}
</a-select-option>
</a-select>
</a-form-item>
</div>
<div v-if="this.providerSelected !== 'DefaultPrimary' && this.providerSelected !== 'PowerFlex' && this.providerSelected !== 'Linstor'">
<a-form-item>
<tooltip-label slot="label" :title="$t('label.ismanaged')" :tooltip="apiParams.managed.description"/>
@ -588,7 +590,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/infra/AddSecondaryStorage.vue
View File

@ -245,7 +245,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

4
ui/src/views/infra/InfraSummary.vue
View File

@ -136,7 +136,7 @@
<a-button @click="this.sslModalClose" class="close-button">
{{ $t('label.cancel' ) }}
</a-button>
<a-button type="primary" ref="submit" :loading="sslFormSubmitting">
<a-button @click="this.handleSslFormSubmit" type="primary" ref="submit" :loading="sslFormSubmitting">
{{ $t('label.submit' ) }}
</a-button>
</a-form-item>
@ -265,7 +265,7 @@ export default {
if (this.sslFormSubmitting) return
this.sslFormSubmitting = true
this.form.validateFields(errors => {
this.form.validateFieldsAndScroll(errors => {
if (errors) {
this.sslFormSubmitting = false
return

2
ui/src/views/infra/MigrateData.vue
View File

@ -127,7 +127,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/infra/PodAdd.vue
View File

@ -187,7 +187,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) return
this.loading = true

2
ui/src/views/infra/network/DedicatedVLANTab.vue
View File

@ -371,7 +371,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.formLoading) return
this.form.validateFields(errors => {
this.form.validateFieldsAndScroll(errors => {
if (errors) return
this.formLoading = true

2
ui/src/views/infra/network/EditTrafficLabel.vue
View File

@ -150,7 +150,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/infra/network/IpRangesTabManagement.vue
View File

@ -298,7 +298,7 @@ export default {
},
handleAddIpRange (e) {
if (this.componentLoading) return
this.form.validateFields((error, values) => {
this.form.validateFieldsAndScroll((error, values) => {
if (error) return
this.componentLoading = true

2
ui/src/views/infra/network/IpRangesTabPublic.vue
View File

@ -516,7 +516,7 @@ export default {
},
handleAddIpRange (e) {
if (this.componentLoading) return
this.form.validateFields((error, values) => {
this.form.validateFieldsAndScroll((error, values) => {
if (error) return
this.componentLoading = true

2
ui/src/views/infra/network/IpRangesTabStorage.vue
View File

@ -279,7 +279,7 @@ export default {
},
handleAddIpRange (e) {
if (this.componentLoading) return
this.form.validateFields((error, values) => {
this.form.validateFieldsAndScroll((error, values) => {
if (error) return
this.componentLoading = true

2
ui/src/views/infra/network/ServiceProvidersTab.vue
View File

@ -1170,7 +1170,7 @@ export default {
await this.executeConfirmAction()
return
}
await this.form.validateFields(async (err, values) => {
await this.form.validateFieldsAndScroll(async (err, values) => {
if (err) {
return
}

2
ui/src/views/infra/network/providers/AddF5LoadBalancer.vue
View File

@ -166,7 +166,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields(async (err, values) => {
this.form.validateFieldsAndScroll(async (err, values) => {
if (err) {
return
}

2
ui/src/views/infra/network/providers/AddNetscalerLoadBalancer.vue
View File

@ -198,7 +198,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields(async (err, values) => {
this.form.validateFieldsAndScroll(async (err, values) => {
if (err) {
return
}

2
ui/src/views/infra/network/providers/AddNiciraNvpDevice.vue
View File

@ -130,7 +130,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields(async (err, values) => {
this.form.validateFieldsAndScroll(async (err, values) => {
if (err) {
return
}

2
ui/src/views/infra/network/providers/AddPaloAltoFirewall.vue
View File

@ -213,7 +213,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields(async (err, values) => {
this.form.validateFieldsAndScroll(async (err, values) => {
if (err) {
return
}

2
ui/src/views/infra/network/providers/AddSrxFirewall.vue
View File

@ -191,7 +191,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields(async (err, values) => {
this.form.validateFieldsAndScroll(async (err, values) => {
if (err) {
return
}

2
ui/src/views/infra/routers/RouterHealthCheck.vue
View File

@ -151,7 +151,7 @@ export default {
handleGetHealthChecksSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/infra/zone/AdvancedGuestTrafficForm.vue
View File

@ -135,7 +135,7 @@ export default {
},
handleSubmit (e) {
e.preventDefault()
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
this.validStatus = ''
this.validMessage = ''
if (err) {

2
ui/src/views/infra/zone/IpAddressRangeForm.vue
View File

@ -229,7 +229,7 @@ export default {
methods: {
handleAddRange (e) {
e.preventDefault()
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (!err) {
this.ipRanges.push({
key: this.ipRanges.length.toString(),

2
ui/src/views/infra/zone/StaticInputsForm.vue
View File

@ -187,7 +187,7 @@ export default {
},
handleSubmit (e) {
e.preventDefault()
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

1
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
View File

@ -1340,6 +1340,7 @@ export default {
url = this.rbdURL(rbdmonitor, rbdpool, rbdid, rbdsecret)
} else if (protocol === 'Linstor') {
url = this.linstorURL(server)
params.provider = 'Linstor'
params['details[0].resourceGroup'] = this.prefillContent.primaryStorageLinstorResourceGroup.value
} else if (protocol === 'vmfs' || protocol === 'datastorecluster') {
let path = this.prefillContent.primaryStorageVmfsDatacenter.value

2
ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
View File

@ -489,7 +489,7 @@ export default {
this.emitPhysicalNetworks()
},
updateTrafficLabel (trafficInEdit) {
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (!err) {
this.showEditTraffic = false
if (this.hypervisor === 'VMware') {

2
ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
View File

@ -548,7 +548,7 @@ export default {
},
handleSubmit (e) {
e.preventDefault()
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue
View File

@ -127,7 +127,7 @@ export default {
methods: {
handleSubmit (e) {
e.preventDefault()
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (!err) {
this.$emit('nextPressed')
}

6
ui/src/views/network/AclListRulesTab.vue
View File

@ -385,7 +385,7 @@ export default {
this.tagsLoading = true
e.preventDefault()
this.newTagsForm.validateFields((err, values) => {
this.newTagsForm.validateFieldsAndScroll((err, values) => {
if (err) {
this.tagsLoading = false
return
@ -471,7 +471,7 @@ export default {
},
handleEditRule (e) {
e.preventDefault()
this.ruleForm.validateFields((err, values) => {
this.ruleForm.validateFieldsAndScroll((err, values) => {
if (err) return
this.fetchLoading = true
@ -561,7 +561,7 @@ export default {
},
handleAddRule (e) {
e.preventDefault()
this.ruleForm.validateFields((err, values) => {
this.ruleForm.validateFieldsAndScroll((err, values) => {
if (err) return
this.fetchLoading = true

7
ui/src/views/network/CreateIsolatedNetworkForm.vue
View File

@ -403,7 +403,12 @@ export default {
},
handleSubmit (e) {
if (this.actionLoading) return
this.form.validateFields((error, values) => {
const options = {
scroll: {
offsetTop: 10
}
}
this.form.validateFieldsAndScroll(options, (error, values) => {
if (error) {
return
}

2
ui/src/views/network/CreateL2NetworkForm.vue
View File

@ -365,7 +365,7 @@ export default {
},
handleSubmit (e) {
if (this.actionLoading) return
this.form.validateFields((error, values) => {
this.form.validateFieldsAndScroll((error, values) => {
if (error) {
return
}

7
ui/src/views/network/CreateSharedNetworkForm.vue
View File

@ -694,7 +694,12 @@ export default {
},
handleSubmit (e) {
if (this.actionLoading) return
this.form.validateFields((error, values) => {
const options = {
scroll: {
offsetTop: 10
}
}
this.form.validateFieldsAndScroll(options, (error, values) => {
if (error) {
return
}

2
ui/src/views/network/CreateVlanIpRange.vue
View File

@ -224,7 +224,7 @@ export default {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/network/CreateVpc.vue
View File

@ -173,7 +173,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

7
ui/src/views/network/CreateVpnCustomerGateway.vue
View File

@ -325,7 +325,12 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.isSubmitted) return
this.form.validateFields((err, values) => {
const options = {
scroll: {
offsetTop: 10
}
}
this.form.validateFieldsAndScroll(options, (err, values) => {
if (err) {
return
}

2
ui/src/views/network/FirewallRules.vue
View File

@ -448,7 +448,7 @@ export default {
if (this.addTagLoading) return
this.addTagLoading = true
this.newTagsForm.validateFields((err, values) => {
this.newTagsForm.validateFieldsAndScroll((err, values) => {
if (err) {
this.tagsLoading = false
return

2
ui/src/views/network/IngressEgressRuleConfigure.vue
View File

@ -415,7 +415,7 @@ export default {
this.tagsLoading = true
e.preventDefault()
this.newTagsForm.validateFields((err, values) => {
this.newTagsForm.validateFieldsAndScroll((err, values) => {
if (err) {
this.tagsLoading = false
return

4
ui/src/views/network/LoadBalancing.vue
View File

@ -765,7 +765,7 @@ export default {
this.tagsModalLoading = true
e.preventDefault()
this.newTagsForm.validateFields((err, values) => {
this.newTagsForm.validateFieldsAndScroll((err, values) => {
if (err) {
this.tagsModalLoading = false
return
@ -926,7 +926,7 @@ export default {
if (this.stickinessModalLoading) return
this.stickinessModalLoading = true
e.preventDefault()
this.stickinessPolicyForm.validateFields((err, values) => {
this.stickinessPolicyForm.validateFieldsAndScroll((err, values) => {
if (err) {
this.stickinessModalLoading = false
return

2
ui/src/views/network/PortForwarding.vue
View File

@ -664,7 +664,7 @@ export default {
this.tagsModalLoading = true
e.preventDefault()
this.newTagsForm.validateFields((err, values) => {
this.newTagsForm.validateFieldsAndScroll((err, values) => {
if (err) {
this.tagsModalLoading = false
return

2
ui/src/views/network/StaticRoutesTab.vue
View File

@ -251,7 +251,7 @@ export default {
this.tagsLoading = true
e.preventDefault()
this.newTagsForm.validateFields((err, values) => {
this.newTagsForm.validateFieldsAndScroll((err, values) => {
if (err) {
this.tagsLoading = false
return

6
ui/src/views/network/VpcTab.vue
View File

@ -637,7 +637,7 @@ export default {
if (this.modals.gatewayLoading) return
this.modals.gatewayLoading = true
this.gatewayForm.validateFields(errors => {
this.gatewayForm.validateFieldsAndScroll(errors => {
if (errors) {
this.modals.gatewayLoading = false
return
@ -693,7 +693,7 @@ export default {
this.fetchLoading = true
this.modals.vpnConnection = false
this.vpnConnectionForm.validateFields((errors, values) => {
this.vpnConnectionForm.validateFieldsAndScroll((errors, values) => {
if (errors) {
this.fetchLoading = false
return
@ -737,7 +737,7 @@ export default {
this.fetchLoading = true
this.modals.networkAcl = false
this.networkAclForm.validateFields((errors, values) => {
this.networkAclForm.validateFieldsAndScroll((errors, values) => {
if (errors) {
this.fetchLoading = false
}

4
ui/src/views/network/VpcTiersTab.vue
View File

@ -637,7 +637,7 @@ export default {
this.fetchLoading = true
this.modalLoading = true
this.form.validateFields((errors, values) => {
this.form.validateFieldsAndScroll((errors, values) => {
if (errors) {
this.fetchLoading = false
this.modalLoading = false
@ -681,7 +681,7 @@ export default {
if (this.modalLoading) return
this.fetchLoading = true
this.modalLoading = true
this.form.validateFields((errors, values) => {
this.form.validateFieldsAndScroll((errors, values) => {
if (errors) {
this.fetchLoading = false
this.modalLoading = false

2
ui/src/views/offering/AddComputeOffering.vue
View File

@ -735,7 +735,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

7
ui/src/views/offering/AddDiskOffering.vue
View File

@ -483,7 +483,12 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
const options = {
scroll: {
offsetTop: 10
}
}
this.form.validateFieldsAndScroll(options, (err, values) => {
if (err) {
return
}

7
ui/src/views/offering/AddNetworkOffering.vue
View File

@ -707,7 +707,12 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
const options = {
scroll: {
offsetTop: 10
}
}
this.form.validateFieldsAndScroll(options, (err, values) => {
if (err) {
return
}

2
ui/src/views/offering/AddVpcOffering.vue
View File

@ -312,7 +312,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/offering/ImportBackupOffering.vue
View File

@ -155,7 +155,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/offering/UpdateOfferingAccess.vue
View File

@ -259,7 +259,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/plugins/quota/EditTariffValueWizard.vue
View File

@ -102,7 +102,7 @@ export default {
submitTariff (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((error, values) => {
this.form.validateFieldsAndScroll((error, values) => {
if (error) return
const params = {}

4
ui/src/views/project/AddAccountOrUserToProject.vue
View File

@ -230,7 +230,7 @@ export default {
addAccountToProject (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}
@ -264,7 +264,7 @@ export default {
addUserToProject (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/project/InvitationTokenTemplate.vue
View File

@ -67,7 +67,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

4
ui/src/views/project/iam/ProjectRoleTab.vue
View File

@ -213,7 +213,7 @@ export default {
updateProjectRole (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}
@ -253,7 +253,7 @@ export default {
createProjectRole (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/storage/AttachVolume.vue
View File

@ -105,7 +105,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/storage/CreateSnapshotFromVMSnapshot.vue
View File

@ -98,7 +98,7 @@ export default {
},
handleSubmit (e) {
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/storage/CreateVolume.vue
View File

@ -194,7 +194,7 @@ export default {
},
handleSubmit (e) {
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/storage/FormSchedule.vue
View File

@ -351,7 +351,7 @@ export default {
},
handleSubmit (e) {
if (this.actionLoading) return
this.form.validateFields((error, values) => {
this.form.validateFieldsAndScroll((error, values) => {
if (error) {
return
}

2
ui/src/views/storage/ResizeVolume.vue
View File

@ -99,7 +99,7 @@ export default {
},
handleSubmit (e) {
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/storage/RestoreAttachBackupVolume.vue
View File

@ -137,7 +137,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.actionLoading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/storage/TakeSnapshot.vue
View File

@ -139,7 +139,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.actionLoading) return
this.form.validateFields((error, values) => {
this.form.validateFieldsAndScroll((error, values) => {
if (error) {
return
}

2
ui/src/views/storage/UploadLocalVolume.vue
View File

@ -171,7 +171,7 @@ export default {
handleSubmit (e) {
e.preventDefault()
if (this.loading) return
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}

2
ui/src/views/tools/ImportUnmanagedInstance.vue
View File

@ -621,7 +621,7 @@ export default {
},
handleSubmit (e) {
e.preventDefault()
this.form.validateFields((err, values) => {
this.form.validateFieldsAndScroll((err, values) => {
if (err) {
return
}