CLOUDSTACK-10051 Mouse Scrolling is not working in instance VM console by vedulasantosh · Pull Request #2240 · apache/cloudstack

vedulasantosh · 2017-08-21T09:27:10Z

When mouse is scrolled in VM Console it is not working.

yadvr · 2017-08-21T10:55:24Z

@@ -0,0 +1,336 @@
+/*


@vedulasantosh license?

@rhtyd Updated the license. Added the Apache license on top of Jquery license. Is it acceptable?

@rhtyd can you review this license

@vedulasantosh if the license used in this specific library are same as those used by other jquery files then I suppose we should be okay, however can you start a discussion on dev@?

@rhtyd for all other jquery files there is no apache license because they are placed in exclude tag in pom.xml. while pushing this jquery.flot.navigate.js checks are failing at license. That is why i added apache license to this file.
pom.xml
<exclude>ui/lib/flot/jquery.flot.js</exclude> <exclude>ui/lib/flot/jquery.flot.navigate.js</exclude> <exclude>ui/lib/flot/jquery.flot.pie.js</exclude> <exclude>ui/lib/flot/jquery.flot.resize.js</exclude> <exclude>ui/lib/flot/jquery.flot.selection.js</exclude> <exclude>ui/lib/flot/jquery.flot.stack.js</exclude> <exclude>ui/lib/flot/jquery.flot.symbol.js</exclude> <exclude>ui/lib/flot/jquery.flot.threshold.js</exclude> <exclude>ui/lib/jquery-ui/css/jquery-ui.css</exclude> <exclude>ui/lib/jquery-ui/index.html</exclude> <exclude>ui/lib/jquery-ui/js/jquery-ui.js</exclude> <exclude>ui/lib/jquery.cookies.js</exclude> <exclude>ui/lib/jquery.easing.js</exclude> <exclude>ui/lib/jquery.js</exclude> <exclude>ui/lib/jquery.md5.js</exclude> <exclude>ui/lib/jquery.validate.js</exclude> <exclude>ui/lib/jquery.tokeninput.js</exclude> <exclude>ui/lib/qunit/qunit.css</exclude> <exclude>ui/lib/qunit/qunit.js</exclude> <exclude>ui/lib/reset.css</exclude> <exclude>ui/lib/require.js</exclude> <exclude>utils/testsmallfileinactive</exclude> <exclude>systemvm/conf/agent.properties</exclude> <exclude>systemvm/conf/environment.properties</exclude> <exclude>systemvm/js/jquery.js</exclude>
systemvm/js/jquery.js
`/*
jQuery JavaScript Library v1.3.2
http://jquery.com/
Copyright (c) 2009 John Resig
Dual licensed under the MIT and GPL licenses.
http://docs.jquery.com/License
Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
Revision: 6246
/
(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<](<(.|\s)+>)[^>]$|^#([\w-]+)$/,f=/^.[^:#\[\.,]$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType)`

@vedulasantosh if the existing jquery library files have the same license as the new one you're adding, then yes you may exclude this file from RAT checks, this makes sense. However, I'm not the expert around licensing, please start a conversation on dev@ to discuss this further.

@rhtyd Made discussion on dev@. Got reply to add exclude tag for the jquery file.so I added the exclude tag in pom.xml for that file.

@rhtyd can you please review these changes.

@rhtyd can you please review these changes. need to merge this PR.

@vedulasantosh sure, add this new library dependency in maven exclusion list, however, then remove the Apache license unless you authored this library.

yadvr · 2017-08-21T10:55:44Z

@vedulasantosh check/fix the Travis failures

cloudmonger · 2017-08-26T22:37:09Z

ACS CI BVT Run

Sumarry:
Build Number 1150
Hypervisor xenserver
NetworkType Advanced
Passed=108
Failed=6
Skipped=12

Link to logs Folder (search by build_no):https://www.dropbox.com/sh/r2si930m8xxzavs/AAAzNrnoF1fC3auFrvsKo_8-a?dl=0

Failed tests:

test_volumes.py
test_06_download_detached_volume Failed
test_routers_network_ops.py
test_01_isolate_network_FW_PF_default_routes_egress_true Failing since 15 runs
test_02_isolate_network_FW_PF_default_routes_egress_false Failing since 142 runs
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true Failing since 137 runs
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false Failing since 137 runs
test_03_RVR_Network_check_router_state Failed

Skipped tests:
test_vm_nic_adapter_vmxnet3
test_01_verify_libvirt
test_02_verify_libvirt_after_restart
test_03_verify_libvirt_attach_disk
test_04_verify_guest_lspci
test_05_change_vm_ostype_restart
test_06_verify_guest_lspci_again
test_static_role_account_acls
test_11_ss_nfs_version_on_ssvm
test_nested_virtualization_vmware
test_3d_gpu_support
test_deploy_vgpu_enabled_vm

Passed test suits:
test_deploy_vm_with_userdata.py
test_affinity_groups_projects.py
test_portable_publicip.py
test_vm_snapshots.py
test_over_provisioning.py
test_global_settings.py
test_router_dnsservice.py
test_scale_vm.py
test_service_offerings.py
test_routers_iptables_default_policy.py
test_loadbalance.py
test_routers.py
test_reset_vm_on_reboot.py
test_deploy_vms_with_varied_deploymentplanners.py
test_network.py
test_router_dns.py
test_non_contigiousvlan.py
test_login.py
test_deploy_vm_iso.py
test_list_ids_parameter.py
test_public_ip_range.py
test_multipleips_per_nic.py
test_metrics_api.py
test_regions.py
test_affinity_groups.py
test_network_acl.py
test_pvlan.py
test_nic.py
test_deploy_vm_root_resize.py
test_resource_detail.py
test_secondary_storage.py
test_vm_life_cycle.py
test_disk_offerings.py

SowjanyaPatha · 2017-08-31T05:11:02Z

LGTM for Testing. Created an Ubuntu instance and verified for Mouse scrolling.

yadvr · 2017-08-31T07:41:21Z

@blueorangutan package

blueorangutan · 2017-08-31T07:42:08Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2017-08-31T08:16:46Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1053

sureshanaparti · 2017-09-12T06:30:14Z

+specific language governing permissions and limitations
+under the License.
+*/
+


@vedulasantosh This is a third party code under MIT license. Check on the licensing part whether to add ASF license on the top of that or not.

sureshanaparti · 2017-09-12T06:31:54Z

+	onMouseScroll: function(x, y, whichButton, modifiers) {
+ this.sendMouseEvent(AjaxViewer.MOUSE_SCROLL, x, y, whichButton, modifiers);
+ },
+


@vedulasantosh Address @rhtyd comments. Code changes LGTM.

yadvr · 2017-10-31T09:37:02Z

+ var sd = e.originalEvent.detail/3;
+
+ var pt = ajaxViewer.pageToPanel(e.clientX, e.clientY);
+


Remove extra newline.

yadvr · 2017-10-31T09:37:32Z

 });
+
+ target.bind('mousewheel DOMMouseScroll',function(e) {
+ if(!ajaxViewer.ptInPanel(e.pageX, e.pageY))


Can you consider adding braces to if () {}

yadvr · 2017-10-31T09:40:18Z

Thanks @vedulasantosh for your PR, since these are purely UI changes we'll need an additional review/LGTM testing that can confirm the UI fix. Regression testing is not strictly required to merge this change.

This is compatible with Apache 2.0 license, however, new dependencies should not be stripped of their original license headers.

yadvr · 2017-11-05T16:35:07Z

I went ahead and added the missing license from the newly added file.
@blueorangutan package

blueorangutan · 2017-11-05T16:35:25Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2017-11-05T16:58:51Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1209

yadvr · 2017-11-05T19:30:23Z

@blueorangutan test

blueorangutan · 2017-11-05T19:31:24Z

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2017-11-06T04:22:38Z

Trillian test result (tid-1620)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31873 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2240-t1620-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_host_annotations.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Test completed. 59 look OK, 4 have error(s)

Test	Result	Time (s)	Test File
test_01_vpc_remote_access_vpn	`Failure`	55.84	test_vpc_vpn.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL	`Failure`	383.60	test_vpc_redundant.py
test_04_rvpc_privategw_static_routes	`Failure`	288.75	test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup	`Failure`	172.94	test_privategw_acl.py
test_02_vpc_privategw_static_routes	`Failure`	162.81	test_privategw_acl.py
test_01_vpc_privategw_acl	`Failure`	56.78	test_privategw_acl.py
test_05_add_annotation_for_invalid_entityType	`Error`	0.06	test_host_annotations.py
test_change_service_offering_for_vm_with_snapshots	Skipped	0.00	test_vm_snapshots.py
test_09_copy_delete_template	Skipped	0.01	test_templates.py
test_06_copy_template	Skipped	0.00	test_templates.py
test_static_role_account_acls	Skipped	0.02	test_staticroles.py
test_11_ss_nfs_version_on_ssvm	Skipped	0.02	test_ssvm.py
test_01_scale_vm	Skipped	0.00	test_scale_vm.py
test_01_primary_storage_iscsi	Skipped	0.08	test_primary_storage.py
test_vm_nic_adapter_vmxnet3	Skipped	0.00	test_nic_adapter_type.py
test_03_nic_multiple_vmware	Skipped	1.03	test_nic.py
test_nested_virtualization_vmware	Skipped	0.00	test_nested_virtualization.py
test_06_copy_iso	Skipped	0.00	test_iso.py
test_list_ha_for_host_valid	Skipped	0.02	test_hostha_simulator.py
test_list_ha_for_host_invalid	Skipped	0.02	test_hostha_simulator.py
test_list_ha_for_host	Skipped	0.02	test_hostha_simulator.py
test_hostha_enable_feature_without_setting_provider	Skipped	0.02	test_hostha_simulator.py
test_hostha_enable_feature_valid	Skipped	0.02	test_hostha_simulator.py
test_hostha_disable_feature_valid	Skipped	0.02	test_hostha_simulator.py
test_hostha_configure_invalid_provider	Skipped	0.02	test_hostha_simulator.py
test_hostha_configure_default_driver	Skipped	0.03	test_hostha_simulator.py
test_ha_verify_fsm_recovering	Skipped	0.02	test_hostha_simulator.py
test_ha_verify_fsm_fenced	Skipped	0.02	test_hostha_simulator.py
test_ha_verify_fsm_degraded	Skipped	0.02	test_hostha_simulator.py
test_ha_verify_fsm_available	Skipped	0.02	test_hostha_simulator.py
test_ha_multiple_mgmt_server_ownership	Skipped	0.02	test_hostha_simulator.py
test_ha_list_providers	Skipped	0.02	test_hostha_simulator.py
test_ha_enable_feature_invalid	Skipped	0.02	test_hostha_simulator.py
test_ha_disable_feature_invalid	Skipped	0.02	test_hostha_simulator.py
test_ha_configure_enabledisable_across_clusterzones	Skipped	0.02	test_hostha_simulator.py
test_configure_ha_provider_valid	Skipped	0.02	test_hostha_simulator.py
test_configure_ha_provider_invalid	Skipped	0.02	test_hostha_simulator.py
test_deploy_vgpu_enabled_vm	Skipped	0.03	test_deploy_vgpu_enabled_vm.py
test_3d_gpu_support	Skipped	0.03	test_deploy_vgpu_enabled_vm.py

yadvr · 2017-11-06T04:27:47Z

tests LGTM, some failures are known intermittent failures comparing against #2289

yadvr reviewed Aug 21, 2017
View reviewed changes

sureshanaparti reviewed Sep 12, 2017
View reviewed changes

CLOUDSTACK-10051 Mouse Scrolling is not working in instance VM console
4044398

yadvr reviewed Oct 31, 2017
View reviewed changes

Don't Strip license from externally added files
de5cfc5
This is compatible with Apache 2.0 license, however, new dependencies should not be stripped of their original license headers.

yadvr merged commit 2874fc2 into apache:masterNov 6, 2017

		var sd = e.originalEvent.detail/3;

		var pt = ajaxViewer.pageToPanel(e.clientX, e.clientY);

Uh oh!

Conversation

vedulasantosh commented Aug 21, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yadvrSep 22, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yadvr commented Aug 21, 2017

Uh oh!

cloudmonger commented Aug 26, 2017

ACS CI BVT Run

Uh oh!

SowjanyaPatha commented Aug 31, 2017

Uh oh!

yadvr commented Aug 31, 2017

Uh oh!

blueorangutan commented Aug 31, 2017

Uh oh!

blueorangutan commented Aug 31, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sureshanapartiSep 12, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yadvr commented Oct 31, 2017

Uh oh!

yadvr commented Nov 5, 2017

Uh oh!

blueorangutan commented Nov 5, 2017

Uh oh!

blueorangutan commented Nov 5, 2017

Uh oh!

yadvr commented Nov 5, 2017

Uh oh!

blueorangutan commented Nov 5, 2017

Uh oh!

blueorangutan commented Nov 6, 2017

Uh oh!

yadvr commented Nov 6, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

yadvrSep 22, 2017•
edited
Loading

sureshanapartiSep 12, 2017•
edited
Loading