This is an automated email from the ASF dual-hosted git repository.

DaanHoogland pushed a change to branch ghi10752-configCleanup
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


    from 826a7b9238e Merge branch 'main' into ghi10752-configCleanup
     add 4e4a26b49ef dns: prevent creation of cross-tenant conflicting DNS 
zones in the same server (#13946)
     add 158fe4fad53 DNS Provider URL Validation (#13821)
     add a7a293ed58d Update RAT plugin version from 0.12 to 0.18 (#12989)
     add 6764ca5ea3f add prashanth
     add 77fbb0f0333 github: skip Copilot reviews for draft PRs (#13996)
     add 8fb3ad4c4e6 Updating pom.xml version numbers for release 
4.24.0.0-SNAPSHOT
     add 7ea1dca5167 Add NULL check during restoreVM operation when host is 
removed (#13779)
     add 7d45dcb4301 Migrations triggered by Maintenance (system) not reported 
on VM events list (#13931)
     add 5b49d6aa3f7 Errorprone static analysis tool integration and fixes of 
reported issues (#12419)
     add b09005faaa9 UI: make serviceofferingid optional when add network 
offering (#13502)
     add 3dc23056b73 server: fix lastpinged of hosts (#13030)
     add f2dec381726 Merge branch '4.20' into 4.22
     add c7605686190 ui: label instance volume sizes as GiB (#13831)
     add a5954f94cf6 fix domain cleanup when a removed account owns templates 
(#13630)
     add 167320eb9fe Propagate StopAnswer error details up the call chain when 
stopping a VM (#13558)
     add 6434ff2c62a make sure virtual machine params exist (#12771)
     add 8d26cb3da6c Support for migration of system VMs with volumes in the 
GUI (#13144)
     add 042ec7e1655 UI: fix usage records end date with local timezone (#13769)
     add 15dcfd36e0d Merge branch '4.22'
     add 3d70ce47f91 doc: add API parameter syntax examples for nodeofferings 
and nodetemplates in createKubernetesCluster (#13902)
     add 2cd8c5eddc7 Create bridge on dest host during SSVM migration when 
using storage networks with dedicated vlan (#13379)
     add e3c7b767998 Merge remote-tracking branch 'origin/4.20' into 4.22
     add bef06d7462d Merge remote-tracking branch 'origin/4.22'
     add b7a834ba922 fix test failure - due to forward merge
     add 7f557909ff5 Merge branch 'main' into ghi10752-configCleanup

No new revisions were added by this update.

Summary of changes:
 .asf.yaml                                          |   3 +-
 .github/linters/codespell.txt                      |   2 +
 .github/workflows/rat.yml                          |   2 +-
 agent/pom.xml                                      |   2 +-
 .../java/com/cloud/agent/mockvm/MockVmMgr.java     |   2 +-
 api/pom.xml                                        |   2 +-
 .../java/com/cloud/vm/VirtualMachineProfile.java   |   1 +
 .../org/apache/cloudstack/api/ApiConstants.java    |   1 +
 .../admin/backup/UpdateBackupOfferingCmd.java      |   4 +-
 .../api/command/user/dns/AddDnsServerCmd.java      |   2 +-
 .../api/command/user/dns/DeleteDnsServerCmd.java   |   2 +-
 .../api/command/user/dns/UpdateDnsServerCmd.java   |   2 +-
 .../api/command/user/vm/CreateVMFromBackupCmd.java |   9 +
 .../com/cloud/network/IsolationMethodTest.java     |   2 +-
 client/pom.xml                                     |   2 +-
 core/pom.xml                                       |   2 +-
 .../facade/AbstractConfigItemFacade.java           |   2 +-
 .../com/cloud/network/HAProxyConfigurator.java     |   2 +-
 .../java/com/cloud/resource/RequestWrapper.java    |   2 +-
 .../directdownload/DirectDownloadCommand.java      |   1 -
 .../com/cloud/resource/ServerResourceBaseTest.java |  23 +-
 debian/changelog                                   |   6 +
 developer/pom.xml                                  |   2 +-
 engine/api/pom.xml                                 |   2 +-
 engine/components-api/pom.xml                      |   2 +-
 engine/orchestration/pom.xml                       |   2 +-
 .../java/com/cloud/agent/manager/AgentAttache.java |   9 +-
 .../cloud/agent/manager/DirectAgentAttache.java    |   5 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  89 ++--
 .../engine/orchestration/NetworkOrchestrator.java  |   2 +-
 .../agent/manager/ConnectedAgentAttacheTest.java   |   6 +-
 .../cloud/vm/VirtualMachineManagerImplTest.java    |  15 +-
 engine/pom.xml                                     |   2 +-
 engine/schema/pom.xml                              |   2 +-
 .../main/java/com/cloud/event/dao/EventDao.java    |  13 +
 .../java/com/cloud/event/dao/EventDaoImpl.java     |  20 +
 .../com/cloud/offerings/NetworkOfferingVO.java     |   2 +-
 .../upgrade/SystemVmTemplateRegistration.java      |  61 ++-
 .../cloud/upgrade/dao/DatabaseAccessObject.java    |   2 +-
 .../com/cloud/upgrade/dao/Upgrade41500to41510.java |  79 ++--
 .../{nic_dns_view.sql => cloud.nic_dns_view.sql}   |   0
 .../cloud/network/as/AutoScaleVmProfileVOTest.java |  22 +-
 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 +-
 engine/storage/integration-test/pom.xml            |   2 +-
 engine/storage/object/pom.xml                      |   2 +-
 engine/storage/pom.xml                             |   2 +-
 engine/storage/snapshot/pom.xml                    |   2 +-
 .../vmsnapshot/ScaleIOVMSnapshotStrategy.java      |   2 +-
 .../storage/endpoint/DefaultEndPointSelector.java  |   8 +-
 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 +-
 .../java/com/cloud/utils/db/GenericDaoBase.java    |  15 +-
 framework/direct-download/pom.xml                  |   2 +-
 framework/events/pom.xml                           |   2 +-
 framework/extensions/pom.xml                       |   6 +-
 framework/ipc/pom.xml                              |   2 +-
 .../framework/serializer/OnwireClassRegistry.java  |   2 +-
 framework/jobs/pom.xml                             |   2 +-
 framework/kms/pom.xml                              |   2 +-
 framework/managed-context/pom.xml                  |   2 +-
 framework/pom.xml                                  |   2 +-
 framework/quota/pom.xml                            |   2 +-
 framework/rest/.gitignore                          |  17 +
 framework/rest/pom.xml                             |   2 +-
 framework/security/pom.xml                         |   2 +-
 framework/spring/lifecycle/pom.xml                 |   2 +-
 framework/spring/module/pom.xml                    |   2 +-
 .../factory/ModuleBasedContextFactoryTest.java     |   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          |   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/kboss/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 +-
 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/dns/powerdns/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/hypervisors/baremetal/pom.xml              |   2 +-
 plugins/hypervisors/external/pom.xml               |   2 +-
 plugins/hypervisors/hyperv/pom.xml                 |   2 +-
 .../test/HypervDirectConnectResourceTest.java      |   3 +
 plugins/hypervisors/kvm/pom.xml                    |   2 +-
 .../hypervisor/kvm/resource/BridgeVifDriver.java   |   9 +-
 .../kvm/resource/LibvirtComputingResource.java     |   6 +-
 .../kvm/storage/KVMStorageProcessor.java           |   4 +-
 .../kvm/storage/MultipathSCSIAdapterBase.java      |  12 +-
 .../kvm/resource/LibvirtComputingResourceTest.java |   2 +
 .../kvm/storage/ScaleIOStoragePoolTest.java        |   2 +
 plugins/hypervisors/ovm/pom.xml                    |   2 +-
 plugins/hypervisors/ovm3/.gitignore                |  17 +
 plugins/hypervisors/ovm3/pom.xml                   |   2 +-
 .../hypervisor/ovm3/objects/ConnectionTest.java    |   2 +-
 .../com/cloud/hypervisor/ovm3/objects/NtpTest.java |   2 +
 plugins/hypervisors/simulator/pom.xml              |   2 +-
 plugins/hypervisors/ucs/pom.xml                    |   2 +-
 plugins/hypervisors/vmware/pom.xml                 |   2 +-
 .../vmware/VmwareDatacenterApiUnitTest.java        |  15 +-
 plugins/hypervisors/xenserver/pom.xml              |   2 +-
 .../java/com/cloud/hypervisor/XenServerGuru.java   |   7 +-
 .../xenserver/resource/CitrixResourceBaseTest.java |   3 +
 plugins/integrations/cloudian/pom.xml              |   2 +-
 plugins/integrations/kubernetes-service/pom.xml    |   2 +-
 .../cluster/CreateKubernetesClusterCmd.java        |   8 +-
 plugins/integrations/prometheus/pom.xml            |   2 +-
 plugins/integrations/veeam-control-service/pom.xml |   2 +-
 plugins/kms/database/pom.xml                       |   2 +-
 plugins/kms/pkcs11/pom.xml                         |   2 +-
 plugins/kms/pom.xml                                |   2 +-
 plugins/maintenance/pom.xml                        |   2 +-
 plugins/metrics/pom.xml                            |   2 +-
 plugins/network-elements/bigswitch/pom.xml         |   2 +-
 plugins/network-elements/brocade-vcs/pom.xml       |   2 +-
 .../guru/BrocadeVcsGuestNetworkGuruTest.java       |   2 -
 plugins/network-elements/cisco-vnmc/pom.xml        |   2 +-
 .../network/cisco/CiscoVnmcConnectionTest.java     |   3 +-
 .../network/resource/CiscoVnmcResourceTest.java    |   3 +
 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/netris/pom.xml            |   2 +-
 plugins/network-elements/netscaler/pom.xml         |   2 +-
 plugins/network-elements/nicira-nvp/pom.xml        |   2 +-
 .../guru/NiciraNvpGuestNetworkGuruTest.java        |   6 -
 .../com/cloud/network/nicira/NiciraNvpApiIT.java   |   2 -
 plugins/network-elements/nsx/pom.xml               |   2 +-
 .../cloudstack/agent/api/NsxNetworkCommand.java    |   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 +-
 .../AddTungstenFabricPolicyRuleCmdTest.java        |   2 +
 .../CreateTungstenFabricFirewallRuleCmdTest.java   |   2 +
 .../CreateTungstenFabricProviderCmdTest.java       |   2 +
 .../command/DeleteTungstenFabricTagCmdTest.java    |   2 +
 .../command/RemoveTungstenFabricTagCmdTest.java    |   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 +-
 .../driver/redfish/RedfishWrapper.java             |   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/object/ceph/pom.xml                |   2 +-
 plugins/storage/object/cloudian/pom.xml            |   2 +-
 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/pom.xml             |   2 +-
 plugins/storage/volume/nexenta/pom.xml             |   2 +-
 .../datastore/util/NexentaStorAppliance.java       |  13 +-
 plugins/storage/volume/ontap/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 +-
 .../driver/StorPoolPrimaryDataStoreDriver.java     |   2 +-
 .../storage/motion/StorPoolDataMotionStrategy.java |   2 +-
 plugins/user-authenticators/ldap/pom.xml           |   2 +-
 .../cloudstack/ldap/ADLdapUserManagerImpl.java     |   1 +
 .../cloudstack/ldap/OpenLdapUserManagerImpl.java   |   4 +
 .../ldap/LdapDirectoryServerConnectionTest.java    |   3 +
 .../ldap/LdapUnboundidZapdotConnectionTest.java    |   3 +
 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 +-
 plugins/user-authenticators/sha256salted/pom.xml   |   2 +-
 .../static-pin/pom.xml                             |   2 +-
 .../user-two-factor-authenticators/totp/pom.xml    |   2 +-
 pom.xml                                            |   3 +-
 quickcloud/pom.xml                                 |   2 +-
 server/pom.xml                                     |   4 +-
 .../src/main/java/com/cloud/acl/DomainChecker.java |   2 +-
 .../java/com/cloud/api/doc/ApiXmlDocWriter.java    |   2 +-
 .../src/main/java/com/cloud/api/doc/Argument.java  |  12 +-
 .../com/cloud/api/query/dao/HostJoinDaoImpl.java   |   9 +-
 .../cloud/api/query/dao/TemplateJoinDaoImpl.java   |   4 +-
 .../configuration/ConfigurationManagerImpl.java    |   2 +-
 .../java/com/cloud/event/ActionEventUtils.java     |  14 +
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  | 113 ++++-
 .../com/cloud/network/IpAddressManagerImpl.java    |   2 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |   2 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   2 +-
 .../src/main/java/com/cloud/vm/UserVmManager.java  |   4 +
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  85 ++--
 .../cloudstack/dns/DnsProviderManagerImpl.java     |  96 ++++-
 .../org/apache/cloudstack/dns/dao/DnsZoneDao.java  |   2 +
 .../apache/cloudstack/dns/dao/DnsZoneDaoImpl.java  |  24 +-
 .../cloudstack/network/RoutedIpv4ManagerImpl.java  |   8 +-
 .../gslb/GlobalLoadBalancingRulesServiceImpl.java  |  11 +-
 .../test/java/com/cloud/acl/DomainCheckerTest.java |  27 +-
 .../com/cloud/api/query/QueryManagerImplTest.java  |   1 +
 .../deploy/DeploymentPlanningManagerImplTest.java  |  57 +--
 .../cloud/ha/HighAvailabilityManagerImplTest.java  |   8 +-
 .../cloud/network/as/AutoScaleManagerImplTest.java |   5 +-
 .../ResourceLimitManagerImplTest.java              |  31 ++
 .../template/HypervisorTemplateAdapterTest.java    |   2 +
 .../cloud/template/TemplateManagerImplTest.java    |  91 ++--
 .../java/com/cloud/user/DomainManagerImplTest.java |   7 +-
 .../java/com/cloud/vm/UserVmManagerImplTest.java   | 201 +++++++++
 .../test/java/com/cloud/vm/UserVmManagerTest.java  |   3 +
 .../cloud/vm/snapshot/VMSnapshotManagerTest.java   |   7 +-
 .../cloudstack/dns/DnsProviderManagerImplTest.java | 461 ++++++++++++++-------
 .../deployment/RouterDeploymentDefinitionTest.java |   2 +-
 services/console-proxy/pom.xml                     |   2 +-
 services/console-proxy/rdpconsole/pom.xml          |   2 +-
 .../rdpclient/ntlmssp/ServerNtlmsspChallenge.java  |   5 +-
 .../src/main/java/streamer/ByteBuffer.java         |   2 +-
 .../src/test/java/streamer/ByteBufferTest.java     |   1 +
 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 +-
 systemvm/pom.xml                                   |   2 +-
 test/pom.xml                                       |   2 +-
 tools/apidoc/pom.xml                               |   2 +-
 tools/checkstyle/pom.xml                           |   2 +-
 tools/devcloud-kvm/pom.xml                         |   2 +-
 tools/devcloud4/.gitignore                         |  17 +
 tools/devcloud4/pom.xml                            |   2 +-
 tools/docker/Dockerfile                            |   2 +-
 tools/docker/Dockerfile.marvin                     |   4 +-
 tools/docker/Dockerfile.s390x                      |   2 +-
 tools/marvin/pom.xml                               |   2 +-
 tools/marvin/setup.py                              |   2 +-
 tools/pom.xml                                      |   2 +-
 ui/public/locales/en.json                          |   1 +
 ui/src/components/view/DetailsTab.vue              |   2 +-
 ui/src/components/view/InfoCard.vue                |   2 +-
 .../InstanceVolumesStoragePoolSelectListView.vue   |   3 +-
 ui/src/components/view/VolumesTab.vue              |   2 +-
 ui/src/config/section/infra/hosts.js               |   2 +-
 ui/src/views/compute/MigrateWizard.vue             |  15 +-
 ui/src/views/infra/UsageRecords.vue                |   4 +-
 ui/src/views/network/dns/AddDnsServer.vue          |   7 +-
 ui/src/views/network/dns/UpdateDnsServer.vue       |   7 +-
 ui/src/views/offering/AddNetworkOffering.vue       |   1 -
 ui/tests/unit/components/view/DetailsTab.spec.js   |  67 +++
 ui/tests/unit/components/view/InfoCard.spec.js     |  64 +++
 ui/tests/unit/components/view/VolumesTab.spec.js   |  58 +++
 ui/tests/unit/views/infra/UsageRecords.spec.js     |  81 ++++
 usage/pom.xml                                      |   2 +-
 utils/pom.xml                                      |   2 +-
 vmware-base/pom.xml                                |   2 +-
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |   8 +-
 295 files changed, 1841 insertions(+), 748 deletions(-)
 rename engine/schema/src/main/resources/META-INF/db/views/{nic_dns_view.sql => 
cloud.nic_dns_view.sql} (100%)
 create mode 100644 ui/tests/unit/components/view/DetailsTab.spec.js
 create mode 100644 ui/tests/unit/components/view/InfoCard.spec.js
 create mode 100644 ui/tests/unit/components/view/VolumesTab.spec.js
 create mode 100644 ui/tests/unit/views/infra/UsageRecords.spec.js

Reply via email to