This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a change to branch 4.18-vm-autoscaling
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from c5c96948fa1 AS server: replace by CATEGORY_ADVANCED and CATEGORY_ALERT
add 20950e0e1d5 jacoco: fix no coverage result in server and some other
modules (#6730)
add 68c09f92d17 Merge remote-tracking branch 'origin/4.17'
add a45a4a5218d upgrade a backported patch (#6728)
add e8b249f11d5 server: fix netowork upgrade for IPv6 (#6729)
add 77df050160d Reset unusable db connections (#6725)
add fa34d687668 Merge remote-tracking branch 'apache/4.16' into 4.17
add 9c2a462d1a7 Merge remote-tracking branch 'apache/4.17' into main
add 7be7ef66fb3 Improve error message on storage tags update (#6269)
add b2fbe7bb121 console: Console access enhancements (#6577)
add ba35437da7d UI: Build Dockerfile with Node v14 (#6712)
add 14656733d81 Fix min balance for API quotaCredits to be optional (#6691)
add c3d6f42dd9d UI fix Theme text color not bind navTextColorPick and
reset button (#6721)
add bf4e9059dd6 Merge remote-tracking branch 'apache/4.17' into main
add 103ae747734 Merge remote-tracking branch 'apache/main' into
4.18-vm-autoscaling
add 35f1a026ee8 AS: fix build error after merging main branch
No new revisions were added by this update.
Summary of changes:
.../consoleproxy/ConsoleProxyResource.java | 24 +-
.../command/user/consoleproxy/ConsoleEndpoint.java | 103 +++++
.../consoleproxy/CreateConsoleEndpointCmd.java | 120 +++++
.../response/ConsoleEndpointWebsocketResponse.java | 88 ++++
...nse.java => CreateConsoleEndpointResponse.java} | 50 ++-
.../consoleproxy/ConsoleAccessManager.java | 23 +-
.../api/ConsoleAccessAuthenticationCommand.java | 13 +-
.../AllowConsoleAccessCommand.java} | 31 +-
.../com/cloud/info/ConsoleProxyConnectionInfo.java | 9 +
.../main/java/com/cloud/info/ConsoleProxyInfo.java | 9 +
.../java/com/cloud/info/ConsoleProxyStatus.java | 5 +
.../main/java/com/cloud/storage/dao/VolumeDao.java | 8 +
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 13 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 8 +-
.../resources/META-INF/db/schema-41610to41700.sql | 5 +-
.../cloudstack/framework/config/ConfigKey.java | 7 +-
.../com/cloud/utils/db/ConnectionConcierge.java | 8 +-
.../cloudstack/api/command/QuotaCreditsCmd.java | 3 -
server/src/main/java/com/cloud/api/ApiServlet.java | 12 +
.../configuration/ConfigurationManagerImpl.java | 12 +-
.../AgentBasedConsoleProxyManager.java | 16 +-
.../java/com/cloud/consoleproxy/AgentHookBase.java | 19 +-
.../cloud/consoleproxy/ConsoleProxyManager.java | 42 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 34 +-
.../java/com/cloud/network/Ipv6ServiceImpl.java | 2 +-
.../java/com/cloud/server/ManagementServer.java | 4 +
.../com/cloud/server/ManagementServerImpl.java | 46 ++
.../com/cloud/servlet/ConsoleProxyClientParam.java | 37 ++
.../com/cloud/servlet/ConsoleProxyServlet.java | 220 +--------
.../consoleproxy/ConsoleAccessManagerImpl.java | 494 +++++++++++++++++++++
.../core/spring-server-core-managers-context.xml | 2 +
.../test/java/com/cloud/api/ApiServletTest.java | 2 +-
.../configuration/ConfigurationManagerTest.java | 60 +++
.../com/cloud/network/Ipv6ServiceImplTest.java | 10 +-
.../consoleproxy/ConsoleAccessManagerImplTest.java | 109 +++++
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 43 +-
.../com/cloud/consoleproxy/ConsoleProxyClient.java | 2 +
.../cloud/consoleproxy/ConsoleProxyClientBase.java | 6 +
.../consoleproxy/ConsoleProxyClientParam.java | 37 ++
.../ConsoleProxyClientStatsCollector.java | 17 +
.../cloud/consoleproxy/ConsoleProxyGCThread.java | 10 +-
.../ConsoleProxyHttpHandlerHelper.java | 12 +-
.../consoleproxy/ConsoleProxyNoVNCHandler.java | 9 +-
.../consoleproxy/ConsoleProxyNoVNCServer.java | 24 +-
.../consoleproxy/ConsoleProxyNoVncClient.java | 7 +
.../ConsoleProxyHttpHandlerHelperTest.java | 51 +++
systemvm/agent/noVNC/app/ui.js | 11 +-
systemvm/agent/noVNC/vnc.html | 4 +
systemvm/debian/opt/cloud/bin/setup/common.sh | 3 +
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 5 +
systemvm/patch-sysvms.sh | 8 +-
test/integration/smoke/test_console_endpoint.py | 123 +++++
tools/apidoc/gen_toc.py | 3 +-
ui/Dockerfile | 2 +-
ui/package.json | 1 +
ui/src/components/view/Setting.vue | 3 +-
ui/src/components/widgets/Console.vue | 50 ++-
.../utils/consoleproxy/ConsoleAccessUtils.java | 9 +-
58 files changed, 1736 insertions(+), 352 deletions(-)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/ConsoleEndpoint.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/CreateConsoleEndpointCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/ConsoleEndpointWebsocketResponse.java
copy
api/src/main/java/org/apache/cloudstack/api/response/{UnmanageVMInstanceResponse.java
=> CreateConsoleEndpointResponse.java} (55%)
copy
engine/schema/src/main/java/com/cloud/configuration/ManagementServiceConfiguration.java
=>
api/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManager.java
(55%)
copy core/src/main/java/com/cloud/agent/api/{GetVmConfigCommand.java =>
proxy/AllowConsoleAccessCommand.java} (68%)
create mode 100644
server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java
create mode 100644
server/src/test/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImplTest.java
create mode 100644
services/console-proxy/server/src/test/java/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelperTest.java
create mode 100644 test/integration/smoke/test_console_endpoint.py
copy
engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/type/Unknown.java
=>
utils/src/main/java/org/apache/cloudstack/utils/consoleproxy/ConsoleAccessUtils.java
(80%)