This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit cb167072a176054edfef2fdee403d0f71c3c7052
Merge: ee5f92e 32e3bbd
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Fri May 7 16:37:42 2021 +0530
Merge remote-tracking branch 'origin/4.15'
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
api/src/main/java/com/cloud/event/EventTypes.java | 1 +
.../java/com/cloud/storage/StorageService.java | 3 +
.../command/admin/storage/SyncStoragePoolCmd.java | 97 ++++++++
.../cloud/storage/resource/StorageProcessor.java | 5 +-
.../StorageSubsystemCommandHandlerBase.java | 5 +-
.../storage/command/SyncVolumePathAnswer.java | 71 +++---
.../storage/command/SyncVolumePathCommand.java | 71 +++---
.../java/com/cloud/storage/StorageManager.java | 3 +
.../cloud/storage/dao/StoragePoolHostDaoImpl.java | 1 -
.../storage/datastore/db/PrimaryDataStoreDao.java | 2 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 8 +
.../datastore/provider/DefaultHostListener.java | 46 +---
.../kvm/storage/KVMStorageProcessor.java | 9 +-
.../ovm3/resources/Ovm3StorageProcessor.java | 11 +-
.../cloud/resource/SimulatorStorageProcessor.java | 8 +-
.../hypervisor/vmware/resource/VmwareResource.java | 6 +-
.../storage/resource/VmwareStorageProcessor.java | 81 ++++++-
.../resource/XenServerStorageProcessor.java | 9 +-
.../resource/Xenserver625StorageProcessor.java | 9 +-
.../com/cloud/server/ManagementServerImpl.java | 2 +
.../java/com/cloud/storage/StorageManagerImpl.java | 267 ++++++++++++++++++++-
.../cloud/storage/StoragePoolAutomationImpl.java | 11 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +-
tools/apidoc/gen_toc.py | 1 +
ui/src/components/view/DetailSettings.vue | 30 +--
ui/src/components/view/InfoCard.vue | 66 +++--
ui/src/components/view/ListView.vue | 37 +--
ui/src/components/view/SearchView.vue | 4 +-
ui/src/components/view/SettingsTab.vue | 29 ++-
ui/src/components/view/TooltipButton.vue | 100 ++++++++
ui/src/views/compute/InstanceTab.vue | 105 ++++----
ui/src/views/compute/backup/BackupSchedule.vue | 24 +-
ui/src/views/iam/RolePermissionTab.vue | 25 +-
ui/src/views/iam/RuleDelete.vue | 24 +-
ui/src/views/iam/SSLCertificateTab.vue | 37 +--
ui/src/views/image/IsoZones.vue | 14 +-
ui/src/views/image/TemplateZones.vue | 34 +--
ui/src/views/infra/network/DedicatedVLANTab.vue | 6 +-
.../views/infra/network/IpRangesTabManagement.vue | 20 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 52 ++--
ui/src/views/infra/network/IpRangesTabStorage.vue | 19 +-
.../infra/network/providers/ProviderListView.vue | 12 +-
ui/src/views/infra/zone/IpAddressRangeForm.vue | 7 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 19 +-
ui/src/views/network/AclListRulesTab.vue | 10 +-
ui/src/views/network/EgressRulesTab.vue | 6 +-
ui/src/views/network/FirewallRules.vue | 12 +-
ui/src/views/network/GuestIpRanges.vue | 30 ++-
.../views/network/IngressEgressRuleConfigure.vue | 13 +-
ui/src/views/network/InternalLBAssignedVmTab.vue | 8 +-
ui/src/views/network/IpAddressesTab.vue | 8 +-
ui/src/views/network/LoadBalancing.vue | 14 +-
ui/src/views/network/PortForwarding.vue | 12 +-
ui/src/views/network/StaticRoutesTab.vue | 8 +-
ui/src/views/project/AccountsTab.vue | 65 +++--
ui/src/views/project/InvitationsTemplate.vue | 40 ++-
.../views/project/iam/ProjectRolePermissionTab.vue | 23 +-
ui/src/views/project/iam/ProjectRoleTab.vue | 78 +++---
ui/src/views/storage/FormSchedule.vue | 12 +-
ui/src/views/storage/ScheduledSnapshots.vue | 24 +-
ui/src/views/storage/TakeSnapshot.vue | 12 +-
61 files changed, 1146 insertions(+), 622 deletions(-)
diff --cc server/src/main/java/com/cloud/storage/StorageManagerImpl.java
index 62119ff,2e22003..5e7be30
--- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
@@@ -111,14 -117,11 +117,16 @@@ import com.cloud.agent.AgentManager
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.DeleteStoragePoolCommand;
+import com.cloud.agent.api.GetStorageStatsAnswer;
+import com.cloud.agent.api.GetStorageStatsCommand;
+import com.cloud.agent.api.GetVolumeStatsAnswer;
+import com.cloud.agent.api.GetVolumeStatsCommand;
import com.cloud.agent.api.StoragePoolInfo;
+import com.cloud.agent.api.VolumeStatsEntry;
import com.cloud.agent.api.to.DataTO;
import com.cloud.agent.api.to.DiskTO;
+ import com.cloud.agent.api.ModifyStoragePoolCommand;
+ import com.cloud.agent.api.ModifyStoragePoolAnswer;
import com.cloud.agent.manager.Commands;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.query.dao.TemplateJoinDao;
