You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2021/12/30 11:23:14 UTC
[cloudstack] branch main updated (49b2dfc -> c84198d)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 49b2dfc ui: simplify code using optional chaining in ZoneWizardLaunchZone view (#5619)
add ae62e1d fixes cannot add new port forwarding rules after auto select VM next time (#5690)
add 9a5a073 ui: Fix configure Sticky policy form (#5814)
add 6728b69 kvm: don't always force scsi controller for aarch64 VMs (#5802)
add d13057a ui: show tags only for supported resources (#5798)
add 6208976 Fix UI issue 5777 Root disk size is not shown as 'Disk Size' on VM deployment. (#5796)
add dcdcd09 Randomize managed volume copy host (#5789)
add c0ddda3 [VMware] Fix service offerings listing on appliances deployment options (#5752)
add 9798fa0 kvm: support qemu-system-x86>=5.2 (#5755)
add 8952cd5 kvm: add hosts using cloudstack ssh private key (ccc21 hackathon) (#5684)
add 5eccbc9 ui: Add footer text option for login screen (#5628)
add eb04a46 ui: Add clear all notification button (#5549)
add d7a9873 ui: fix add network offering for vpc (#5809)
add 10bda85 ui: auto-prefill edit tariff label (#5714)
add 4ba2ad5 test: fix component test test_configdrive.py (#5528)
new c84198d Merge remote-tracking branch 'origin/4.16'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
debian/control | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 10 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 2 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 4 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 4 +-
.../kvm/discoverer/LibvirtServerDiscoverer.java | 14 ++-
.../com/cloud/resource/ResourceManagerImpl.java | 33 +++---
.../java/com/cloud/storage/StorageManagerImpl.java | 1 +
.../cloud/resource/ResourceManagerImplTest.java | 26 +++--
test/integration/component/test_configdrive.py | 15 ++-
ui/public/config.json | 1 +
ui/public/locales/en.json | 4 +
ui/src/components/CheckBoxSelectPair.vue | 38 ++++---
ui/src/components/header/UserMenu.vue | 13 ++-
ui/src/components/page/GlobalLayout.vue | 20 +++-
ui/src/components/view/DetailSettings.vue | 3 +-
ui/src/components/view/InfoCard.vue | 18 +++-
ui/src/components/view/ListView.vue | 3 +-
ui/src/components/view/ResourceLimitTab.vue | 3 +-
ui/src/components/view/SettingsTab.vue | 3 +-
ui/src/components/view/UploadResourceIcon.vue | 12 ++-
ui/src/config/section/compute.js | 6 +-
ui/src/layouts/UserLayout.vue | 45 +++++++-
ui/src/permission.js | 11 +-
ui/src/store/getters.js | 3 +-
ui/src/store/modules/user.js | 6 +-
ui/src/style/dark-mode.less | 4 +
ui/src/style/vars.less | 7 ++
ui/src/utils/plugins.js | 62 ++++++++++-
ui/src/utils/request.js | 57 ++++++++++-
ui/src/views/AutogenView.vue | 3 +-
ui/src/views/compute/AssignInstance.vue | 3 +-
ui/src/views/compute/ChangeAffinity.vue | 3 +-
ui/src/views/compute/CreateSSHKeyPair.vue | 3 +-
ui/src/views/compute/CreateSnapshotWizard.vue | 3 +-
ui/src/views/compute/DeployVM.vue | 28 +++--
ui/src/views/compute/KubernetesServiceTab.vue | 3 +-
ui/src/views/compute/MigrateWizard.vue | 3 +-
ui/src/views/compute/ScaleVM.vue | 3 +-
ui/src/views/compute/StartVirtualMachine.vue | 9 +-
ui/src/views/compute/backup/BackupSchedule.vue | 3 +-
ui/src/views/compute/backup/FormSchedule.vue | 3 +-
.../compute/wizard/ComputeOfferingSelection.vue | 4 +-
ui/src/views/iam/AddAccount.vue | 15 ++-
ui/src/views/iam/AddLdapAccount.vue | 6 +-
ui/src/views/iam/AddUser.vue | 18 ++--
ui/src/views/iam/ChangeUserPassword.vue | 3 +-
ui/src/views/iam/ConfigureSamlSsoAuth.vue | 6 +-
ui/src/views/iam/CreateRole.vue | 3 +-
ui/src/views/iam/DomainActionForm.vue | 6 +-
ui/src/views/iam/DomainView.vue | 3 +-
ui/src/views/iam/EditUser.vue | 6 +-
ui/src/views/iam/ImportRole.vue | 6 +-
ui/src/views/image/IsoZones.vue | 3 +-
ui/src/views/image/RegisterOrUploadIso.vue | 15 ++-
ui/src/views/image/RegisterOrUploadTemplate.vue | 12 ++-
ui/src/views/image/TemplateZones.vue | 3 +-
.../views/image/UpdateTemplateIsoPermissions.vue | 3 +-
ui/src/views/infra/AddPrimaryStorage.vue | 3 +-
ui/src/views/infra/AddSecondaryStorage.vue | 3 +-
ui/src/views/infra/ClusterAdd.vue | 9 +-
ui/src/views/infra/HostAdd.vue | 39 ++++++-
ui/src/views/infra/InfraSummary.vue | 6 +-
ui/src/views/infra/MigrateData.vue | 6 +-
ui/src/views/infra/PodAdd.vue | 6 +-
ui/src/views/infra/network/DedicatedVLANTab.vue | 3 +-
ui/src/views/infra/network/EditTrafficLabel.vue | 3 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 15 ++-
ui/src/views/infra/network/ServiceProvidersTab.vue | 6 +-
.../infra/network/providers/AddF5LoadBalancer.vue | 3 +-
.../network/providers/AddNetscalerLoadBalancer.vue | 3 +-
.../infra/network/providers/AddNiciraNvpDevice.vue | 3 +-
.../network/providers/AddPaloAltoFirewall.vue | 3 +-
.../infra/network/providers/AddSrxFirewall.vue | 3 +-
.../views/infra/network/providers/ProviderItem.vue | 3 +-
.../infra/network/providers/ProviderListView.vue | 6 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 3 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 1 +
ui/src/views/network/AclListRulesTab.vue | 3 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 3 +-
ui/src/views/network/CreateL2NetworkForm.vue | 3 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 6 +-
ui/src/views/network/CreateVlanIpRange.vue | 6 +-
ui/src/views/network/InternalLBAssignVmForm.vue | 3 +-
ui/src/views/network/IpAddressesTab.vue | 6 +-
ui/src/views/network/LoadBalancing.vue | 7 +-
ui/src/views/network/PortForwarding.vue | 3 +-
ui/src/views/network/VpcTiersTab.vue | 3 +-
ui/src/views/network/VpnDetails.vue | 3 +-
ui/src/views/offering/AddNetworkOffering.vue | 114 ++++++++++++++-------
ui/src/views/offering/AddVpcOffering.vue | 2 -
ui/src/views/offering/UpdateOfferingAccess.vue | 3 +-
.../views/plugins/quota/EditTariffValueWizard.vue | 3 +-
ui/src/views/project/iam/ProjectRoleTab.vue | 9 +-
ui/src/views/storage/FormSchedule.vue | 3 +-
ui/src/views/storage/ResizeVolume.vue | 3 +-
ui/src/views/storage/ScheduledSnapshots.vue | 3 +-
ui/src/views/storage/UploadLocalVolume.vue | 9 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 21 ++--
ui/tests/unit/views/AutogenView.spec.js | 36 +++----
ui/tests/unit/views/compute/MigrateWizard.spec.js | 9 +-
.../java/com/cloud/utils/ssh/SSHCmdHelper.java | 26 +++++
102 files changed, 737 insertions(+), 286 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.16'
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit c84198d76da6bdbdbc102cb0d6f24bb6860634b0
Merge: 49b2dfc 4ba2ad5
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Thu Dec 30 16:52:30 2021 +0530
Merge remote-tracking branch 'origin/4.16'
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
debian/control | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 10 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 2 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 4 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 4 +-
.../kvm/discoverer/LibvirtServerDiscoverer.java | 14 ++-
.../com/cloud/resource/ResourceManagerImpl.java | 33 +++---
.../java/com/cloud/storage/StorageManagerImpl.java | 1 +
.../cloud/resource/ResourceManagerImplTest.java | 26 +++--
test/integration/component/test_configdrive.py | 15 ++-
ui/public/config.json | 1 +
ui/public/locales/en.json | 4 +
ui/src/components/CheckBoxSelectPair.vue | 38 ++++---
ui/src/components/header/UserMenu.vue | 13 ++-
ui/src/components/page/GlobalLayout.vue | 20 +++-
ui/src/components/view/DetailSettings.vue | 3 +-
ui/src/components/view/InfoCard.vue | 18 +++-
ui/src/components/view/ListView.vue | 3 +-
ui/src/components/view/ResourceLimitTab.vue | 3 +-
ui/src/components/view/SettingsTab.vue | 3 +-
ui/src/components/view/UploadResourceIcon.vue | 12 ++-
ui/src/config/section/compute.js | 6 +-
ui/src/layouts/UserLayout.vue | 45 +++++++-
ui/src/permission.js | 11 +-
ui/src/store/getters.js | 3 +-
ui/src/store/modules/user.js | 6 +-
ui/src/style/dark-mode.less | 4 +
ui/src/style/vars.less | 7 ++
ui/src/utils/plugins.js | 62 ++++++++++-
ui/src/utils/request.js | 57 ++++++++++-
ui/src/views/AutogenView.vue | 3 +-
ui/src/views/compute/AssignInstance.vue | 3 +-
ui/src/views/compute/ChangeAffinity.vue | 3 +-
ui/src/views/compute/CreateSSHKeyPair.vue | 3 +-
ui/src/views/compute/CreateSnapshotWizard.vue | 3 +-
ui/src/views/compute/DeployVM.vue | 28 +++--
ui/src/views/compute/KubernetesServiceTab.vue | 3 +-
ui/src/views/compute/MigrateWizard.vue | 3 +-
ui/src/views/compute/ScaleVM.vue | 3 +-
ui/src/views/compute/StartVirtualMachine.vue | 9 +-
ui/src/views/compute/backup/BackupSchedule.vue | 3 +-
ui/src/views/compute/backup/FormSchedule.vue | 3 +-
.../compute/wizard/ComputeOfferingSelection.vue | 4 +-
ui/src/views/iam/AddAccount.vue | 15 ++-
ui/src/views/iam/AddLdapAccount.vue | 6 +-
ui/src/views/iam/AddUser.vue | 18 ++--
ui/src/views/iam/ChangeUserPassword.vue | 3 +-
ui/src/views/iam/ConfigureSamlSsoAuth.vue | 6 +-
ui/src/views/iam/CreateRole.vue | 3 +-
ui/src/views/iam/DomainActionForm.vue | 6 +-
ui/src/views/iam/DomainView.vue | 3 +-
ui/src/views/iam/EditUser.vue | 6 +-
ui/src/views/iam/ImportRole.vue | 6 +-
ui/src/views/image/IsoZones.vue | 3 +-
ui/src/views/image/RegisterOrUploadIso.vue | 15 ++-
ui/src/views/image/RegisterOrUploadTemplate.vue | 12 ++-
ui/src/views/image/TemplateZones.vue | 3 +-
.../views/image/UpdateTemplateIsoPermissions.vue | 3 +-
ui/src/views/infra/AddPrimaryStorage.vue | 3 +-
ui/src/views/infra/AddSecondaryStorage.vue | 3 +-
ui/src/views/infra/ClusterAdd.vue | 9 +-
ui/src/views/infra/HostAdd.vue | 39 ++++++-
ui/src/views/infra/InfraSummary.vue | 6 +-
ui/src/views/infra/MigrateData.vue | 6 +-
ui/src/views/infra/PodAdd.vue | 6 +-
ui/src/views/infra/network/DedicatedVLANTab.vue | 3 +-
ui/src/views/infra/network/EditTrafficLabel.vue | 3 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 15 ++-
ui/src/views/infra/network/ServiceProvidersTab.vue | 6 +-
.../infra/network/providers/AddF5LoadBalancer.vue | 3 +-
.../network/providers/AddNetscalerLoadBalancer.vue | 3 +-
.../infra/network/providers/AddNiciraNvpDevice.vue | 3 +-
.../network/providers/AddPaloAltoFirewall.vue | 3 +-
.../infra/network/providers/AddSrxFirewall.vue | 3 +-
.../views/infra/network/providers/ProviderItem.vue | 3 +-
.../infra/network/providers/ProviderListView.vue | 6 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 3 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 1 +
ui/src/views/network/AclListRulesTab.vue | 3 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 3 +-
ui/src/views/network/CreateL2NetworkForm.vue | 3 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 6 +-
ui/src/views/network/CreateVlanIpRange.vue | 6 +-
ui/src/views/network/InternalLBAssignVmForm.vue | 3 +-
ui/src/views/network/IpAddressesTab.vue | 6 +-
ui/src/views/network/LoadBalancing.vue | 7 +-
ui/src/views/network/PortForwarding.vue | 3 +-
ui/src/views/network/VpcTiersTab.vue | 3 +-
ui/src/views/network/VpnDetails.vue | 3 +-
ui/src/views/offering/AddNetworkOffering.vue | 114 ++++++++++++++-------
ui/src/views/offering/AddVpcOffering.vue | 2 -
ui/src/views/offering/UpdateOfferingAccess.vue | 3 +-
.../views/plugins/quota/EditTariffValueWizard.vue | 3 +-
ui/src/views/project/iam/ProjectRoleTab.vue | 9 +-
ui/src/views/storage/FormSchedule.vue | 3 +-
ui/src/views/storage/ResizeVolume.vue | 3 +-
ui/src/views/storage/ScheduledSnapshots.vue | 3 +-
ui/src/views/storage/UploadLocalVolume.vue | 9 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 21 ++--
ui/tests/unit/views/AutogenView.spec.js | 36 +++----
ui/tests/unit/views/compute/MigrateWizard.spec.js | 9 +-
.../java/com/cloud/utils/ssh/SSHCmdHelper.java | 26 +++++
102 files changed, 737 insertions(+), 286 deletions(-)
diff --cc plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index a61947d,60d8e08..f1c0ce8
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@@ -3760,11 -3753,13 +3752,13 @@@ public class LibvirtComputingResource e
} else if (platformEmulator.startsWith("Other PV Virtio-SCSI")) {
return DiskDef.DiskBus.SCSI;
} else if (platformEmulator.contains("Ubuntu") ||
- org.apache.commons.lang3.StringUtils.startsWithAny(platformEmulator,
+ StringUtils.startsWithAny(platformEmulator,
"Fedora", "CentOS", "Red Hat Enterprise Linux", "Debian GNU/Linux", "FreeBSD", "Oracle", "Other PV")) {
return DiskDef.DiskBus.VIRTIO;
- } else if (isUefiEnabled && org.apache.commons.lang3.StringUtils.startsWithAny(platformEmulator, "Windows", "Other")) {
+ } else if (isUefiEnabled && StringUtils.startsWithAny(platformEmulator, "Windows", "Other")) {
return DiskDef.DiskBus.SATA;
+ } else if (_guestCpuArch != null && _guestCpuArch.equals("aarch64")) {
+ return DiskDef.DiskBus.SCSI;
} else {
return DiskDef.DiskBus.IDE;
}
diff --cc ui/public/locales/en.json
index 4111e0a,135630e..2901126
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@@ -468,9 -468,10 +468,11 @@@
"label.associatednetworkid": "Associated Network ID",
"label.associatednetworkname": "Network Name",
"label.asyncbackup": "Async Backup",
+ "label.authentication.method": "Authentication Method",
+ "label.authentication.sshkey": "System SSH Key",
"label.author.email": "Author e-mail",
"label.author.name": "Author name",
+"label.auto.assign": "Automatically assign",
"label.auto.assign.diskoffering.disk.size": "Automatically assign offering matching the disk size",
"label.auto.assign.random.ip": "Automatically assign a random IP address",
"label.autoscale": "AutoScale",
diff --cc ui/src/views/compute/MigrateWizard.vue
index 45eff22,39493b8..9899dc5
--- a/ui/src/views/compute/MigrateWizard.vue
+++ b/ui/src/views/compute/MigrateWizard.vue
@@@ -301,12 -215,13 +301,13 @@@ export default
loadingMessage: `${this.$t('message.migrating.processing')} ${this.resource.name}`,
catchMessage: this.$t('error.fetching.async.job.result'),
catchMethod: () => {
- this.$emit('close-action')
+ this.closeModal()
}
})
- this.$emit('close-action')
+ this.closeModal()
}).catch(error => {
- this.$notification.error({
+ this.$showNotification({
+ type: 'error',
message: this.$t('message.request.failed'),
description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message,
duration: 0
diff --cc utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java
index e89120c,291f8c1..7bc5c33
--- a/utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java
+++ b/utils/src/main/java/com/cloud/utils/ssh/SSHCmdHelper.java
@@@ -23,9 -23,10 +23,10 @@@ import java.io.IOException
import java.io.InputStream;
import org.apache.cloudstack.utils.security.KeyStoreUtils;
+ import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
-import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
import com.trilead.ssh2.ChannelCondition;
import com.trilead.ssh2.Session;