Skip to content

noVNC: fix JP keyboard on vmware7+ which uses websocket URL#7694

Merged
weizhouapache merged 4 commits intoapache:4.18from
weizhouapache:4.18-fix-novnc-jp-keyboard-on-vmware7
Aug 9, 2023
Merged

noVNC: fix JP keyboard on vmware7+ which uses websocket URL#7694
weizhouapache merged 4 commits intoapache:4.18from
weizhouapache:4.18-fix-novnc-jp-keyboard-on-vmware7

Conversation

@weizhouapache
Copy link
Copy Markdown
Member

@weizhouapache weizhouapache commented Jun 27, 2023

Description

This PR fixes the type error on novnc console of VM on VMware7 which uses Japanese layout.

The other languages layout can be fixed by similar solution.

This PR fixes and closes #7335

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

@boring-cyborg boring-cyborg bot added component:console-proxy Python Warning... Python code Ahead! labels Jun 27, 2023
@weizhouapache
Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@weizhouapache a [SF] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@weizhouapache weizhouapache force-pushed the 4.18-fix-novnc-jp-keyboard-on-vmware7 branch from 874ef3f to f8a3fbc Compare June 27, 2023 09:01
Copy link
Copy Markdown
Member

@yadvr yadvr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change LGTM, didn't test them. I like the overall approach to get/pass the language details from the User VM and have noVNC codebase interpret the keyboard per the passed lang.

However, we need to be careful the next time we upgrade noVNC (to not revert such changes to novnc). Does it make sense to have a novnc fork somewhere (similar to cloudstack-nonoss/noredist repo)?

@yadvr yadvr added this to the 4.18.1.0 milestone Jun 27, 2023
@blueorangutan
Copy link
Copy Markdown

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6346

@codecov
Copy link
Copy Markdown

codecov bot commented Jun 27, 2023

Codecov Report

Merging #7694 (fb319d2) into 4.18 (9e1609d) will decrease coverage by 0.01%.
The diff coverage is 3.53%.

@@             Coverage Diff              @@
##               4.18    #7694      +/-   ##
============================================
- Coverage     13.01%   13.01%   -0.01%     
- Complexity     9011     9015       +4     
============================================
  Files          2716     2719       +3     
  Lines        256656   256856     +200     
  Branches      40021    40049      +28     
============================================
+ Hits          33410    33418       +8     
- Misses       219060   219251     +191     
- Partials       4186     4187       +1     
Impacted Files Coverage Δ
.../src/main/java/com/cloud/host/dao/HostDaoImpl.java 27.85% <0.00%> (-0.59%) ⬇️
...main/java/com/cloud/storage/dao/VolumeDaoImpl.java 23.23% <0.00%> (-0.39%) ⬇️
...en/api/command/ConfigTungstenFabricServiceCmd.java 0.00% <ø> (ø)
...api/storage/StorPoolSetVolumeEncryptionAnswer.java 0.00% <0.00%> (ø)
...pi/storage/StorPoolSetVolumeEncryptionCommand.java 0.00% <0.00%> (ø)
...per/StorPoolSetVolumeEncryptionCommandWrapper.java 0.00% <0.00%> (ø)
...tastore/driver/StorPoolPrimaryDataStoreDriver.java 0.00% <0.00%> (ø)
...ack/storage/motion/StorPoolDataMotionStrategy.java 0.00% <0.00%> (ø)
...oud/network/element/ConfigDriveNetworkElement.java 26.79% <0.00%> (-0.26%) ⬇️
...n/java/com/cloud/resource/ResourceManagerImpl.java 0.00% <0.00%> (ø)
... and 2 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jun 28, 2023

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@rohityadavcloud a [SF] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6361

@weizhouapache
Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@weizhouapache a [SF] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6362

Copy link
Copy Markdown
Contributor

@nvazquez nvazquez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code LGTM, thanks @weizhouapache

@weizhouapache
Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@weizhouapache a [SF] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6517

@weizhouapache
Copy link
Copy Markdown
Member Author

@blueorangutan test r8 vmware-70u3

@blueorangutan
Copy link
Copy Markdown

@weizhouapache [SF] unsupported parameters provided. Supported mgmt server os are: centos7, centos6, suse15, alma8, ubuntu18, ubuntu22, ubuntu20, rocky8, alma9. Supported hypervisors are: kvm-centos6, kvm-centos7, kvm-rocky8, kvm-alma8, kvm-alma9, kvm-ubuntu18, kvm-ubuntu20, kvm-ubuntu22, kvm-suse15, vmware-55u3, vmware-60u2, vmware-65u2, vmware-67u3, vmware-70u1, vmware-70u2, vmware-70u3, vmware-80, vmware-80u1, xenserver-65sp1, xenserver-71, xenserver-74, xcpng74, xcpng76, xcpng80, xcpng81, xcpng82

@weizhouapache
Copy link
Copy Markdown
Member Author

@blueorangutan test rocky8 vmware-70u3

@blueorangutan
Copy link
Copy Markdown

@weizhouapache a [SF] Trillian-Jenkins test job (rocky8 mgmt + vmware-70u3) has been kicked to run smoke tests

@blueorangutan
Copy link
Copy Markdown

[SF] Trillian test result (tid-7128)
Environment: vmware-70u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 43627 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7694-t7128-vmware-70u3.zip
Smoke tests completed. 108 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File

Copy link
Copy Markdown
Contributor

@andrijapanicsb andrijapanicsb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after testing.

The only difference is when pressing shift + 0 (shift and zero):

  • in vCenter is sends key ~ (even though my onscreen keyboard layout specifies NO key)
  • in noVNC console - it doesn't send any key (as expected by my keyboard layout)

Layout below:
image

@weizhouapache
Copy link
Copy Markdown
Member Author

thanks @andrijapanicsb for testing
let's merge this PR and wait for Japanese users to confirm. If it is a bug, we will fix it later (could be a very simple fix)

@weizhouapache weizhouapache marked this pull request as ready for review August 9, 2023 09:42
@weizhouapache weizhouapache merged commit a1af03f into apache:4.18 Aug 9, 2023
@DaanHoogland DaanHoogland deleted the 4.18-fix-novnc-jp-keyboard-on-vmware7 branch August 10, 2023 08:32
DaanHoogland added a commit that referenced this pull request Aug 10, 2023
* 4.18:
  server: remove registered userdata when cleanup an account (#7777)
  server: Use max secondary storage defined on the account during upload  (#7441)
  test: upgrade kubernetes versions to 1.25.0/1.26.0 (#7685)
  kvm: Added VNI Devices as normal bridge slave devs (#7836)
  noVNC: fix JP keyboard on vmware7+ which uses websocket URL (#7694)
weizhouapache added a commit to weizhouapache/cloudstack that referenced this pull request Sep 4, 2023
weizhouapache added a commit to weizhouapache/cloudstack that referenced this pull request Sep 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

component:console-proxy Python Warning... Python code Ahead!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants