This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch netris-net-offerings-lb
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 04381891326 fix offering
add 26218b093ea Fix edit of compute offering in UI (#11417)
add 53b026487fb UI: Fix duplicate edit zone button on Basic zones (#11427)
add 78e146278b3 api: fix scale or upgrade systemvm (#11062)
add bd252b59836 Merge branch '4.19' into 4.20
add 99919fda7f0 Merge branch '4.20'
add 1994511f0c9 noVNC: Show a dot cursor when the cursor is not visible
(#11418)
add e57e8cf4189 Network rate must be multiplied by 125 not 128 (#10645)
add f5b4858012b ui: make vpc cidr required when not showing cidrsize
(#11393)
add 96728c5a17d Merge branch '4.20'
add 9fd2b90b80d Fix ConfigurationVO load exception after schema change
(#10485)
add 2c493d19336 Add support for nvidia vGPU support with vendor specific
framework (#11432)
add 0b381d4270e Exclude External hypervisor type during upgrade for System
VM template checks (#11435)
add 03da8cbd3e0 server: fix conserve_mode of
DefaultIsolatedNetworkOfferingForVpcNetworks (#11133)
add 93d6ff3a7d0 Proxmox: fix restore snapshot with memory (#11450)
add d4bd5872313 UI: fix addHost in zone wizard (#11401)
add 25f93b1d6b8 linstor: fix getVolumeStats if multiple Linstor primary
storages are used (#11397)
add 9111bbd8da6 Merge branch '4.19' into 4.20
add c6daeb4f78d fix snapshot physical size for primary storage (#11448)
add 2c34f5e4954 Merge branch '4.20'
add ba2d70ab214 [KVM] CPU Features for System VMs (#10964)
add f671461d4c9 Fix for create template from snapshot (for snapshots on
primary storage and storage doesn't support create snapshot to template
directly) (#11452)
add 5a90da32760 Fix for PowerFlex MDM configuration on host while
preparing the SDC connection (#11458)
add f2d635683bf Update error message when no snapshot strategy is found
while creating snapshot (#11455)
add df5efa5d0dc Remove non-existant network service provider from UI
(#11463)
add 6e59f4f4cc2 Fix deployment of CKS clusters in Basic zone (#11457)
add e0bc8c3b1a5 Merge branch '4.20'
add 1272b130878 Fix of create a template from a StorPool snapshot on
another zone (#11490)
add f9513b47bf8 Updating pom.xml version numbers for release 4.21.0.0
add 1033be4b31f Updating pom.xml version numbers for release
4.22.0.0-SNAPSHOT
add e5e902a3208 tools: fix 4.22.0.0-SNAPSHOT
add 5da7d2d01ef scripts: fix external provision to use correct power state
& hyperv powersync (#11504)
add cbc614d8e33 Add logs to keystore-setup and fix password regex (#10723)
add 2105794f61d UI: Hide User Card from config.userCard.enabled option
(#10545)
add 0f0155c6530 Fix live migration of VM with config drive on KVM (#11516)
add f80a9ca4823 UI: Prevent restriction of changeOfferingForVolume API to
Admin role (#11466)
add 05e7a257ca5 VPC VR: return UNKNOWN redundant state if no guest nics
(#11518)
add ba7ec886504 SG: Apply rules for both ipv4/ipv6 of VMs with associated
account/SG (#11243)
add 3109e0080e5 Add response object required by go SDK for parsing
response (#10152)
add ca62a7dd504 Merge branch '4.19' into 4.20
add 2eb80e0361f Merge branch '4.20'
add 889fc62b605 schema: Add upgrade path from 4.21.0.0 to 4.22.0.0 (#11469)
add 762f75c041d kvm: fix vm deployment with direct-download iso (#11532)
add d161dc76699 api: use single quote instead of double quote in
StatsResponse (#11537)
add 5837c4f29e2 Merge remote-tracking branch 'apache/4.19' into 4.20
add 3c4f4588192 Merge remote-tracking branch 'apache/4.20'
add 9184170b01d Remove Domain/IP from Password Reset Link to custom Global
Setting (#11379)
add ba42d251624 packaging: add pre-check.sh (#11135)
add ca0c3530ad0 utils: add UuidUtils.nameUUIDFromBytes (#11136)
add 574ed7857b3 .github: Update to JDK 17 in ci.yml and build.yml (#11030)
add 92e75932967 Use update offering APIs to disable compute and disk
offerings (#11550)
add 48648d4c45b test: fix test_04_rvpc_network_garbage_collector_nics
failure (#11542)
add 973b333e401 Merge remote-tracking branch 'apache/4.19' into 4.20
add abe41add86d Merge remote-tracking branch 'apache/4.20'
add 76ef8d31f8a make server threads configurable with server.properties
file (#11540)
add 3ddd8023d0a ui: fix extension path with name having special characters
(#11489)
add 66a584624f7 Update md5sum to sha512sum (#11134)
add 3d6ec29c9bb Don't show backup in list_capacity for dummy plugin or if
backup_framework is disabled (#11485)
add f24b1757a0b ui: donot filter edge zones while registering
directdownload iso (#10865)
add 25f1d203403 ui: show multiple domains as links in list view (#11536)
add db5b6a54a1e systemvm template: update URLs of debian ISOs (#11543)
add adec5f439df kvm: add ssvm storage nic null uri check during plug
(#11557)
add af2a911f1b7 UI: Make logout function more robust to prevent session
issues (#11361)
add 90681df1b5b Primera: Delete session after key expiration (#11487)
add fd46e61032f Added events for snapshots, vmsnapshots, internalLB
operations (#11230)
add a4cf47a9b80 server: remove extra chars when template status is error
string (#11329)
add f4802f30ed6 UI: fix display of disk size and IOPS fields in the scale
VM form (#11553)
add f99942cf9a2 Merge remote-tracking branch 'apache/4.19' into 4.20
add 6868f052de4 2fa: log error on totp mismatch (#10734)
add 9349b69b7e6 server,kvm: detect boot options for vm import (#11218)
add 3ffd4442946 ui: donot remove account, domain from query on public ip
filter change (#11575)
add 4f5f7d46d28 CKS: Validate network offering from network if provided
rather than global setting (#11528)
add f26f8cce178 server: allow adding non-overlapping ipv6 ranges in same
vlan (#11556)
add fe120b64e70 server: prevent vm schedule update failure for time when
not changed (#11314)
add 7044564bab1 Merge remote-tracking branch 'apache/4.19' into 4.20
add 8089d327403 Merge remote-tracking branch 'apache/4.20'
add b46e29dc677 Improvement: SSL offloading with Virtual Router (#11468)
add e3681a04bb8 server: allow migration of vm with snapshots for vmware
(#9305)
add 5d32492676a IPv6 firewall: accept packets from related and established
connections (#10970)
add e64e94ad3f7 Import KVM VM: Autodetect vlan id from bridge name (#11507)
add 036fd001705 kvm: Fix NPE in case host UEFI detail is not set on agent
connection (#11610)
add 7c727a34406 CKS: Fix transition exception when scaling Stopped k8s
clusters (#11598)
add 38006b2e03d ssvm: use mgmt network if no storage network (#10735)
add 70a4503ea16 Merge remote-tracking branch 'apache/4.20'
add 8260e0eab14 Merge branch 'main' of
https://github.com/apache/cloudstack into netris-net-offerings-lb
add 7fb20fc364d externalize common checks to a utility file
No new revisions were added by this update.
Summary of changes:
.github/workflows/build.yml | 9 +-
.github/workflows/ci.yml | 9 +-
.pre-commit-config.yaml | 6 +-
agent/conf/agent.properties | 5 +-
agent/pom.xml | 2 +-
.../cloud/agent/properties/AgentProperties.java | 5 +-
.../com/cloud/agent/resource/DummyResource.java | 4 +-
api/pom.xml | 2 +-
.../com/cloud/agent/api/to/LoadBalancerTO.java | 6 +-
.../main/java/com/cloud/hypervisor/Hypervisor.java | 6 +-
.../kubernetes/cluster/KubernetesCluster.java | 4 +
.../network/lb/LoadBalancingRulesService.java | 2 +-
.../admin/network/CreateNetworkOfferingCmd.java | 10 +-
.../command/admin/systemvm/ScaleSystemVMCmd.java | 2 +-
.../command/admin/systemvm/UpgradeSystemVMCmd.java | 2 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 10 +-
.../loadbalancer/AssignCertToLoadBalancerCmd.java | 24 +-
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 5 +-
.../RemoveCertFromLoadBalancerCmd.java | 11 +
.../snapshot/CreateSnapshotFromVMSnapshotCmd.java | 5 +
.../api/command/utils/OfferingUtils.java | 29 +-
.../cloudstack/api/response/StatsResponse.java | 2 +-
client/conf/server.properties.in | 4 +
client/pom.xml | 2 +-
.../java/org/apache/cloudstack/ServerDaemon.java | 18 +-
core/pom.xml | 2 +-
.../cloud/agent/api/DeleteStoragePoolCommand.java | 4 +-
.../cloud/agent/api/ModifyStoragePoolCommand.java | 6 +-
.../facade/LoadBalancerConfigItem.java | 2 +
.../virtualnetwork/model/LoadBalancerRule.java | 56 ++
.../com/cloud/network/HAProxyConfigurator.java | 140 +++--
.../cloud/network/LoadBalancerConfigurator.java | 3 +
.../resource/virtualnetwork/ConfigHelperTest.java | 6 +-
.../virtualnetwork/model/LoadBalancerRuleTest.java | 63 +++
.../com/cloud/network/HAProxyConfiguratorTest.java | 18 +-
debian/changelog | 12 +
debian/rules | 2 +-
developer/pom.xml | 2 +-
engine/api/pom.xml | 2 +-
engine/components-api/pom.xml | 2 +-
engine/orchestration/pom.xml | 2 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 2 +-
.../engine/orchestration/NetworkOrchestrator.java | 2 +
.../engine/orchestration/VolumeOrchestrator.java | 12 +-
engine/pom.xml | 2 +-
engine/schema/pom.xml | 16 +-
.../src/main/java/com/cloud/dc/dao/ClusterDao.java | 2 +-
.../main/java/com/cloud/dc/dao/ClusterDaoImpl.java | 12 +-
.../java/com/cloud/network/dao/SslCertDao.java | 2 +
.../java/com/cloud/network/dao/SslCertDaoImpl.java | 6 +
.../network/security/SecurityGroupVMMapVO.java | 7 +
.../main/java/com/cloud/storage/VMTemplateVO.java | 3 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 5 +
.../upgrade/SystemVmTemplateRegistration.java | 4 +-
.../main/java/com/cloud/upgrade/dao/DbUpgrade.java | 37 +-
.../upgrade/dao/DbUpgradeSystemVmTemplate.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade42010to42100.java | 13 +-
...grade431to440.java => Upgrade42100to42200.java} | 13 +-
.../resources/META-INF/db/schema-42010to42100.sql | 3 +
...cleanup.sql => schema-42100to42200-cleanup.sql} | 2 +-
...22to224-premium.sql => schema-42100to42200.sql} | 6 +-
.../java/com/cloud/dc/dao/ClusterDaoImplTest.java | 4 +-
.../upgrade/SystemVmTemplateRegistrationTest.java | 2 +-
engine/schema/templateConfig.sh | 2 +-
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 +-
.../cloudstack/storage/test/SnapshotTest.java | 3 +-
.../cloudstack/storage/test/VolumeServiceTest.java | 5 +-
.../cloudstack/storage/test/VolumeTestVmware.java | 3 +-
engine/storage/object/pom.xml | 2 +-
engine/storage/pom.xml | 2 +-
engine/storage/snapshot/pom.xml | 2 +-
.../storage/snapshot/SnapshotObject.java | 11 +-
engine/storage/volume/pom.xml | 2 +-
.../storage/volume/VolumeServiceImpl.java | 2 +
engine/userdata/cloud-init/pom.xml | 2 +-
engine/userdata/pom.xml | 2 +-
extensions/HyperV/hyperv.py | 10 +-
extensions/Proxmox/proxmox.sh | 6 +-
framework/agent-lb/pom.xml | 2 +-
framework/ca/pom.xml | 2 +-
framework/cluster/pom.xml | 2 +-
framework/config/pom.xml | 2 +-
.../framework/config/impl/ConfigDepotImplTest.java | 1 -
framework/db/pom.xml | 2 +-
.../java/com/cloud/utils/db/TransactionLegacy.java | 9 +
framework/direct-download/pom.xml | 2 +-
framework/events/pom.xml | 2 +-
framework/extensions/pom.xml | 6 +-
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 | 2 +-
packaging/systemd/cloudstack-agent.service | 1 +
packaging/systemd/cloudstack-management.service | 1 +
packaging/systemd/cloudstack-usage.service | 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 +-
.../cloudstack/backup/DummyBackupProvider.java | 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/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 +-
.../cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 3 +-
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 +-
.../baremetal/manager/BareMetalDiscoverer.java | 3 +-
plugins/hypervisors/external/pom.xml | 2 +-
.../discoverer/ExternalServerDiscoverer.java | 3 +-
plugins/hypervisors/hyperv/pom.xml | 2 +-
.../hyperv/discoverer/HypervServerDiscoverer.java | 8 +-
plugins/hypervisors/kvm/pom.xml | 2 +-
.../hypervisor/kvm/resource/BridgeVifDriver.java | 29 +-
.../hypervisor/kvm/resource/DirectVifDriver.java | 4 +-
.../hypervisor/kvm/resource/IvsVifDriver.java | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 53 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 34 ++
.../hypervisor/kvm/resource/LibvirtGpuDef.java | 11 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 4 +-
.../hypervisor/kvm/resource/VifDriverBase.java | 9 +
...LibvirtGetUnmanagedInstancesCommandWrapper.java | 14 +-
.../wrapper/LibvirtMigrateCommandWrapper.java | 2 +-
.../kvm/storage/KVMStoragePoolManager.java | 20 +-
.../kvm/storage/KVMStorageProcessor.java | 7 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 7 +-
.../kvm/storage/ScaleIOStorageAdaptor.java | 34 +-
.../kvm/resource/BridgeVifDriverTest.java | 58 ++-
.../kvm/resource/LibvirtComputingResourceTest.java | 16 +
.../kvm/resource/LibvirtDomainXMLParserTest.java | 90 ++++
.../kvm/storage/ScaleIOStorageAdaptorTest.java | 28 -
plugins/hypervisors/ovm/pom.xml | 2 +-
.../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 3 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 4 +-
plugins/hypervisors/ovm3/pom.xml | 2 +-
.../cloud/hypervisor/ovm3/objects/OvmObject.java | 3 +-
.../hypervisor/ovm3/resources/Ovm3Discoverer.java | 3 +-
.../ovm3/resources/Ovm3HypervisorResource.java | 4 +-
.../com/cloud/hypervisor/ovm3/objects/XenTest.java | 5 +-
plugins/hypervisors/simulator/pom.xml | 2 +-
.../agent/manager/MockStorageManagerImpl.java | 3 +-
plugins/hypervisors/ucs/pom.xml | 2 +-
plugins/hypervisors/vmware/pom.xml | 2 +-
.../hypervisor/vmware/VmwareServerDiscoverer.java | 4 +-
.../vmware/manager/VmwareStorageManagerImpl.java | 3 +-
.../hypervisor/vmware/resource/VmwareResource.java | 5 +-
.../storage/resource/VmwareStorageProcessor.java | 7 +-
plugins/hypervisors/xenserver/pom.xml | 2 +-
.../xenserver/resource/CitrixResourceBase.java | 9 +-
.../resource/XenServerStorageProcessor.java | 3 +-
.../resource/Xenserver625StorageProcessor.java | 17 +-
.../resource/Xenserver625StorageProcessorTest.java | 8 +-
plugins/integrations/cloudian/pom.xml | 2 +-
plugins/integrations/kubernetes-service/pom.xml | 2 +-
.../cluster/KubernetesClusterManagerImpl.java | 35 +-
.../KubernetesClusterScaleWorker.java | 5 +-
plugins/integrations/prometheus/pom.xml | 2 +-
plugins/maintenance/pom.xml | 2 +-
plugins/metrics/pom.xml | 2 +-
.../response/VmMetricsStatsResponse.java | 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 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 4 +
.../internallbvmmgr/InternalLBVMServiceTest.java | 16 +-
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 +-
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/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 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 3 +-
plugins/storage/volume/flasharray/pom.xml | 2 +-
plugins/storage/volume/linstor/CHANGELOG.md | 6 +
plugins/storage/volume/linstor/pom.xml | 2 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 30 +-
plugins/storage/volume/nexenta/pom.xml | 2 +-
plugins/storage/volume/primera/pom.xml | 2 +-
.../datastore/adapter/primera/PrimeraAdapter.java | 38 ++
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 +-
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 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
.../static-pin/pom.xml | 2 +-
.../user-two-factor-authenticators/totp/pom.xml | 2 +-
.../auth/TotpUserTwoFactorAuthenticator.java | 4 +-
pom.xml | 4 +-
quickcloud/pom.xml | 2 +-
.../checkchildren.sh => installer/pre-check.sh} | 39 +-
scripts/util/keystore-setup | 68 ++-
.../hypervisor/external/provisioner/provisioner.sh | 2 +-
scripts/vm/hypervisor/kvm/gpudiscovery.sh | 162 +++++-
server/pom.xml | 4 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 6 +-
.../configuration/ConfigurationManagerImpl.java | 8 +-
.../kvm/discoverer/LibvirtServerDiscoverer.java | 6 +-
.../network/element/VirtualRouterElement.java | 4 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 43 +-
.../cloud/network/router/CommandSetupHelper.java | 1 +
.../cloud/network/router/NetworkHelperImpl.java | 9 +
.../router/VirtualNetworkApplianceManagerImpl.java | 14 +-
.../network/security/SecurityGroupManagerImpl.java | 3 +
.../security/SecurityGroupManagerImpl2.java | 3 +
.../com/cloud/resource/ResourceManagerImpl.java | 6 +
.../com/cloud/server/ConfigurationServerImpl.java | 2 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 4 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 6 +-
.../storage/snapshot/SnapshotManagerImpl.java | 7 +-
.../com/cloud/template/TemplateManagerImpl.java | 35 +-
.../main/java/com/cloud/test/DatabaseConfig.java | 3 +-
.../java/com/cloud/user/AccountManagerImpl.java | 9 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 3 +-
.../cloudstack/backup/BackupManagerImpl.java | 3 +
.../consoleproxy/ConsoleAccessManagerImpl.java | 2 +-
.../cloudstack/network/ssl/CertServiceImpl.java | 105 ++--
.../apache/cloudstack/snapshot/SnapshotHelper.java | 17 +-
.../cloudstack/user/UserPasswordResetManager.java | 5 +
.../user/UserPasswordResetManagerImpl.java | 9 +-
.../vm/schedule/VMScheduleManagerImpl.java | 54 +-
.../lb/LoadBalancingRulesManagerImplTest.java | 209 +++++++-
.../VirtualNetworkApplianceManagerImplTest.java | 24 +
.../com/cloud/user/AccountManagerImplTest.java | 1 +
.../com/cloud/user/AccountManagetImplTestBase.java | 3 +
.../cloudstack/network/ssl/CertServiceTest.java | 296 ++++++++++-
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 +-
.../resource/NfsSecondaryStorageResource.java | 29 +-
.../storage/template/DownloadManagerImpl.java | 3 +-
.../resource/NfsSecondaryStorageResourceTest.java | 56 +-
systemvm/debian/opt/cloud/bin/checkrouter.sh | 22 +-
systemvm/debian/opt/cloud/bin/cs/CsLoadBalancer.py | 36 ++
systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py | 2 +
systemvm/debian/opt/cloud/bin/setup/bootstrap.sh | 4 +
.../debian/opt/cloud/bin/setup/cloud-early-config | 24 +-
systemvm/debian/opt/cloud/bin/setup/router.sh | 8 +-
systemvm/patch-sysvms.sh | 14 +-
systemvm/pom.xml | 2 +-
test/integration/smoke/test_network_acl.py | 26 +
test/integration/smoke/test_ssl_offloading.py | 568 +++++++++++++++++++++
test/integration/smoke/test_vpc_redundant.py | 7 +-
test/pom.xml | 2 +-
tools/apidoc/pom.xml | 2 +-
.../scripts/configure_systemvm_services.sh | 2 +-
.../template-base_aarch64-target_aarch64.json | 2 +-
.../template-base_x86_64-target_aarch64.json | 2 +-
.../template-base_x86_64-target_x86_64.json | 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/cloudstackConnection.py | 3 +-
tools/marvin/marvin/config/test_data.py | 2 +-
tools/marvin/marvin/lib/base.py | 76 +++
tools/marvin/pom.xml | 2 +-
tools/marvin/setup.py | 2 +-
tools/pom.xml | 2 +-
ui/public/config.json | 1 +
ui/public/locales/en.json | 16 +
ui/src/components/view/ListView.vue | 12 +-
ui/src/config/section/account.js | 2 +-
ui/src/config/section/infra/zones.js | 1 +
ui/src/config/section/offering.js | 23 +-
ui/src/config/section/project.js | 4 +
ui/src/config/section/storage.js | 2 +-
ui/src/store/modules/user.js | 12 +-
ui/src/views/AutogenView.vue | 6 +-
ui/src/views/compute/AutoScaleLoadBalancing.vue | 1 +
ui/src/views/compute/ScaleVM.vue | 4 +-
.../views/compute/wizard/MultiNetworkSelection.vue | 16 +-
ui/src/views/dashboard/CapacityDashboard.vue | 1 +
ui/src/views/dashboard/UsageDashboard.vue | 9 +-
ui/src/views/extension/CreateExtension.vue | 2 +-
ui/src/views/iam/SSLCertificateTab.vue | 178 ++++++-
ui/src/views/image/RegisterOrUploadIso.vue | 45 +-
ui/src/views/infra/network/ServiceProvidersTab.vue | 59 ---
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 12 +-
ui/src/views/network/CreateVpc.vue | 16 +-
ui/src/views/network/LoadBalancing.vue | 231 +++++++++
usage/pom.xml | 2 +-
utils/pom.xml | 2 +-
utils/src/main/java/com/cloud/utils/UuidUtils.java | 7 +
.../com/cloud/utils/validation/ChecksumUtil.java | 3 +-
.../cloudstack/utils/security/DigestHelper.java | 8 +-
.../utils/security/DigestHelperTest.java | 11 +
vmware-base/pom.xml | 2 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 3 +-
362 files changed, 3638 insertions(+), 827 deletions(-)
copy
engine/schema/src/main/java/com/cloud/offerings/dao/NetworkOfferingDetailsDao.java
=>
api/src/main/java/org/apache/cloudstack/api/command/utils/OfferingUtils.java
(53%)
create mode 100644
core/src/test/java/com/cloud/agent/resource/virtualnetwork/model/LoadBalancerRuleTest.java
copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade431to440.java
=> Upgrade42100to42200.java} (81%)
copy engine/schema/src/main/resources/META-INF/db/{schema-40to410-cleanup.sql
=> schema-42100to42200-cleanup.sql} (93%)
copy engine/schema/src/main/resources/META-INF/db/{schema-222to224-premium.sql
=> schema-42100to42200.sql} (76%)
mode change 100755 => 100644
copy scripts/{storage/checkchildren.sh => installer/pre-check.sh} (56%)
create mode 100644 test/integration/smoke/test_ssl_offloading.py
