You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2023/01/31 10:15:54 UTC
[cloudstack] branch tungsten-integration updated (1d54cd3563d -> 6bc3eec6f77)
This is an automated email from the ASF dual-hosted git repository.
davidjumani pushed a change to branch tungsten-integration
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 1d54cd3563d Merge branch 'main' into tungsten-integration
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 6bc3eec6f77 Merge branch 'main' of github.com:apache/cloudstack into tungsten-integration
No new revisions were added by this update.
Summary of changes:
agent/bindir/cloud-setup-agent.in | 3 +-
api/src/main/java/com/cloud/dc/DataCenter.java | 6 +
.../java/com/cloud/deploy/DeployDestination.java | 8 +-
.../java/com/cloud/network/NetworkService.java | 6 +-
.../java/com/cloud/storage/VolumeApiService.java | 3 +
.../org/apache/cloudstack/api/ApiConstants.java | 6 +
.../api/command/admin/pod/CreatePodCmd.java | 6 +-
.../api/command/admin/zone/CreateZoneCmd.java | 11 +
.../command/user/config/ListCapabilitiesCmd.java | 5 +
.../api/command/user/volume/AssignVolumeCmd.java | 119 +++++
.../api/response/CapabilitiesResponse.java | 32 ++
.../cloudstack/api/response/ZoneResponse.java | 12 +
.../api/command/admin/zone/CreateZoneCmdTest.java | 35 ++
.../java/com/cloud/agent/api/VmDiskStatsEntry.java | 37 ++
.../java/com/cloud/agent/api/VmStatsEntry.java | 12 +-
.../storage/command/MoveVolumeCommand.java | 66 +++
.../java/com/cloud/vm/VirtualMachineManager.java | 22 +
.../subsystem/api/storage/EndPointSelector.java | 2 +
.../subsystem/api/storage/VolumeService.java | 4 +
.../cloud/configuration/ConfigurationManager.java | 6 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 109 ++++-
.../entity/api/db/EngineDataCenterVO.java | 10 +
.../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 +
.../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 +++++
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-41720to41800.sql | 64 ++-
.../storage/endpoint/DefaultEndPointSelector.java | 12 +-
.../storage/volume/VolumeServiceImpl.java | 59 ++-
.../kvm/resource/LibvirtComputingResource.java | 37 +-
.../cloud/agent/manager/MockAgentManagerImpl.java | 12 +-
.../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 +-
.../contrail/management/ManagementServerMock.java | 2 +-
python/lib/cloudutils/serviceConfig.py | 20 +
scripts/util/keystore-cert-import | 6 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 10 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 9 +
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 2 +
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 +-
.../com/cloud/api/query/vo/DataCenterJoinVO.java | 9 +
.../configuration/ConfigurationManagerImpl.java | 153 +++---
.../consoleproxy/ConsoleProxyManagerImpl.java | 22 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 25 +
.../com/cloud/network/as/AutoScaleManagerImpl.java | 38 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 5 +
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 4 +
.../com/cloud/server/ManagementServerImpl.java | 403 +++++++--------
.../main/java/com/cloud/server/StatsCollector.java | 281 ++++++-----
.../com/cloud/servlet/ConsoleProxyClientParam.java | 5 +
.../com/cloud/storage/VolumeApiServiceImpl.java | 141 +++++-
.../storage/snapshot/SnapshotManagerImpl.java | 17 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 20 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 108 -----
.../consoleproxy/ConsoleAccessManagerImpl.java | 61 ++-
.../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 | 191 +++++++-
.../storage/snapshot/SnapshotManagerTest.java | 62 ++-
.../cloud/vpc/MockConfigurationManagerImpl.java | 4 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 4 +
.../consoleproxy/ConsoleProxyAjaxHandler.java | 2 +
.../consoleproxy/ConsoleProxyAjaxImageHandler.java | 2 +
.../consoleproxy/ConsoleProxyClientParam.java | 5 +
.../ConsoleProxyHttpHandlerHelper.java | 8 +
.../consoleproxy/ConsoleProxyNoVNCHandler.java | 8 +
.../consoleproxy/ConsoleProxyNoVncClient.java | 132 ++++-
.../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 | 40 +-
.../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 +-
.../resource/NfsSecondaryStorageResource.java | 35 ++
systemvm/agent/noVNC/app/styles/base.css | 6 +
systemvm/agent/noVNC/app/ui.js | 24 +-
systemvm/agent/noVNC/core/rfb.js | 9 +-
.../component/test_edgezone_supportedoperations.py | 133 +++++
.../component/test_interpod_migration.py | 2 +-
test/integration/smoke/test_metrics_api.py | 178 ++++++-
test/integration/smoke/test_vm_life_cycle.py | 83 ++++
ui/public/locales/en.json | 31 +-
ui/src/components/view/InfoCard.vue | 2 +-
ui/src/components/view/StatsTab.vue | 540 ++++++++++-----------
ui/src/components/view/stats/ResourceStatsInfo.vue | 10 +-
.../view/stats/ResourceStatsLineChart.vue | 239 +++++++++
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/storage.js | 6 +
ui/src/core/lazy_lib/components_use.js | 4 +-
ui/src/style/components/view/StatsTab.scss | 5 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 1 +
ui/src/views/compute/InstanceTab.vue | 2 +-
.../views/image/AddKubernetesSupportedVersion.vue | 1 +
ui/src/views/image/RegisterOrUploadIso.vue | 1 +
ui/src/views/image/RegisterOrUploadTemplate.vue | 20 +-
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/storage/UploadLocalVolume.vue | 1 +
ui/src/views/storage/UploadVolume.vue | 5 +-
.../cloudstack/utils/bytescale/ByteScaleUtils.java | 10 +
.../utils/bytescale/ByteScaleUtilsTest.java | 7 +
139 files changed, 5887 insertions(+), 1466 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 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
rename ui/src/components/view/chart/LineChart.vue => services/console-proxy/server/src/main/java/com/cloud/consoleproxy/vnc/security/NoneVncSecurity.java (51%)
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
create mode 100644 ui/src/components/view/stats/ResourceStatsLineChart.vue
copy ui/src/views/infra/zone/{ZoneWizardZoneTypeStep.vue => ZoneWizardCoreZoneTypeStep.vue} (95%)