This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch 4.19-dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 1770204568b do not merge
add f25d35c5d6b VM Import: Use datastore name when datastore path is not
set to search for pools on DB (#8759)
add d487a1c3417 Fix disk offering override in VM deployment wizard (#8070)
add f8fd22c2d62 Usage: Fixup entity exists exception (#8726)
add 0780f0e5c61 Merge remote-tracking branch 'apache/4.18' into 4.19
add e0731c50985 Fix the removal of network offering tags (#8758)
add 9acba904237 Fix 404 when moving a VM to out of a project (#8650)
add ffd59720dd8 storage,plugins: delegate allow zone-wide volume migration
check and access grant check to storage drivers (#8762)
add 0043540fa30 Use join instead of views (#8321)
add 9d748f0837f server: update default value of setting
'expose.dns.externally' to 'false' (#8776)
add fe5d7412364 Merge branch '4.18' into '4.19'
add 720407ba737 snapshot: don't schedule next snapshot job for a removed
volume (#8735)
add 8c62365dbb1 VPC VR: fix empty iptables if there is no vpc tier (#8787)
add 308ed1399ee Merge remote-tracking branch 'origin/4.18' into 4.19
add 24d5c45f7f4 Add indexes for vm_stats (#8737)
add 2e88eb45a3b Update mysql-connector version (#8753)
add 88017ad45e3 Fix Virtual router count in Capacity dashboard (#8807)
add f4058705d7b UI: add dialog to select a VPC tier when create LB for
autoscaling in VPC (#8793)
add 08d9d06d453 api,server,ui: add project ID and name to UserDataResponse
(#8656)
add 31301f56f64 Fix missing actions on Guest IP ranges for networks (#8777)
add 6c6023b790c UI: Fix irrelevant conversion options in import instance
modal (#8838)
add f7603dcbcc8 AllLinesParser: Enable draining of stdout (#8670)
add 38f028613fc Fix getRepair method in checkVolume command (#8840)
add fc3c625beba server: fix security issues caused by extraconfig on KVM
add 67e2061f4b8 api: client verification in servlet
add 939d0b9011a engine-storage: control download redirection
add 72b2eb0087f server: fix security issues caused by extraconfig on KVM
add 00f687db1be api: client verification in servlet
add b642500f153 Merge remote-tracking branch 'origin/4.18' into 4.19
add ff3e9bd821f engine-storage: control download redirection
add 16aba6b5881 Merge remote-tracking branch 'origin/4.18' into 4.19
add 7a9985b42bf upgrade: add unit tests from/to a security release (#8870)
add f2da882d68f Merge remote-tracking branch 'origin/4.18' into 4.19
add b8f8321f0f9 Allow listing of inactive offerings (#8821)
add c25264bada3 UI Fixes: allow filtering on alertype in UI & add events
tab (#8630)
add a5508acc54d server: fix haproxy misconfiguration after VPC VR start
(#8881)
add c7626ebfd63 Merge remote-tracking branch 'apache/4.18' into 4.19
add c24c1a5c000 Fix VM import & VM delete with custom offering (#8813)
add 730cc5d5b8f Change iops on offering change (#8872)
add d3e020a5452 Mark libvirt events experimental, add properties flag
(#8825)
add b998e7dbb63 Allow overriding root disk offering & size, and expunge
old root disk while restoring a VM (#8800)
add 44aa08c02a3 Fixup 4.19 build issue (#8905)
add 0a26f3315a1 Fix listStoragePoolsMetricsCmd (#8885)
add 6cd5c6a1d01 linstor: Do not pretend handling disconnect paths that are
non Linstor (#8897)
add a55ba96a08e Merge remote-tracking branch 'origin/4.18' into 4.19
add 075b4130412 Fix VR inheriting boot settings from user's VM (#8894)
add 7721133ea9a Fix display of properties related to backup size (#8845)
add 44b8d3af0ca ui: bump UI dependencies versions (#8923)
add 85110147071 Fix error message for checkVolume command (#8842)
add dfebc09f947 Merge branch '4.19' into 4.19-dummy
No new revisions were added by this update.
Summary of changes:
agent/conf/agent.properties | 4 +
.../cloud/agent/properties/AgentProperties.java | 7 +
.../java/com/cloud/offering/ServiceOffering.java | 2 +-
.../java/com/cloud/storage/VolumeApiService.java | 2 +
api/src/main/java/com/cloud/vm/UserVmService.java | 2 +-
.../java/com/cloud/vm/VirtualMachineProfile.java | 2 +
.../org/apache/cloudstack/acl/RoleService.java | 4 +-
.../org/apache/cloudstack/alert/AlertService.java | 4 +
.../apache/cloudstack/api/InternalIdentity.java | 14 +
.../admin/acl/project/CreateProjectRoleCmd.java | 10 +
.../project/CreateProjectRolePermissionCmd.java | 11 +
.../admin/acl/project/DeleteProjectRoleCmd.java | 11 +
.../project/DeleteProjectRolePermissionCmd.java | 11 +
.../admin/acl/project/UpdateProjectRoleCmd.java | 11 +
.../project/UpdateProjectRolePermissionCmd.java | 11 +
.../admin/offering/UpdateDiskOfferingCmd.java | 12 +
.../admin/offering/UpdateServiceOfferingCmd.java | 15 +
.../ChangeOutOfBandManagementPasswordCmd.java | 11 +
.../ConfigureOutOfBandManagementCmd.java | 11 +
.../DisableOutOfBandManagementForClusterCmd.java | 11 +
.../DisableOutOfBandManagementForHostCmd.java | 11 +
.../DisableOutOfBandManagementForZoneCmd.java | 11 +
.../EnableOutOfBandManagementForClusterCmd.java | 11 +
.../EnableOutOfBandManagementForHostCmd.java | 11 +
.../EnableOutOfBandManagementForZoneCmd.java | 11 +
.../IssueOutOfBandManagementPowerActionCmd.java | 5 +
.../resource/ListAlertTypesCmd.java} | 39 +-
.../user/offering/ListDiskOfferingsCmd.java | 21 +
.../user/offering/ListServiceOfferingsCmd.java | 22 +-
.../api/command/user/vm/RestoreVMCmd.java | 42 +
.../user/vmsnapshot/CreateVMSnapshotCmd.java | 6 +
.../user/volume/CheckAndRepairVolumeCmd.java | 5 +-
...ategoryResponse.java => AlertTypeResponse.java} | 36 +-
.../api/response/DiskOfferingResponse.java | 12 +
.../api/response/ServiceOfferingResponse.java | 12 +
.../cloudstack/api/response/UserDataResponse.java | 20 +-
.../user/volume/CheckAndRepairVolumeCmdTest.java | 45 +-
client/pom.xml | 14 +-
.../java/org/apache/cloudstack/ServerDaemon.java | 3 +-
.../storage/template/HttpTemplateDownloader.java | 18 +-
.../template/MetalinkTemplateDownloader.java | 10 +-
.../storage/template/S3TemplateDownloader.java | 19 +-
.../template/SimpleHttpMultiFileDownloader.java | 22 +-
.../cloud/storage/template/TemplateDownloader.java | 2 +
.../storage/template/TemplateDownloaderBase.java | 6 +
.../agent/directdownload/CheckUrlCommand.java | 11 +-
.../directdownload/DirectDownloadCommand.java | 15 +-
.../directdownload/HttpDirectDownloadCommand.java | 6 +-
.../directdownload/HttpsDirectDownloadCommand.java | 7 +-
.../MetalinkDirectDownloadCommand.java | 5 +-
.../directdownload/NfsDirectDownloadCommand.java | 5 +-
.../direct/download/DirectDownloadHelper.java | 45 +-
.../download/DirectTemplateDownloaderImpl.java | 13 +-
.../download/HttpDirectTemplateDownloader.java | 21 +-
.../download/HttpsDirectTemplateDownloader.java | 26 +-
.../download/MetalinkDirectTemplateDownloader.java | 20 +-
.../download/NfsDirectTemplateDownloader.java | 5 +-
.../storage/command/DownloadCommand.java | 13 +
.../storage/to/DownloadableObjectTO.java} | 15 +-
.../cloudstack/storage/to/SnapshotObjectTO.java | 2 +-
.../cloudstack/storage/to/TemplateObjectTO.java | 3 +-
.../cloudstack/storage/to/VolumeObjectTO.java | 3 +-
.../download/BaseDirectTemplateDownloaderTest.java | 2 +-
.../MetalinkDirectTemplateDownloaderTest.java | 3 +-
developer/pom.xml | 12 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 2 +-
.../service/VolumeOrchestrationService.java | 2 +
...orageService.java => DownloadableDataInfo.java} | 6 +-
.../api/storage/PrimaryDataStoreDriver.java | 15 +
.../engine/subsystem/api/storage/TemplateInfo.java | 2 +-
.../engine/subsystem/api/storage/VolumeInfo.java | 2 +-
.../cloud/configuration/ConfigurationManager.java | 2 +
.../java/com/cloud/storage/StorageManager.java | 4 +
.../com/cloud/vm/VirtualMachineProfileImpl.java | 4 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 18 +-
.../src/main/java/com/cloud/vm/VmWorkRestore.java | 27 +-
.../engine/orchestration/CloudOrchestrator.java | 7 +-
.../engine/orchestration/VolumeOrchestrator.java | 94 +-
.../orchestration/VolumeOrchestratorTest.java | 55 +
engine/schema/pom.xml | 4 +-
.../java/com/cloud/service/ServiceOfferingVO.java | 4 +-
.../java/com/cloud/storage/VolumeDetailVO.java | 3 +
.../java/com/cloud/upgrade/DatabaseCreator.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41900to41910.java | 32 +-
.../org/apache/cloudstack/acl/dao/RoleDao.java | 2 +
.../org/apache/cloudstack/acl/dao/RoleDaoImpl.java | 17 +
.../resourcedetail/DiskOfferingDetailVO.java | 4 +
.../storage/datastore/db/ImageStoreDao.java | 2 +
.../storage/datastore/db/ImageStoreDaoImpl.java | 16 +
.../storage/datastore/db/PrimaryDataStoreDao.java | 8 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 98 ++
.../META-INF/db/views/cloud.disk_offering_view.sql | 2 -
.../db/views/cloud.service_offering_view.sql | 5 +-
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 83 ++
.../storage/image/TemplateServiceImpl.java | 5 +-
.../storage/image/store/TemplateObject.java | 8 +
.../cloudstack/storage/volume/VolumeObject.java | 8 +
.../cloudstack/framework/config/ConfigDepot.java | 1 +
.../cloudstack/framework/config/ConfigKey.java | 1 +
.../framework/config/impl/ConfigDepotImpl.java | 7 +
.../framework/config/impl/ConfigDepotImplTest.java | 17 +
.../main/java/com/cloud/utils/db/Attribute.java | 9 +
.../main/java/com/cloud/utils/db/GenericDao.java | 2 +
.../java/com/cloud/utils/db/GenericDaoBase.java | 156 ++-
.../com/cloud/utils/db/GenericSearchBuilder.java | 22 +
.../main/java/com/cloud/utils/db/JoinBuilder.java | 62 +-
.../main/java/com/cloud/utils/db/SearchBase.java | 93 +-
.../java/com/cloud/utils/db/SearchCriteria.java | 12 +-
.../java/com/cloud/utils/db/TransactionLegacy.java | 6 +-
.../com/cloud/utils/db/GenericDaoBaseTest.java | 35 +-
plugins/database/mysql-ha/pom.xml | 4 +-
plugins/database/quota/pom.xml | 4 +-
.../kvm/resource/LibvirtComputingResource.java | 69 +-
.../hypervisor/kvm/resource/LibvirtConnection.java | 7 +-
.../kvm/resource/LibvirtDomainListener.java | 65 ++
.../resource/wrapper/LibvirtCheckUrlCommand.java | 4 +-
.../wrapper/LibvirtScaleVmCommandWrapper.java | 8 -
.../kvm/storage/KVMStorageProcessor.java | 2 +-
.../apache/cloudstack/utils/linux/KVMHostInfo.java | 1 -
.../cloudstack/utils/linux/KVMHostInfoTest.java | 3 -
.../cloudstack/metrics/MetricsServiceImpl.java | 9 +-
plugins/network-elements/juniper-contrail/pom.xml | 4 +-
plugins/storage/volume/cloudbyte/pom.xml | 4 +-
.../driver/DateraPrimaryDataStoreDriver.java | 5 +
.../kvm/storage/LinstorStorageAdaptor.java | 53 +-
.../driver/NexentaPrimaryDataStoreDriver.java | 5 +
.../driver/ScaleIOPrimaryDataStoreDriver.java | 122 +-
.../driver/SolidFirePrimaryDataStoreDriver.java | 5 +
pom.xml | 6 +-
server/pom.xml | 4 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 26 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 7 +-
server/src/main/java/com/cloud/api/ApiServer.java | 40 +-
server/src/main/java/com/cloud/api/ApiServlet.java | 41 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 1187 +++++++++++++-------
.../com/cloud/api/query/ViewResponseHelper.java | 6 +-
.../com/cloud/api/query/dao/AccountJoinDao.java | 2 +
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 53 +
.../cloud/api/query/dao/DiskOfferingJoinDao.java | 2 +
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 55 +
.../com/cloud/api/query/dao/DomainJoinDao.java | 2 +
.../com/cloud/api/query/dao/DomainJoinDaoImpl.java | 53 +
.../api/query/dao/ServiceOfferingJoinDao.java | 1 +
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 56 +-
.../cloud/api/query/dao/StoragePoolJoinDao.java | 5 -
.../api/query/dao/StoragePoolJoinDaoImpl.java | 74 --
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 11 +-
.../cloud/api/query/vo/ServiceOfferingJoinVO.java | 11 +
.../configuration/ConfigurationManagerImpl.java | 41 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 15 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 4 +-
.../network/element/VirtualRouterElement.java | 20 +-
.../router/VirtualNetworkApplianceManager.java | 2 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 49 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 26 +
.../com/cloud/server/ManagementServerImpl.java | 49 +-
.../com/cloud/storage/ResizeVolumePayload.java | 8 +
.../java/com/cloud/storage/StorageManagerImpl.java | 29 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 41 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 7 +
.../cloud/template/HypervisorTemplateAdapter.java | 19 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 3 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 165 ++-
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 27 +-
.../direct/download/DirectDownloadManagerImpl.java | 17 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 33 +-
.../test/java/com/cloud/api/ApiServletTest.java | 29 +-
.../com/cloud/api/query/QueryManagerImplTest.java | 38 +-
.../configuration/ConfigurationManagerTest.java | 16 +-
.../com/cloud/network/NetworkServiceImplTest.java | 4 +-
.../com/cloud/server/ManagementServerImplTest.java | 39 +
.../com/cloud/storage/StorageManagerImplTest.java | 43 +
.../java/com/cloud/user/MockUsageEventDao.java | 5 +
.../java/com/cloud/vm/UserVmManagerImplTest.java | 26 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 5 +
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 1 +
.../storage/template/DownloadManager.java | 18 +-
.../storage/template/DownloadManagerImpl.java | 25 +-
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 26 +-
.../java/com/cloud/test/regression/TestCase.java | 2 +-
tools/devcloud-kvm/pom.xml | 8 +-
tools/devcloud4/pom.xml | 8 +-
tools/marvin/setup.py | 2 +-
ui/README.md | 4 +-
ui/package-lock.json | 1000 +++++++----------
ui/package.json | 12 +-
ui/public/locales/en.json | 20 +-
ui/src/components/view/DetailSettings.vue | 13 +-
ui/src/components/view/DetailsTab.vue | 9 +
ui/src/components/view/InfoCard.vue | 12 +-
ui/src/components/view/SearchView.vue | 44 +-
ui/src/config/section/compute.js | 50 +-
ui/src/config/section/infra.js | 1 +
ui/src/config/section/infra/hosts.js | 5 +
ui/src/config/section/infra/ilbvms.js | 11 +
ui/src/config/section/network.js | 11 +
ui/src/config/section/offering.js | 141 ++-
ui/src/config/section/role.js | 7 +
ui/src/config/section/user.js | 2 +-
ui/src/views/AutogenView.vue | 11 +-
ui/src/views/compute/AssignInstance.vue | 6 +-
ui/src/views/compute/DeployVM.vue | 32 +-
ui/src/views/compute/ReinstallVm.vue | 307 +++++
.../views/compute/wizard/DiskOfferingSelection.vue | 1 +
ui/src/views/dashboard/CapacityDashboard.vue | 2 +-
ui/src/views/network/GuestIpRanges.vue | 8 +-
ui/src/views/network/LoadBalancing.vue | 170 ++-
ui/src/views/network/PublicIpResource.vue | 12 +
ui/src/views/tools/ImportUnmanagedInstance.vue | 2 +-
ui/src/views/tools/ManageInstances.vue | 1 +
usage/pom.xml | 4 +-
.../java/com/cloud/usage/UsageManagerImpl.java | 119 +-
.../java/com/cloud/usage/UsageSanityCheckerIT.java | 3 +-
utils/pom.xml | 5 +-
.../src/main/java/com/cloud/utils/StringUtils.java | 2 +-
utils/src/main/java/com/cloud/utils/UriUtils.java | 3 +-
.../com/cloud/utils/script/OutputInterpreter.java | 5 +
.../java/com/cloud/utils/storage/QCOW2Utils.java | 20 +-
.../src/test/java/com/cloud/utils/ScriptTest.java | 14 +
219 files changed, 4787 insertions(+), 1926 deletions(-)
copy
api/src/main/java/org/apache/cloudstack/api/command/{user/event/ListEventTypesCmd.java
=> admin/resource/ListAlertTypesCmd.java} (57%)
copy
api/src/main/java/org/apache/cloudstack/api/response/{GuestOSCategoryResponse.java
=> AlertTypeResponse.java} (70%)
copy
plugins/network-elements/tungsten/src/test/java/org/apache/cloudstack/network/tungsten/api/command/SynchronizeTungstenFabricDataCmdTest.java
=>
api/src/test/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmdTest.java
(54%)
copy core/src/main/java/{com/cloud/agent/api/AgentControlCommand.java =>
org/apache/cloudstack/storage/to/DownloadableObjectTO.java} (72%)
copy
engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/{ObjectStorageService.java
=> DownloadableDataInfo.java} (86%)
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainListener.java
create mode 100644 ui/src/views/compute/ReinstallVm.vue
