You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2023/01/31 09:34:40 UTC
[cloudstack] branch 4.18-new-cipher-aead updated (0449ba3122f -> c681e07c6ba)
This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a change to branch 4.18-new-cipher-aead
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 0449ba3122f Merge remote-tracking branch 'apache/main' into 4.18-new-cipher-aead
add f9117df0b5b server: allow expunging VMs in Expunging state (#7086)
add 3ea2f1dc9fd updates roles read-only (#7080)
add 4bb43f7879d UI: do not show FW/LB/PF tabs for CKS cluster in advanced network with SG (#7076)
add 566578297b6 Merge release branch 4.17 to main
add 52c321a0c6c Fix spelling (#7087)
add 55d2d26449c kvm: make UEFI host check to support both Ubuntu and EL (#7084)
add 743ebe7278b kvm: get vm disk stats for ceph disks (#7045)
add 38f3027a7c9 CKS: do not save cks username/password which are useless (#7097)
add d04d60b0797 [VMWare] Limit IOPS in Compute/Disk Offerings (#6386)
add 6f6cec5f567 .github: run all gha on ubuntu latest (#7091)
add 0fd416d074c UI: Enable shared network with scope option in advanced zone with SG (#7067)
add dc1a4529139 UI: add filter user/all to list user/all volumes (#7075)
add 3dc0e499dcf storage: validate disk size range of custom disk offering when resize volume (#7073)
add fe0e44abe98 UI: display cpu cores and speed instead of cputotal by default (#7106)
add 792f8356e51 KVM: revert libvirtd config and retry if fail to add a host (#7090)
add ee6ed215c2f Merge release branch 4.17 to main
add e8c32d68fcb Add support for vSphere 8.0 (#7046)
add 911f951e2af Handle console session in multiple management servers (#7094)
add 37b2a4826d7 api/server: add project id/name in ssh keypair response (#7100)
add 9366c4ea01a CKS: remove details when delete a cks cluster (#7104)
add 536a387326f api: fix new password is applied on host when update host password with update_passwd_on_host=false (#7092)
add 07e4debeabc Merge release branch 4.17 to main
add 221118289b0 fix guestOsMapper and move mapping code to latest upgrade (#7095)
add f5b3cb59ee9 [Veeam] enable volume attach/detach in VMs with Backup Offerings (#6581)
add 57d4f5697e8 UI: fix podid is not passed when add ip ranges to basic network (#7117)
add d74f64a2e16 Use lowercase HTTP header field names so we are compatible with HTTP/2 (#7006)
add 2dd29558fef server: fix listnetworkofferings with domain, refactor listvpofferings (#6748)
add 42f0d758c16 vpc/network: set mtu of networks/vpcs/nics during 4.18 upgrade (#7124)
add e7b7efe1177 marvin: install mysql-connector-python version 8.0.31 (#7111)
add 833d1b45239 cloudstack-setup-agent: mask libvirt non-monolithic services (#7114)
add 8838943a761 VR: fix warning Expected X answers while executing SetXXXCommand but Y (#7050)
add abef381aa65 marvin: newer python setuptools doesn't like -SNAPSHOT in marvin version (#7120)
add a7d2d8d750d Merge release branch 4.17 to main
add 10c77c88c8a CKS: fix upgrade of HA cluster (#7118)
add 0d85fb6c4ca Update cloud.spec to include tar for el8 systems (#7113)
add ea14c59210f vmware: support vsphere 8.0 and 8.0.0.1 versions (#7119)
add d288bb0c78e KVM support of iothreads and IO driver policy (#6909)
add e8c1b5509ea VR: fix public-key is missing in VR after acquiring public IP (#7103)
add f39b02aec71 Use long instead of int in DB statistics for Queries and Uptime. (#7125)
add 46924a57823 Merge release branch 4.17 to main
add 61a722548fc Create API to reassign volume (#6938)
add eac357cb77f kvm: Secure KVM VNC Console Access Using the CA Framework (#7015)
add 028ca74fb6c ui,server,api: resource metrics improvements (#6803)
add c78a777d3a0 Fix: memory leak on volume allocation (#7136)
add 83c2bfacd87 Merge branch '4.17'
add 26eaae78723 Allow VPC offering creation only with active VR service offerings (#6957)
add 3b6ce970971 infra: edge zones (#6840)
add fd3798665d4 Merge remote-tracking branch 'apache/main' into HEAD
add 5e700a37984 smoke test: fix test_primary_storage.py
add 48e57463691 smoke test: Do NOT run tests in test_primary_storage.py in parallel
add c681e07c6ba Update PR7003: rename method
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/linter.yml | 4 +-
.github/workflows/merge-conflict-checker.yml | 2 +-
.github/workflows/rat.yml | 2 +-
agent/bindir/cloud-setup-agent.in | 3 +-
agent/conf/agent.properties | 6 +-
.../cloud/agent/properties/AgentProperties.java | 16 +-
api/src/main/java/com/cloud/dc/DataCenter.java | 6 +
.../java/com/cloud/deploy/DeployDestination.java | 8 +-
.../java/com/cloud/network/NetworkService.java | 3 +
.../java/com/cloud/network/vpc/VpcService.java | 2 +-
.../java/com/cloud/storage/VolumeApiService.java | 5 +
.../main/java/com/cloud/vm/VmDetailConstants.java | 4 +
.../org/apache/cloudstack/api/ApiConstants.java | 31 ++
.../command/admin/annotation/AddAnnotationCmd.java | 2 +-
.../command/admin/host/UpdateHostPasswordCmd.java | 3 +-
.../api/command/admin/pod/CreatePodCmd.java | 6 +-
.../api/command/admin/zone/CreateZoneCmd.java | 11 +
.../command/user/config/ListCapabilitiesCmd.java | 5 +
.../api/command/user/vm/DeployVMCmd.java | 32 ++
.../api/command/user/volume/AssignVolumeCmd.java | 119 +++++
.../api/command/user/vpc/ListVPCOfferingsCmd.java | 14 +-
.../api/response/CapabilitiesResponse.java | 32 ++
.../api/response/SSHKeyPairResponse.java | 16 +
.../cloudstack/api/response/ZoneResponse.java | 12 +
.../apache/cloudstack/backup/BackupManager.java | 5 +
.../consoleproxy/ConsoleAccessManager.java | 2 +
.../api/command/admin/zone/CreateZoneCmdTest.java | 35 ++
.../command/test/UpdateHostPasswordCmdTest.java | 14 +-
client/conf/ehcache.xml.in | 4 +-
.../com/cloud/agent/api/UnregisterNicCommand.java | 2 +-
.../java/com/cloud/agent/api/VmDiskStatsEntry.java | 37 ++
.../java/com/cloud/agent/api/VmStatsEntry.java | 12 +-
.../cloud/agent/api/routing/IpAssocCommand.java | 5 -
.../cloud/agent/api/routing/IpAssocVpcCommand.java | 6 -
.../agent/api/routing/NetworkElementCommand.java | 2 +-
.../agent/api/routing/SetFirewallRulesCommand.java | 5 -
.../api/routing/SetIpv6FirewallRulesCommand.java | 5 -
.../api/routing/SetMonitorServiceCommand.java | 5 +
.../agent/api/routing/SetNetworkACLCommand.java | 5 -
.../api/routing/SetPortForwardingRulesCommand.java | 5 -
.../api/routing/SetStaticNatRulesCommand.java | 5 -
.../agent/api/routing/SetStaticRouteCommand.java | 5 -
.../agent/api/routing/SiteLoadBalancerConfig.java | 2 +-
.../resource/virtualnetwork/model/TcpAclRule.java | 2 +-
.../resource/virtualnetwork/model/UdpAclRule.java | 2 +-
.../com/cloud/network/HAProxyConfigurator.java | 2 +-
.../network/resource/TrafficSentinelResource.java | 2 +-
.../storage/template/HttpTemplateDownloader.java | 2 +-
.../template/MetalinkTemplateDownloader.java | 2 +-
.../java/com/cloud/storage/template/Processor.java | 2 +-
.../storage/template/S3TemplateDownloader.java | 4 +-
.../storage/command/MoveVolumeCommand.java | 66 +++
.../agent/api/storage/DownloadAnswerTest.java | 2 +-
.../resource/virtualnetwork/ConfigHelperTest.java | 2 +-
.../virtualnetwork/VirtualRoutingResourceTest.java | 4 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 22 +
.../cloud/entity/api/VirtualMachineEntity.java | 4 +-
.../subsystem/api/network/NetworkSubsystem.java | 2 +-
.../subsystem/api/storage/EndPointSelector.java | 2 +
.../subsystem/api/storage/VolumeService.java | 4 +
.../java/com/cloud/capacity/CapacityManager.java | 2 +-
.../cloud/configuration/ConfigurationManager.java | 6 +-
.../com/cloud/network/rules/FirewallManager.java | 2 +-
.../java/com/cloud/storage/StorageManager.java | 9 +
.../com/cloud/agent/manager/AgentManagerImpl.java | 8 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 6 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 119 ++++-
.../cloud/entity/api/VirtualMachineEntityImpl.java | 2 +-
.../entity/api/db/EngineDataCenterVO.java | 10 +
.../engine/orchestration/NetworkOrchestrator.java | 2 +-
.../engine/orchestration/VolumeOrchestrator.java | 21 +-
.../src/main/java/com/cloud/dc/DataCenterVO.java | 13 +
.../main/java/com/cloud/dc/dao/DataCenterDao.java | 2 +
.../java/com/cloud/dc/dao/DataCenterDaoImpl.java | 21 +
.../main/java/com/cloud/domain/dao/DomainDao.java | 3 +
.../java/com/cloud/domain/dao/DomainDaoImpl.java | 25 +
.../src/main/java/com/cloud/host/dao/HostDao.java | 8 +
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 24 +-
.../main/java/com/cloud/storage/VolumeStatsVO.java | 86 ++++
.../java/com/cloud/storage/dao/VolumeStatsDao.java | 82 ++++
.../com/cloud/storage/dao/VolumeStatsDaoImpl.java | 124 +++++
.../main/java/com/cloud/upgrade/GuestOsMapper.java | 18 +-
.../com/cloud/upgrade/dao/Upgrade41400to41500.java | 238 ---------
.../com/cloud/upgrade/dao/Upgrade41500to41510.java | 140 +-----
.../com/cloud/upgrade/dao/Upgrade41510to41520.java | 10 +-
.../com/cloud/upgrade/dao/Upgrade41520to41600.java | 9 -
.../com/cloud/upgrade/dao/Upgrade41600to41610.java | 10 +-
.../com/cloud/upgrade/dao/Upgrade41720to41800.java | 472 ++++++++++++++++++
.../main/java/com/cloud/vm/ConsoleSessionVO.java | 123 +++++
.../java/com/cloud/vm/dao/ConsoleSessionDao.java | 27 +-
.../com/cloud/vm/dao/ConsoleSessionDaoImpl.java | 21 +-
.../spring-engine-schema-core-daos-context.xml | 2 +
.../resources/META-INF/db/schema-41720to41800.sql | 124 ++++-
.../apache/cloudstack/storage/test/TestHttp.java | 4 +-
.../storage/endpoint/DefaultEndPointSelector.java | 12 +-
.../storage/volume/VolumeServiceImpl.java | 59 ++-
.../cluster/ClusterServiceServletHttpHandler.java | 4 +-
.../utils/crypt/EncryptionSecretKeyChanger.java | 8 +-
packaging/centos8/cloud.spec | 1 +
plugins/alert-handlers/snmp-alerts/CS-ROOT-MIB.mib | 4 +-
.../cloudstack/backup/veeam/VeeamClient.java | 2 +-
.../cloudstack/backup/veeam/VeeamClientTest.java | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 134 +++--
.../hypervisor/kvm/resource/LibvirtVMDef.java | 74 ++-
.../wrapper/LibvirtReadyCommandWrapper.java | 9 +-
.../kvm/storage/KVMStorageProcessor.java | 20 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 47 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 2 +-
.../ovm3/resources/helpers/Ovm3StoragePool.java | 2 +-
.../cloud/agent/manager/MockAgentManagerImpl.java | 12 +-
.../java/com/cloud/ucs/manager/UcsHttpClient.java | 2 +-
.../apache/cloudstack/api/ListUcsManagerCmd.java | 2 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 50 +-
.../hypervisor/vmware/resource/VmwareResource.java | 5 +-
.../storage/resource/VmwareStorageProcessor.java | 7 +-
.../com/cloud/hypervisor/guru/VMwareGuruTest.java | 33 ++
.../cloudstack/cloudian/client/CloudianClient.java | 4 +-
.../cloudstack/cloudian/CloudianClientTest.java | 34 +-
.../cluster/KubernetesClusterManagerImpl.java | 6 -
.../KubernetesClusterDestroyWorker.java | 1 +
.../KubernetesClusterUpgradeWorker.java | 2 +-
.../cluster/utils/KubernetesClusterUtil.java | 60 ++-
.../cluster/utils/KubernetesClusterUtilTest.java | 49 +-
.../metrics/PrometheusExporterServerImpl.java | 2 +-
.../api/BaseResourceUsageHistoryCmd.java | 54 +++
...yCmd.java => ListSystemVMsUsageHistoryCmd.java} | 39 +-
.../cloudstack/api/ListVMsUsageHistoryCmd.java | 25 +-
...oryCmd.java => ListVolumesUsageHistoryCmd.java} | 42 +-
.../apache/cloudstack/metrics/MetricsService.java | 11 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 239 ++++++++-
.../cloudstack/response/DbMetricsResponse.java | 8 +-
.../response/VolumeMetricsStatsResponse.java | 54 +++
.../cloudstack/metrics/MetricsServiceImplTest.java | 20 +-
.../cloud/network/bigswitch/BigSwitchBcfApi.java | 2 +-
.../cloud/network/bigswitch/BigSwitchApiTest.java | 8 +-
.../contrail/management/ManagementServerMock.java | 2 +-
.../network/opendaylight/api/resources/Action.java | 2 +-
.../stratosphere-ssp/sspmock/sspmock.py | 8 +-
.../storage/datastore/util/DateraUtil.java | 2 +-
.../datastore/client/ScaleIOGatewayClientImpl.java | 2 +-
.../client/ScaleIOGatewayClientImplTest.java | 16 +-
.../api/command/LdapListUsersCmdTest.java | 2 +-
pom.xml | 2 +-
python/lib/cloudutils/serviceConfig.py | 69 ++-
python/lib/cloudutils/syscfg.py | 42 +-
python/lib/cloudutils/utilities.py | 4 +
scripts/storage/secondary/swift | 6 +-
scripts/util/keystore-cert-import | 6 +
scripts/util/keystore-setup | 22 +
scripts/vm/hypervisor/xenserver/s3xenserver | 6 +-
scripts/vm/hypervisor/xenserver/storagePlugin | 2 +-
scripts/vm/hypervisor/xenserver/swift | 6 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 18 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 11 +
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 2 +
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 +-
.../com/cloud/api/query/vo/DataCenterJoinVO.java | 9 +
.../cloud/api/response/ApiResponseSerializer.java | 2 +-
.../configuration/ConfigurationManagerImpl.java | 179 +++----
.../java/com/cloud/consoleproxy/AgentHookBase.java | 5 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 22 +-
.../kvm/discoverer/LibvirtServerDiscoverer.java | 3 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 27 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 38 +-
.../network/guru/ExternalGuestNetworkGuru.java | 2 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 5 +
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 44 +-
.../java/com/cloud/resource/DiscovererBase.java | 2 +-
.../com/cloud/server/ManagementServerImpl.java | 403 +++++++--------
.../main/java/com/cloud/server/StatsCollector.java | 281 ++++++-----
.../com/cloud/servlet/ConsoleProxyClientParam.java | 5 +
.../java/com/cloud/storage/StorageManagerImpl.java | 1 +
.../com/cloud/storage/VolumeApiServiceImpl.java | 244 +++++++++-
.../storage/snapshot/SnapshotManagerImpl.java | 17 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 20 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 132 +----
.../cloudstack/backup/BackupManagerImpl.java | 6 +-
.../consoleproxy/ConsoleAccessManagerImpl.java | 94 ++--
.../network/topology/BasicNetworkVisitor.java | 2 +-
.../configuration/ConfigurationManagerTest.java | 99 +++-
.../consoleproxy/ConsoleProxyManagerTest.java | 23 +
.../com/cloud/network/NetworkServiceImplTest.java | 63 ++-
.../cloud/network/as/AutoScaleManagerImplTest.java | 139 +++---
.../com/cloud/network/vpc/VpcManagerImplTest.java | 5 +
.../java/com/cloud/server/StatsCollectorTest.java | 74 ++-
.../cloud/storage/VolumeApiServiceImplTest.java | 250 ++++++++++
.../storage/snapshot/SnapshotManagerTest.java | 62 ++-
.../cloud/vpc/MockConfigurationManagerImpl.java | 4 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 4 +
.../download/DirectDownloadManagerImplTest.java | 4 +-
.../consoleproxy/ConsoleProxyAjaxHandler.java | 12 +-
.../consoleproxy/ConsoleProxyAjaxImageHandler.java | 10 +-
.../consoleproxy/ConsoleProxyClientParam.java | 5 +
.../cloud/consoleproxy/ConsoleProxyCmdHandler.java | 2 +-
.../ConsoleProxyHttpHandlerHelper.java | 8 +
.../consoleproxy/ConsoleProxyNoVNCHandler.java | 8 +
.../consoleproxy/ConsoleProxyNoVncClient.java | 132 ++++-
.../consoleproxy/ConsoleProxyResourceHandler.java | 6 +-
.../consoleproxy/ConsoleProxyThumbnailHandler.java | 18 +-
.../com/cloud/consoleproxy/vnc/NoVncClient.java | 363 ++++++++++++--
.../com/cloud/consoleproxy/vnc/RfbConstants.java | 5 +-
.../cloud/consoleproxy/vnc/network/NioSocket.java | 123 +++++
.../consoleproxy/vnc/network/NioSocketHandler.java | 45 ++
.../vnc/network/NioSocketHandlerImpl.java | 116 +++++
.../vnc/network/NioSocketInputStream.java | 202 ++++++++
.../vnc/network/NioSocketOutputStream.java | 114 +++++
.../vnc/network/NioSocketSSLEngineManager.java | 191 ++++++++
.../consoleproxy/vnc/network/NioSocketStream.java | 89 ++++
.../vnc/network/NioSocketTLSInputStream.java | 73 +++
.../vnc/network/NioSocketTLSOutputStream.java | 65 +++
.../consoleproxy/vnc/security/NoneVncSecurity.java | 23 +-
.../consoleproxy/vnc/security/VncAuthSecurity.java | 59 +++
.../consoleproxy/vnc/security/VncSecurity.java | 45 ++
.../consoleproxy/vnc/security/VncTLSSecurity.java | 103 ++++
.../consoleproxy/ConsoleProxyNoVncClientTest.java | 32 ++
.../SecondaryStorageManagerImpl.java | 20 +-
.../SecondaryStorageManagerTest.java | 42 +-
.../storage/resource/HttpUploadServerHandler.java | 12 +-
.../resource/NfsSecondaryStorageResource.java | 35 ++
...t-guest-sshkey-password-userdata-configdrive.in | 6 +-
systemvm/agent/noVNC/app/styles/base.css | 6 +
systemvm/agent/noVNC/app/ui.js | 24 +-
systemvm/agent/noVNC/core/rfb.js | 9 +-
systemvm/debian/opt/cloud/bin/passwd_server_ip.py | 4 +-
systemvm/debian/opt/cloud/bin/setup/secstorage.sh | 4 +-
.../integration/component/test_browse_templates.py | 14 +-
test/integration/component/test_browse_volumes.py | 28 +-
.../component/test_edgezone_supportedoperations.py | 133 +++++
.../component/test_interpod_migration.py | 2 +-
test/integration/component/test_project_configs.py | 158 +++---
test/integration/component/test_project_limits.py | 16 +-
.../component/test_project_resources.py | 8 +-
.../component/test_vpc_vms_deployment.py | 4 +-
test/integration/smoke/test_accounts.py | 2 +-
test/integration/smoke/test_metrics_api.py | 178 ++++++-
.../smoke/test_outofbandmanagement_nestedplugin.py | 2 +-
test/integration/smoke/test_primary_storage.py | 14 +-
test/integration/smoke/test_projects.py | 172 +++----
test/integration/smoke/test_vm_life_cycle.py | 83 ++++
test/selenium/smoke/main.py | 2 +-
tools/apidoc/generatecommand.xsl | 2 +-
tools/apidoc/generatecommands.xsl | 2 +-
tools/apidoc/generatetoc_header.xsl | 2 +-
tools/marvin/marvin/lib/ncc.py | 4 +-
tools/marvin/mvn-setup.py | 2 +-
tools/marvin/setup.py | 2 +-
ui/index.html | 2 +-
ui/public/error.html | 2 +-
ui/public/locales/en.json | 27 +-
ui/src/api/index.js | 2 +-
ui/src/components/view/InfoCard.vue | 6 +-
ui/src/components/view/StatsTab.vue | 540 ++++++++++-----------
ui/src/components/view/chart/LineChart.vue | 55 ---
ui/src/components/view/stats/ResourceStatsInfo.vue | 10 +-
.../view/stats/ResourceStatsLineChart.vue | 239 +++++++++
ui/src/config/section/compute.js | 12 +-
ui/src/config/section/infra/routers.js | 5 +
ui/src/config/section/infra/systemVms.js | 6 +
ui/src/config/section/infra/zones.js | 22 +-
ui/src/config/section/network.js | 11 +
ui/src/config/section/storage.js | 13 +
ui/src/core/lazy_lib/components_use.js | 4 +-
ui/src/style/components/view/StatsTab.scss | 5 +-
ui/src/views/AutogenView.vue | 16 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 1 +
ui/src/views/compute/DeployVM.vue | 38 +-
ui/src/views/compute/InstanceTab.vue | 2 +-
ui/src/views/compute/KubernetesServiceTab.vue | 2 +-
ui/src/views/compute/wizard/NetworkSelection.vue | 11 +-
.../views/image/AddKubernetesSupportedVersion.vue | 1 +
ui/src/views/image/RegisterOrUploadIso.vue | 9 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 28 +-
ui/src/views/infra/zone/ZoneWizard.vue | 41 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 45 +-
...TypeStep.vue => ZoneWizardCoreZoneTypeStep.vue} | 13 +
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 21 +-
.../infra/zone/ZoneWizardNetworkSetupStep.vue | 19 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 13 +-
.../views/infra/zone/ZoneWizardZoneDetailsStep.vue | 294 ++++++-----
ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue | 63 +--
ui/src/views/network/CreateIsolatedNetworkForm.vue | 2 +-
ui/src/views/network/CreateL2NetworkForm.vue | 2 +-
ui/src/views/network/CreateNetwork.vue | 49 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 8 +-
ui/src/views/network/CreateVlanIpRange.vue | 1 +
ui/src/views/network/CreateVpc.vue | 4 +-
ui/src/views/storage/UploadLocalVolume.vue | 9 +-
ui/src/views/storage/UploadVolume.vue | 5 +-
utils/src/main/java/com/cloud/utils/LogUtils.java | 24 +
utils/src/main/java/com/cloud/utils/UriUtils.java | 2 +-
.../java/com/cloud/utils/rest/HttpConstants.java | 2 +-
.../cloudstack/utils/bytescale/ByteScaleUtils.java | 10 +
.../test/java/com/cloud/utils/LogUtilsTest.java | 39 ++
.../crypt/EncryptionSecretKeyCheckerTest.java | 2 +-
.../utils/bytescale/ByteScaleUtilsTest.java | 7 +
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 2 +
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 4 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 9 +-
.../vmware/mo/VirtualStorageObjectManagerMO.java | 2 +-
.../hypervisor/vmware/util/VmwareContext.java | 8 +-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 21 +-
.../hypervisor/vmware/util/VmwareHelperTest.java | 56 +++
305 files changed, 8076 insertions(+), 2678 deletions(-)
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/volume/AssignVolumeCmd.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmdTest.java
create mode 100644 core/src/main/java/org/apache/cloudstack/storage/command/MoveVolumeCommand.java
create mode 100644 engine/schema/src/main/java/com/cloud/storage/VolumeStatsVO.java
create mode 100644 engine/schema/src/main/java/com/cloud/storage/dao/VolumeStatsDao.java
create mode 100644 engine/schema/src/main/java/com/cloud/storage/dao/VolumeStatsDaoImpl.java
create mode 100644 engine/schema/src/main/java/com/cloud/vm/ConsoleSessionVO.java
copy ui/src/style/components/view/StatsTab.scss => engine/schema/src/main/java/com/cloud/vm/dao/ConsoleSessionDao.java (73%)
copy core/src/main/java/com/cloud/agent/api/routing/IpAssocVpcCommand.java => engine/schema/src/main/java/com/cloud/vm/dao/ConsoleSessionDaoImpl.java (63%)
create mode 100644 plugins/metrics/src/main/java/org/apache/cloudstack/api/BaseResourceUsageHistoryCmd.java
copy plugins/metrics/src/main/java/org/apache/cloudstack/api/{ListVMsUsageHistoryCmd.java => ListSystemVMsUsageHistoryCmd.java} (67%)
copy plugins/metrics/src/main/java/org/apache/cloudstack/api/{ListVMsUsageHistoryCmd.java => ListVolumesUsageHistoryCmd.java} (60%)
create mode 100644 plugins/metrics/src/main/java/org/apache/cloudstack/response/VolumeMetricsStatsResponse.java
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocket.java
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketHandler.java
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketHandlerImpl.java
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketInputStream.java
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketOutputStream.java
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketSSLEngineManager.java
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketStream.java
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketTLSInputStream.java
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/network/NioSocketTLSOutputStream.java
copy ui/src/style/components/view/StatsTab.scss => services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/security/NoneVncSecurity.java (75%)
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/security/VncAuthSecurity.java
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/security/VncSecurity.java
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/security/VncTLSSecurity.java
create mode 100644 services/console-proxy/server/src/test/java/com/cloud/consoleproxy/ConsoleProxyNoVncClientTest.java
create mode 100644 test/integration/component/test_edgezone_supportedoperations.py
delete mode 100644 ui/src/components/view/chart/LineChart.vue
create mode 100644 ui/src/components/view/stats/ResourceStatsLineChart.vue
copy ui/src/views/infra/zone/{ZoneWizardZoneTypeStep.vue => ZoneWizardCoreZoneTypeStep.vue} (95%)
create mode 100644 utils/src/test/java/com/cloud/utils/LogUtilsTest.java
create mode 100644 vmware-base/src/test/java/com/cloud/hypervisor/vmware/util/VmwareHelperTest.java