This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch 4.18-dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 3beaaa7a2f8 don't merge
add 33bb92acce2 Veeam: Support Veeam 11 and 12 (#8241)
add b34f0931373 veeam: fix some issues with restoring volume from backup
and attaching it to VM (#8570)
add 1c98b5a4e56 Change Cryptsetup validation (#8482)
add 3f33592b676 systemvm: vncport evaluation (#8369)
add 1d5230b5168 server: use ed25519 instead of rsa when generate
public/private keys (#8549)
add ca55fc08e9f Added missing metrics English locale strings (#8560)
add b2e29931e89 UI: fix icmp code/type of ACL rule are not display if the
value is 0 (#8589)
add 69e8ebc03fc CKS: retry if unable to drain node or unable to upgrade
k8s node (#8402)
add 3fa052c1f57 Fix cloudstack-ui package: bad directory permissions and
missing WEB-INF (#8568)
add 56f0448f0d4 Linstor fix migration while node offline (#8610)
add 2729ee110eb Enable over provisioning for SharedMountPoint primary
storages (#8481)
add 393f3d7727a linstor: use relative hostname path (#8633)
add d8cd1228496 zone wizard: allow only one untagged physical network with
guest traffic type (#8625)
add 672206c3124 kvm: ITCO watchdog added (#8282)
add e47a910019d VR: fix issue between VPC VMs and other Public IPs in the
same subnet as additional Public IPs (#8599)
add 8d4b4dcec42 CKS: add kube config path in extra control nodes (#8658)
add af942e2260f vpc: optimize createMonitorServiceCommand() execution
(#8385)
add e09fd2e26b9 Fixup: Optimize getRouterHealthChecksConfig method (#8677)
add 18c3d470c6c CKS: fix /opt/bin/deploy-cloudstack-secret in CKS control
nodes (#8697)
add f731fe882c5 Storage plugin support to check if volume on datastore
requires access for migration (#8655)
add bbe56ae2838 Update actions/setup-java from v3 to v4 (#8709)
add 4e34e6b3348 console proxy client sleep more generic (#8694)
add 56e04505266 Logging improvements on migration in the VmwareResource
(#8300)
add 52d5b271617 UI: Add button to show public IPs associated with vlanid
(#8717)
add 9bd359a039a UI: Fix error message in zone wizard (#8721)
add 10f72a17f6e server: use ecdsa instead of ed25519 when generate
public/private keys (#8719)
add 0b080cfd820 [UI] Allow detach ISO from instance toolbar when ISO is
attached (#8716)
add 986d754768d SG: fix SQL exception when add security group rule with
allowed account/group (#8616)
add 223a9b8031c Quota tariff events (#8030)
add d487a1c3417 Fix disk offering override in VM deployment wizard (#8070)
add f8fd22c2d62 Usage: Fixup entity exists exception (#8726)
add 9d748f0837f server: update default value of setting
'expose.dns.externally' to 'false' (#8776)
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 72b2eb0087f server: fix security issues caused by extraconfig on KVM
add 00f687db1be api: client verification in servlet
add ff3e9bd821f engine-storage: control download redirection
add 7a9985b42bf upgrade: add unit tests from/to a security release (#8870)
add a5508acc54d server: fix haproxy misconfiguration after VPC VR start
(#8881)
add 6cd5c6a1d01 linstor: Do not pretend handling disconnect paths that are
non Linstor (#8897)
add 154566f914c Updating pom.xml version numbers for release 4.18.2.0
add 8a101fbbc11 Updating pom.xml version numbers for release
4.18.3.0-SNAPSHOT
add 5f8450f28f1 Add a shutdownhook to remove jobs owned by the process
(#8896)
add 8845a8e73e6 don't merge
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3beaaa7a2f8)
\
N -- N -- N refs/heads/4.18-dummy (8845a8e73e6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/workflows/build.yml | 2 +-
.github/workflows/ci.yml | 2 +-
.github/workflows/codecov.yml | 2 +-
.github/workflows/main-sonar-check.yml | 2 +-
.github/workflows/rat.yml | 2 +-
.github/workflows/sonar-check.yml | 2 +-
agent/pom.xml | 2 +-
api/pom.xml | 2 +-
api/src/main/java/com/cloud/event/EventTypes.java | 11 +
api/src/main/java/com/cloud/storage/Storage.java | 16 +-
.../cloudstack/api/ApiCommandResourceType.java | 3 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 4 +-
.../org/apache/cloudstack/quota/QuotaTariff.java | 12 +-
.../test/java/com/cloud/storage/StorageTest.java | 4 +-
client/pom.xml | 2 +-
.../java/org/apache/cloudstack/ServerDaemon.java | 3 +-
core/pom.xml | 2 +-
.../storage/template/HttpTemplateDownloader.java | 18 +-
.../template/MetalinkTemplateDownloader.java | 10 +-
.../storage/template/S3TemplateDownloader.java | 19 +-
.../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 +-
.../PrepareForBackupRestorationCommand.java} | 15 +-
.../direct/download/DirectDownloadHelper.java | 49 +--
.../download/DirectTemplateDownloaderImpl.java | 13 +-
.../download/HttpDirectTemplateDownloader.java | 22 +-
.../download/HttpsDirectTemplateDownloader.java | 28 +-
.../download/MetalinkDirectTemplateDownloader.java | 21 +-
.../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 | 2 +-
debian/changelog | 12 +
developer/pom.xml | 2 +-
engine/api/pom.xml | 2 +-
...tegyPriority.java => DownloadableDataInfo.java} | 7 +-
.../api/storage/PrimaryDataStoreDriver.java | 4 +
.../engine/subsystem/api/storage/TemplateInfo.java | 2 +-
.../engine/subsystem/api/storage/VolumeInfo.java | 2 +-
.../subsystem/api/storage/VolumeService.java | 2 +
engine/components-api/pom.xml | 2 +-
.../cloud/configuration/ConfigurationManager.java | 2 +
.../java/com/cloud/storage/StorageManager.java | 4 +
engine/orchestration/pom.xml | 2 +-
.../engine/orchestration/VolumeOrchestrator.java | 8 +-
engine/pom.xml | 2 +-
engine/schema/pom.xml | 2 +-
.../security/dao/SecurityGroupVMMapDaoImpl.java | 2 +-
.../schema/src/main/java/com/cloud/vm/NicVO.java | 12 +
.../src/main/java/com/cloud/vm/dao/NicDao.java | 2 +
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 8 +
.../org/apache/cloudstack/backup/BackupVO.java | 14 +
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 83 ++++++
engine/service/pom.xml | 2 +-
engine/storage/cache/pom.xml | 2 +-
engine/storage/configdrive/pom.xml | 2 +-
engine/storage/datamotion/pom.xml | 2 +-
engine/storage/image/pom.xml | 2 +-
.../storage/image/TemplateServiceImpl.java | 5 +-
.../storage/image/store/TemplateObject.java | 8 +
engine/storage/integration-test/pom.xml | 2 +-
engine/storage/pom.xml | 2 +-
engine/storage/snapshot/pom.xml | 2 +-
engine/storage/volume/pom.xml | 2 +-
.../cloudstack/storage/volume/VolumeObject.java | 8 +
.../storage/volume/VolumeServiceImpl.java | 13 +
framework/agent-lb/pom.xml | 2 +-
framework/ca/pom.xml | 2 +-
framework/cluster/pom.xml | 2 +-
framework/config/pom.xml | 2 +-
.../cloudstack/framework/config/ConfigDepot.java | 1 +
.../cloudstack/framework/config/ConfigKey.java | 1 +
.../framework/config/impl/ConfigDepotImpl.java | 7 +
.../framework/config/impl/ConfigDepotImplTest.java | 17 ++
framework/db/pom.xml | 2 +-
.../java/com/cloud/utils/db/GenericDaoBase.java | 4 +-
framework/direct-download/pom.xml | 4 +-
framework/events/pom.xml | 2 +-
framework/ipc/pom.xml | 2 +-
framework/jobs/pom.xml | 2 +-
framework/managed-context/pom.xml | 2 +-
framework/pom.xml | 2 +-
framework/quota/pom.xml | 2 +-
.../cloudstack/quota/dao/QuotaTariffDaoImpl.java | 10 +
.../apache/cloudstack/quota/vo/QuotaTariffVO.java | 5 +-
framework/rest/pom.xml | 2 +-
framework/security/pom.xml | 2 +-
framework/spring/lifecycle/pom.xml | 2 +-
framework/spring/module/pom.xml | 2 +-
packaging/centos7/cloud.spec | 3 +-
packaging/centos8/cloud.spec | 3 +-
plugins/acl/dynamic-role-based/pom.xml | 2 +-
plugins/acl/project-role-based/pom.xml | 2 +-
plugins/acl/static-role-based/pom.xml | 2 +-
.../explicit-dedication/pom.xml | 2 +-
.../host-affinity/pom.xml | 2 +-
.../host-anti-affinity/pom.xml | 2 +-
.../non-strict-host-affinity/pom.xml | 2 +-
.../non-strict-host-anti-affinity/pom.xml | 4 +-
plugins/alert-handlers/snmp-alerts/pom.xml | 2 +-
plugins/alert-handlers/syslog-alerts/pom.xml | 2 +-
plugins/api/discovery/pom.xml | 2 +-
plugins/api/rate-limit/pom.xml | 2 +-
plugins/api/solidfire-intg-test/pom.xml | 2 +-
plugins/api/vmware-sioc/pom.xml | 2 +-
plugins/backup/dummy/pom.xml | 2 +-
plugins/backup/networker/pom.xml | 2 +-
plugins/backup/veeam/pom.xml | 17 +-
.../cloudstack/backup/VeeamBackupProvider.java | 70 ++++-
.../cloudstack/backup/veeam/VeeamClient.java | 303 ++++++++++++++++---
.../backup/veeam/api/{Job.java => BackupFile.java} | 123 ++++----
.../api/{ObjectsInJob.java => BackupFiles.java} | 18 +-
.../api/{ObjectInJob.java => VmRestorePoint.java} | 109 +++++--
.../{ObjectsInJob.java => VmRestorePoints.java} | 18 +-
.../cloudstack/backup/veeam/VeeamClientTest.java | 329 ++++++++++++++++++++-
plugins/ca/root-ca/pom.xml | 2 +-
plugins/database/mysql-ha/pom.xml | 2 +-
plugins/database/quota/pom.xml | 2 +-
.../api/command/QuotaTariffCreateCmd.java | 7 +
.../api/command/QuotaTariffDeleteCmd.java | 7 +
.../api/command/QuotaTariffUpdateCmd.java | 7 +
.../api/response/QuotaResponseBuilderImpl.java | 18 +-
plugins/dedicated-resources/pom.xml | 2 +-
.../implicit-dedication/pom.xml | 2 +-
.../user-concentrated-pod/pom.xml | 2 +-
.../deployment-planners/user-dispersing/pom.xml | 2 +-
plugins/event-bus/inmemory/pom.xml | 2 +-
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/ha-planners/skip-heurestics/pom.xml | 2 +-
plugins/host-allocators/random/pom.xml | 2 +-
plugins/hypervisors/baremetal/pom.xml | 2 +-
plugins/hypervisors/hyperv/pom.xml | 2 +-
plugins/hypervisors/kvm/pom.xml | 2 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +-
.../resource/wrapper/LibvirtCheckUrlCommand.java | 5 +-
.../kvm/storage/KVMStorageProcessor.java | 2 +-
.../cloudstack/utils/cryptsetup/CryptSetup.java | 2 +-
plugins/hypervisors/ovm/pom.xml | 2 +-
plugins/hypervisors/ovm3/pom.xml | 2 +-
plugins/hypervisors/simulator/pom.xml | 2 +-
plugins/hypervisors/ucs/pom.xml | 2 +-
plugins/hypervisors/vmware/pom.xml | 2 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 40 ++-
.../hypervisor/vmware/resource/VmwareResource.java | 44 ++-
.../resource/VmwareStorageLayoutHelper.java | 21 +-
.../storage/resource/VmwareStorageProcessor.java | 23 +-
plugins/hypervisors/xenserver/pom.xml | 2 +-
plugins/integrations/cloudian/pom.xml | 2 +-
plugins/integrations/kubernetes-service/pom.xml | 2 +-
.../cluster/KubernetesClusterManagerImpl.java | 1 +
.../cluster/KubernetesClusterService.java | 6 +
.../KubernetesClusterUpgradeWorker.java | 61 ++--
.../main/resources/conf/k8s-control-node-add.yml | 4 +
.../main/resources/script/deploy-cloudstack-secret | 4 +-
plugins/integrations/prometheus/pom.xml | 2 +-
plugins/metrics/pom.xml | 2 +-
plugins/network-elements/bigswitch/pom.xml | 2 +-
plugins/network-elements/brocade-vcs/pom.xml | 2 +-
plugins/network-elements/cisco-vnmc/pom.xml | 2 +-
plugins/network-elements/dns-notifier/pom.xml | 2 +-
.../network-elements/elastic-loadbalancer/pom.xml | 2 +-
plugins/network-elements/globodns/pom.xml | 2 +-
.../network-elements/internal-loadbalancer/pom.xml | 2 +-
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
plugins/network-elements/netscaler/pom.xml | 2 +-
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
plugins/network-elements/opendaylight/pom.xml | 2 +-
plugins/network-elements/ovs/pom.xml | 2 +-
plugins/network-elements/palo-alto/pom.xml | 2 +-
plugins/network-elements/stratosphere-ssp/pom.xml | 2 +-
plugins/network-elements/tungsten/pom.xml | 2 +-
plugins/network-elements/vxlan/pom.xml | 2 +-
.../outofbandmanagement-drivers/ipmitool/pom.xml | 2 +-
.../nested-cloudstack/pom.xml | 2 +-
.../outofbandmanagement-drivers/redfish/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/storage-allocators/random/pom.xml | 2 +-
plugins/storage/image/default/pom.xml | 2 +-
plugins/storage/image/s3/pom.xml | 2 +-
plugins/storage/image/sample/pom.xml | 2 +-
plugins/storage/image/swift/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
plugins/storage/volume/datera/pom.xml | 2 +-
plugins/storage/volume/default/pom.xml | 2 +-
plugins/storage/volume/linstor/pom.xml | 2 +-
.../kvm/storage/LinstorStorageAdaptor.java | 75 +++--
.../storage/datastore/util/LinstorUtil.java | 11 +
plugins/storage/volume/nexenta/pom.xml | 2 +-
plugins/storage/volume/sample/pom.xml | 2 +-
plugins/storage/volume/scaleio/pom.xml | 2 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 5 +
plugins/storage/volume/solidfire/pom.xml | 2 +-
plugins/storage/volume/storpool/pom.xml | 2 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
plugins/user-authenticators/md5/pom.xml | 2 +-
plugins/user-authenticators/pbkdf2/pom.xml | 2 +-
plugins/user-authenticators/plain-text/pom.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
.../static-pin/pom.xml | 2 +-
.../user-two-factor-authenticators/totp/pom.xml | 2 +-
pom.xml | 2 +-
quickcloud/pom.xml | 2 +-
server/pom.xml | 2 +-
server/src/main/java/com/cloud/api/ApiServer.java | 40 ++-
server/src/main/java/com/cloud/api/ApiServlet.java | 41 ++-
.../configuration/ConfigurationManagerImpl.java | 10 +
.../com/cloud/hypervisor/HypervisorGuruBase.java | 15 +-
.../router/VirtualNetworkApplianceManager.java | 2 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 70 +++--
.../VpcVirtualNetworkApplianceManagerImpl.java | 52 +++-
.../com/cloud/server/ConfigurationServerImpl.java | 2 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 29 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 9 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 7 +
.../cloud/template/HypervisorTemplateAdapter.java | 23 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 3 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 43 ++-
.../cloudstack/backup/BackupManagerImpl.java | 29 +-
.../direct/download/DirectDownloadManagerImpl.java | 17 +-
.../test/java/com/cloud/api/ApiServletTest.java | 29 +-
.../com/cloud/storage/StorageManagerImplTest.java | 41 +++
.../cloud/vpc/MockConfigurationManagerImpl.java | 5 +
services/console-proxy/pom.xml | 2 +-
services/console-proxy/rdpconsole/pom.xml | 2 +-
services/console-proxy/server/pom.xml | 2 +-
.../consoleproxy/ConsoleProxyNoVncClient.java | 10 +-
services/pom.xml | 2 +-
services/secondary-storage/controller/pom.xml | 2 +-
services/secondary-storage/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
.../storage/template/DownloadManager.java | 18 +-
.../storage/template/DownloadManagerImpl.java | 25 +-
systemvm/agent/scripts/consoleproxy.sh | 33 ---
systemvm/agent/scripts/secstorage.sh | 33 ---
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 7 +-
systemvm/debian/opt/cloud/bin/cs/CsDatabag.py | 6 +
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 2 +-
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 26 +-
systemvm/pom.xml | 2 +-
.../smoke/test_backup_recovery_veeam.py | 308 +++++++++++++++++++
test/integration/smoke/test_kubernetes_clusters.py | 48 +--
test/pom.xml | 2 +-
tools/apidoc/pom.xml | 2 +-
tools/checkstyle/pom.xml | 2 +-
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud4/pom.xml | 2 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 4 +-
tools/marvin/marvin/lib/base.py | 66 ++++-
tools/marvin/pom.xml | 2 +-
tools/marvin/setup.py | 2 +-
tools/pom.xml | 2 +-
ui/public/locales/en.json | 10 +-
ui/src/components/view/DetailSettings.vue | 13 +-
ui/src/components/view/ListView.vue | 2 +-
ui/src/components/view/SearchView.vue | 3 +-
ui/src/components/widgets/ResourceLabel.vue | 4 +-
ui/src/config/section/compute.js | 4 +-
ui/src/config/section/infra/phynetworks.js | 5 +
ui/src/config/section/storage.js | 6 +-
ui/src/utils/plugins.js | 1 +
ui/src/views/compute/DeployVM.vue | 32 +-
ui/src/views/compute/backup/BackupSchedule.vue | 8 +
.../views/compute/wizard/DiskOfferingSelection.vue | 1 +
ui/src/views/infra/network/IpRangesTabPublic.vue | 6 +
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 3 +
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 63 +++-
ui/src/views/network/AclListRulesTab.vue | 8 +-
usage/pom.xml | 2 +-
.../java/com/cloud/usage/UsageManagerImpl.java | 77 +++--
utils/pom.xml | 2 +-
.../src/main/java/com/cloud/utils/StringUtils.java | 2 +-
utils/src/main/java/com/cloud/utils/UriUtils.java | 3 +-
.../java/com/cloud/utils/storage/QCOW2Utils.java | 21 +-
vmware-base/pom.xml | 2 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 25 ++
.../hypervisor/vmware/mo/VmdkFileDescriptor.java | 59 ++++
289 files changed, 2778 insertions(+), 862 deletions(-)
copy framework/db/src/test/java/com/cloud/utils/db/DummyComponent.java =>
api/src/main/java/org/apache/cloudstack/quota/QuotaTariff.java (80%)
copy core/src/main/java/{com/cloud/agent/api/CheckVirtualMachineCommand.java
=> org/apache/cloudstack/backup/PrepareForBackupRestorationCommand.java} (78%)
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/{StrategyPriority.java
=> DownloadableDataInfo.java} (86%)
copy
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/{Job.java
=> BackupFile.java} (55%)
copy
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/{ObjectsInJob.java
=> BackupFiles.java} (72%)
copy
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/{ObjectInJob.java
=> VmRestorePoint.java} (58%)
copy
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/{ObjectsInJob.java
=> VmRestorePoints.java} (70%)
delete mode 100755 systemvm/agent/scripts/consoleproxy.sh
delete mode 100755 systemvm/agent/scripts/secstorage.sh
create mode 100644 test/integration/smoke/test_backup_recovery_veeam.py
