This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from a69bf67 Merge remote-tracking branch 'origin/4.15'
add f00b5fc server: Fix for the issue of recover VM not able to attach
the data disks which are there before destroy in case of VMware (#4493)
add 50da578 test: reduce vr traceroute hops (#4913)
add 8fec222 ui: fix not find tab name due to language other than English
(#4920)
add 0302750 vmware: Add support for VMware 7 (#4300)
new f420247 Merge remote-tracking branch 'origin/4.15'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...ontrolAnswer.java => GetVmVncTicketAnswer.java} | 17 +--
...uterCommand.java => GetVmVncTicketCommand.java} | 19 ++--
.../engine/orchestration/VolumeOrchestrator.java | 7 ++
.../resources/META-INF/db/schema-41500to41510.sql | 78 +++++++++++++-
.../hypervisor/vmware/resource/VmwareResource.java | 25 +++++
pom.xml | 2 +-
.../com/cloud/servlet/ConsoleProxyClientParam.java | 9 ++
.../com/cloud/servlet/ConsoleProxyServlet.java | 62 +++++++++++
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 8 +-
services/console-proxy/server/pom.xml | 5 +
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 6 ++
.../consoleproxy/ConsoleProxyClientParam.java | 9 ++
.../ConsoleProxyHttpHandlerHelper.java | 4 +
.../consoleproxy/ConsoleProxyNoVNCHandler.java | 2 +
.../consoleproxy/ConsoleProxyNoVncClient.java | 105 +++++++++++-------
.../com/cloud/consoleproxy/vnc/NoVncClient.java | 37 ++++++-
.../websocket/WebSocketReverseProxy.java | 118 +++++++++++++++++++++
test/integration/smoke/test_diagnostics.py | 12 +--
.../views/network/IngressEgressRuleConfigure.vue | 2 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 12 +++
20 files changed, 468 insertions(+), 71 deletions(-)
copy core/src/main/java/com/cloud/agent/api/{AgentControlAnswer.java =>
GetVmVncTicketAnswer.java} (73%)
copy core/src/main/java/com/cloud/agent/api/{CheckRouterCommand.java =>
GetVmVncTicketCommand.java} (77%)
create mode 100644
services/console-proxy/server/src/main/java/com/cloud/consoleproxy/websocket/WebSocketReverseProxy.java
