This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch netris-update-vpc-and-tier-names in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit d24b6f229d69114527aa9d032957707f17964459 Merge: c087de4adfe a9982c4d4d2 Author: Nicolas Vazquez <[email protected]> AuthorDate: Tue Dec 3 15:50:04 2024 +0100 Merge pull request #25 from shapeblue/netris-420-backport Update netris-release to the 4.20.0.0 release agent/pom.xml | 2 +- api/pom.xml | 2 +- .../main/java/com/cloud/user/AccountService.java | 2 + .../command/user/backup/ListBackupScheduleCmd.java | 2 +- client/pom.xml | 2 +- core/pom.xml | 2 +- debian/changelog | 6 + debian/control | 2 +- developer/pom.xml | 2 +- engine/api/pom.xml | 2 +- engine/components-api/pom.xml | 2 +- engine/orchestration/pom.xml | 2 +- engine/pom.xml | 2 +- engine/schema/pom.xml | 2 +- .../com/cloud/storage/dao/VolumeStatsDaoImpl.java | 9 +- .../main/java/com/cloud/vm/dao/VmStatsDaoImpl.java | 9 +- engine/service/pom.xml | 2 +- engine/storage/cache/pom.xml | 2 +- engine/storage/configdrive/pom.xml | 2 +- engine/storage/datamotion/pom.xml | 2 +- .../motion/StorageSystemDataMotionStrategy.java | 78 +++--- engine/storage/image/pom.xml | 2 +- .../storage/image/TemplateServiceImpl.java | 5 + engine/storage/integration-test/pom.xml | 2 +- engine/storage/object/pom.xml | 2 +- engine/storage/pom.xml | 2 +- engine/storage/snapshot/pom.xml | 2 +- engine/storage/volume/pom.xml | 2 +- engine/userdata/cloud-init/pom.xml | 2 +- engine/userdata/pom.xml | 2 +- framework/agent-lb/pom.xml | 2 +- framework/ca/pom.xml | 2 +- framework/cluster/pom.xml | 2 +- framework/config/pom.xml | 2 +- framework/db/pom.xml | 2 +- .../main/java/com/cloud/utils/db/GenericDao.java | 8 - .../java/com/cloud/utils/db/GenericDaoBase.java | 48 ++-- framework/direct-download/pom.xml | 2 +- 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 +- framework/rest/pom.xml | 2 +- framework/security/pom.xml | 2 +- framework/spring/lifecycle/pom.xml | 2 +- framework/spring/module/pom.xml | 2 +- packaging/el8/cloud.spec | 1 + 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 | 2 +- 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/nas/pom.xml | 2 +- plugins/backup/networker/pom.xml | 2 +- plugins/backup/veeam/pom.xml | 2 +- plugins/ca/root-ca/pom.xml | 2 +- plugins/database/mysql-ha/pom.xml | 2 +- plugins/database/quota/pom.xml | 2 +- .../cloudstack/api/command/QuotaBalanceCmd.java | 14 +- .../cloudstack/api/command/QuotaCreditsCmd.java | 6 + .../cloudstack/api/command/QuotaStatementCmd.java | 6 + 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/drs/cluster/balanced/pom.xml | 2 +- plugins/drs/cluster/condensed/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/event-bus/webhook/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 +- .../kvm/resource/LibvirtComputingResource.java | 19 +- .../kvm/resource/LibvirtStoragePoolDef.java | 2 +- .../hypervisor/kvm/resource/MigrateKVMAsync.java | 2 + .../LibvirtOvsFetchInterfaceCommandWrapper.java | 2 +- .../kvm/storage/IscsiAdmStorageAdaptor.java | 2 +- .../kvm/storage/KVMStoragePoolManager.java | 2 +- .../kvm/storage/KVMStorageProcessor.java | 31 ++- .../kvm/storage/LibvirtStorageAdaptor.java | 58 ++++- .../kvm/storage/ManagedNfsStorageAdaptor.java | 2 +- .../kvm/storage/MultipathSCSIAdapterBase.java | 2 +- .../kvm/storage/ScaleIOStorageAdaptor.java | 2 +- .../hypervisor/kvm/storage/StorageAdaptor.java | 2 +- .../kvm/resource/LibvirtComputingResourceTest.java | 113 +++++++++ .../kvm/storage/LibvirtStorageAdaptorTest.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 +- plugins/hypervisors/xenserver/pom.xml | 2 +- plugins/integrations/cloudian/pom.xml | 2 +- plugins/integrations/kubernetes-service/pom.xml | 2 +- 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 +- .../contrail/management/MockAccountManager.java | 5 + plugins/network-elements/netscaler/pom.xml | 2 +- plugins/network-elements/nicira-nvp/pom.xml | 2 +- plugins/network-elements/nsx/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/shutdown/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/object/ceph/pom.xml | 2 +- .../driver/CephObjectStoreDriverImpl.java | 13 +- .../lifecycle/CephObjectStoreLifeCycleImpl.java | 10 +- plugins/storage/object/minio/pom.xml | 2 +- plugins/storage/object/simulator/pom.xml | 2 +- plugins/storage/sharedfs/storagevm/pom.xml | 2 +- plugins/storage/volume/adaptive/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/flasharray/pom.xml | 2 +- plugins/storage/volume/linstor/CHANGELOG.md | 13 + plugins/storage/volume/linstor/pom.xml | 2 +- .../kvm/storage/LinstorStorageAdaptor.java | 79 ++++-- .../storage/datastore/util/LinstorUtil.java | 24 ++ plugins/storage/volume/nexenta/pom.xml | 2 +- plugins/storage/volume/primera/pom.xml | 2 +- plugins/storage/volume/sample/pom.xml | 2 +- plugins/storage/volume/scaleio/pom.xml | 2 +- plugins/storage/volume/solidfire/pom.xml | 2 +- plugins/storage/volume/storpool/pom.xml | 2 +- .../kvm/storage/StorPoolStorageAdaptor.java | 2 +- .../storage/datastore/util/StorPoolUtil.java | 4 +- .../storage/snapshot/StorPoolSnapshotStrategy.java | 58 +++-- plugins/user-authenticators/ldap/pom.xml | 2 +- plugins/user-authenticators/md5/pom.xml | 2 +- plugins/user-authenticators/oauth2/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 +- .../api/command/ListAndSwitchSAMLAccountCmd.java | 7 +- .../apache/cloudstack/saml/SAML2AuthManager.java | 6 + .../cloudstack/saml/SAML2AuthManagerImpl.java | 3 +- .../java/org/apache/cloudstack/saml/SAMLUtils.java | 27 ++- .../command/ListAndSwitchSAMLAccountCmdTest.java | 25 +- 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 | 26 +- server/src/main/java/com/cloud/api/ApiServlet.java | 54 +++-- .../com/cloud/api/dispatch/ParamProcessWorker.java | 42 ++-- .../java/com/cloud/api/query/QueryManagerImpl.java | 26 +- .../java/com/cloud/user/AccountManagerImpl.java | 14 ++ .../cloud/api/dispatch/ParamProcessWorkerTest.java | 138 +++++++++-- .../com/cloud/user/MockAccountManagerImpl.java | 5 + .../java/com/cloud/user/MockUsageEventDao.java | 5 - services/console-proxy/pom.xml | 2 +- services/console-proxy/rdpconsole/pom.xml | 2 +- services/console-proxy/server/pom.xml | 2 +- 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/formatinspector/Qcow2HeaderField.java | 51 ++++ .../storage/formatinspector/Qcow2Inspector.java | 268 +++++++++++++++++++++ .../resource/NfsSecondaryStorageResource.java | 14 +- .../storage/template/DownloadManagerImpl.java | 39 ++- systemvm/debian/opt/cloud/bin/cs/CsFile.py | 2 +- systemvm/pom.xml | 2 +- test/integration/smoke/test_login.py | 1 + test/pom.xml | 2 +- tools/apidoc/pom.xml | 2 +- tools/build/build_asf.sh | 10 +- 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/pom.xml | 2 +- tools/marvin/setup.py | 2 +- tools/pom.xml | 2 +- ui/public/locales/pt_BR.json | 4 +- ui/src/api/index.js | 11 +- ui/src/components/view/DetailSettings.vue | 13 +- ui/src/config/section/compute.js | 2 +- ui/src/store/modules/user.js | 10 +- ui/src/views/compute/KubernetesServiceTab.vue | 2 +- ui/src/views/compute/StartVirtualMachine.vue | 16 +- .../views/image/UpdateTemplateIsoPermissions.vue | 18 +- ui/src/views/infra/UpdatePrimaryStorage.vue | 10 +- ui/tests/unit/components/view/ActionButton.spec.js | 10 + ui/tests/unit/views/compute/MigrateWizard.spec.js | 10 + ui/vue.config.js | 6 +- usage/pom.xml | 2 +- utils/pom.xml | 2 +- utils/src/main/java/com/cloud/utils/HttpUtils.java | 42 +++- .../test/java/com/cloud/utils/HttpUtilsTest.java | 86 ++++++- vmware-base/pom.xml | 2 +- 231 files changed, 1527 insertions(+), 443 deletions(-)
