You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by sateesh-chodapuneedi <gi...@git.apache.org> on 2016/12/23 15:07:01 UTC
[GitHub] cloudstack pull request #1862: CLOUDSTACK-9704 Remove dependency on VmwareCo...
GitHub user sateesh-chodapuneedi opened a pull request:
https://github.com/apache/cloudstack/pull/1862
CLOUDSTACK-9704 Remove dependency on VmwareContext object to fetch systemVM keyfile
Jira
===
CLOUDSTACK-9704 Remove dependency on VmwareContext object to fetch system VM key file
Description
========
While remote executing commands/scripts through SSH in VR, ACS uses system vm keyfile.
ACS is fetching this key file using VMwareContext object which encapsulates vCenter connection handle.
This is inefficient because of dependency on getServiceContext() which means a vCenter connection
handle which is not required just to fetch a file in name space in management server.
Fix
===
Implement a method to fetch system vm key file by using Script class instead of VmwareManagerImpl. Ensure this implementation is not present in VmwareManagerImpl itself because fetching the manager object from VmwareContext object unnecessarily adds dependency on session object just to search for keyfile in class path.
Signed-off-by: Sateesh Chodapuneedi <sa...@accelerite.com>
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/sateesh-chodapuneedi/cloudstack pr-cloudstack-9704
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1862.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1862
----
commit 02bd90c424966c81c57bed9b8fc9f530e0b97b7d
Author: Sateesh Chodapuneedi <sa...@accelerite.com>
Date: 2016-12-23T02:17:43Z
CLOUDSTACK-9704 Remove dependency on VmwareContext object to fetch system VM key file
While remote executing commands/scripts through SSH in VR, ACS uses system vm keyfile.
ACS is fetching this key file using VMwareContext object which encapsulates vCenter connection handle.
This is inefficient because of dependency on getServiceContext() which means a vCenter connection
handle which is not required just to fetch a file in name space in management server.
Signed-off-by: Sateesh Chodapuneedi <sa...@accelerite.com>
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by sateesh-chodapuneedi <gi...@git.apache.org>.
Github user sateesh-chodapuneedi commented on the issue:
https://github.com/apache/cloudstack/pull/1862
@borisstoyanov Can you please run trillian tests for this PR?
This already has enough code LGTMs, and needs tests for merge.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by blueorangutan <gi...@git.apache.org>.
Github user blueorangutan commented on the issue:
https://github.com/apache/cloudstack/pull/1862
<b>Trillian test result (tid-924)</b>
Environment: vmware-60u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 40322 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1862-t924-vmware-60u2.zip
Intermitten failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermitten failure detected: /marvin/tests/smoke/test_snapshots.py
Intermitten failure detected: /marvin/tests/smoke/test_vm_snapshots.py
Test completed. 46 look ok, 3 have error(s)
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_01_test_vm_volume_snapshot | `Failure` | 211.24 | test_vm_snapshots.py
test_04_rvpc_privategw_static_routes | `Failure` | 741.12 | test_privategw_acl.py
test_02_list_snapshots_with_removed_data_store | `Error` | 105.78 | test_snapshots.py
test_02_list_snapshots_with_removed_data_store | `Error` | 110.86 | test_snapshots.py
ContextSuite context=TestSnapshotRootDisk>:teardown | `Error` | 136.07 | test_snapshots.py
test_01_vpc_site2site_vpn | Success | 329.86 | test_vpc_vpn.py
test_01_vpc_remote_access_vpn | Success | 141.14 | test_vpc_vpn.py
test_01_redundant_vpc_site2site_vpn | Success | 525.87 | test_vpc_vpn.py
test_02_VPC_default_routes | Success | 358.07 | test_vpc_router_nics.py
test_01_VPC_nics_after_destroy | Success | 677.12 | test_vpc_router_nics.py
test_05_rvpc_multi_tiers | Success | 572.41 | test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nics | Success | 1476.57 | test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | Success | 701.34 | test_vpc_redundant.py
test_02_redundant_VPC_default_routes | Success | 547.22 | test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | Success | 1286.47 | test_vpc_redundant.py
test_09_delete_detached_volume | Success | 20.61 | test_volumes.py
test_06_download_detached_volume | Success | 40.32 | test_volumes.py
test_05_detach_volume | Success | 100.24 | test_volumes.py
test_04_delete_attached_volume | Success | 10.14 | test_volumes.py
test_03_download_attached_volume | Success | 15.22 | test_volumes.py
test_02_attach_volume | Success | 48.77 | test_volumes.py
test_01_create_volume | Success | 505.95 | test_volumes.py
test_change_service_offering_for_vm_with_snapshots | Success | 417.14 | test_vm_snapshots.py
test_03_delete_vm_snapshots | Success | 275.18 | test_vm_snapshots.py
test_02_revert_vm_snapshots | Success | 221.96 | test_vm_snapshots.py
test_01_create_vm_snapshots | Success | 161.66 | test_vm_snapshots.py
test_deploy_vm_multiple | Success | 186.64 | test_vm_life_cycle.py
test_deploy_vm | Success | 0.02 | test_vm_life_cycle.py
test_advZoneVirtualRouter | Success | 0.02 | test_vm_life_cycle.py
test_10_attachAndDetach_iso | Success | 26.77 | test_vm_life_cycle.py
test_09_expunge_vm | Success | 125.19 | test_vm_life_cycle.py
test_08_migrate_vm | Success | 50.69 | test_vm_life_cycle.py
test_07_restore_vm | Success | 0.08 | test_vm_life_cycle.py
test_06_destroy_vm | Success | 10.12 | test_vm_life_cycle.py
test_03_reboot_vm | Success | 5.10 | test_vm_life_cycle.py
test_02_start_vm | Success | 15.15 | test_vm_life_cycle.py
test_01_stop_vm | Success | 10.11 | test_vm_life_cycle.py
test_CreateTemplateWithDuplicateName | Success | 186.03 | test_templates.py
test_08_list_system_templates | Success | 0.02 | test_templates.py
test_07_list_public_templates | Success | 0.03 | test_templates.py
test_05_template_permissions | Success | 0.04 | test_templates.py
test_04_extract_template | Success | 10.20 | test_templates.py
test_03_delete_template | Success | 5.08 | test_templates.py
test_02_edit_template | Success | 90.12 | test_templates.py
test_01_create_template | Success | 105.61 | test_templates.py
test_10_destroy_cpvm | Success | 296.52 | test_ssvm.py
test_09_destroy_ssvm | Success | 238.31 | test_ssvm.py
test_08_reboot_cpvm | Success | 126.24 | test_ssvm.py
test_07_reboot_ssvm | Success | 368.22 | test_ssvm.py
test_06_stop_cpvm | Success | 176.44 | test_ssvm.py
test_05_stop_ssvm | Success | 173.16 | test_ssvm.py
test_04_cpvm_internals | Success | 0.95 | test_ssvm.py
test_03_ssvm_internals | Success | 2.92 | test_ssvm.py
test_02_list_cpvm_vm | Success | 0.09 | test_ssvm.py
test_01_list_sec_storage_vm | Success | 0.10 | test_ssvm.py
test_01_snapshot_root_disk | Success | 56.11 | test_snapshots.py
test_04_change_offering_small | Success | 116.67 | test_service_offerings.py
test_03_delete_service_offering | Success | 0.03 | test_service_offerings.py
test_02_edit_service_offering | Success | 0.05 | test_service_offerings.py
test_01_create_service_offering | Success | 0.08 | test_service_offerings.py
test_02_sys_template_ready | Success | 0.09 | test_secondary_storage.py
test_01_sys_vm_start | Success | 0.12 | test_secondary_storage.py
test_09_reboot_router | Success | 120.60 | test_routers.py
test_08_start_router | Success | 95.52 | test_routers.py
test_07_stop_router | Success | 25.18 | test_routers.py
test_06_router_advanced | Success | 0.04 | test_routers.py
test_05_router_basic | Success | 0.03 | test_routers.py
test_04_restart_network_wo_cleanup | Success | 5.52 | test_routers.py
test_03_restart_network_cleanup | Success | 115.62 | test_routers.py
test_02_router_internal_adv | Success | 0.87 | test_routers.py
test_01_router_internal_basic | Success | 0.46 | test_routers.py
test_router_dns_guestipquery | Success | 76.56 | test_router_dns.py
test_router_dns_externalipquery | Success | 0.06 | test_router_dns.py
test_router_dhcphosts | Success | 140.07 | test_router_dhcphosts.py
test_router_dhcp_opts | Success | 21.29 | test_router_dhcphosts.py
test_01_updatevolumedetail | Success | 0.06 | test_resource_detail.py
test_01_reset_vm_on_reboot | Success | 30.25 | test_reset_vm_on_reboot.py
test_createRegion | Success | 0.03 | test_regions.py
test_create_pvlan_network | Success | 5.14 | test_pvlan.py
test_dedicatePublicIpRange | Success | 0.32 | test_public_ip_range.py
test_03_vpc_privategw_restart_vpc_cleanup | Success | 920.63 | test_privategw_acl.py
test_02_vpc_privategw_static_routes | Success | 590.00 | test_privategw_acl.py
test_01_vpc_privategw_acl | Success | 161.94 | test_privategw_acl.py
test_01_primary_storage_nfs | Success | 35.90 | test_primary_storage.py
test_createPortablePublicIPRange | Success | 15.14 | test_portable_publicip.py
test_createPortablePublicIPAcquire | Success | 15.31 | test_portable_publicip.py
test_isolate_network_password_server | Success | 86.42 | test_password_server.py
test_UpdateStorageOverProvisioningFactor | Success | 0.10 | test_over_provisioning.py
test_oobm_zchange_password | Success | 30.50 | test_outofbandmanagement.py
test_oobm_multiple_mgmt_server_ownership | Success | 11.29 | test_outofbandmanagement.py
test_oobm_issue_power_status | Success | 10.18 | test_outofbandmanagement.py
test_oobm_issue_power_soft | Success | 15.25 | test_outofbandmanagement.py
test_oobm_issue_power_reset | Success | 15.25 | test_outofbandmanagement.py
test_oobm_issue_power_on | Success | 15.25 | test_outofbandmanagement.py
test_oobm_issue_power_off | Success | 15.28 | test_outofbandmanagement.py
test_oobm_issue_power_cycle | Success | 15.23 | test_outofbandmanagement.py
test_oobm_enabledisable_across_clusterzones | Success | 87.60 | test_outofbandmanagement.py
test_oobm_enable_feature_valid | Success | 5.11 | test_outofbandmanagement.py
test_oobm_enable_feature_invalid | Success | 0.07 | test_outofbandmanagement.py
test_oobm_disable_feature_valid | Success | 5.13 | test_outofbandmanagement.py
test_oobm_disable_feature_invalid | Success | 0.07 | test_outofbandmanagement.py
test_oobm_configure_invalid_driver | Success | 0.06 | test_outofbandmanagement.py
test_oobm_configure_default_driver | Success | 0.06 | test_outofbandmanagement.py
test_oobm_background_powerstate_sync | Success | 29.32 | test_outofbandmanagement.py
test_extendPhysicalNetworkVlan | Success | 15.26 | test_non_contigiousvlan.py
test_01_nic | Success | 453.83 | test_nic.py
test_releaseIP | Success | 191.83 | test_network.py
test_reboot_router | Success | 574.37 | test_network.py
test_public_ip_user_account | Success | 10.20 | test_network.py
test_public_ip_admin_account | Success | 40.24 | test_network.py
test_network_rules_acquired_public_ip_3_Load_Balancer_Rule | Success | 71.41 | test_network.py
test_network_rules_acquired_public_ip_2_nat_rule | Success | 61.36 | test_network.py
test_network_rules_acquired_public_ip_1_static_nat_rule | Success | 124.14 | test_network.py
test_delete_account | Success | 251.97 | test_network.py
test_02_port_fwd_on_non_src_nat | Success | 55.46 | test_network.py
test_01_port_fwd_on_src_nat | Success | 111.64 | test_network.py
test_nested_virtualization_vmware | Success | 312.74 | test_nested_virtualization.py
test_nic_secondaryip_add_remove | Success | 171.77 | test_multipleips_per_nic.py
login_test_saml_user | Success | 17.85 | test_login.py
test_assign_and_removal_lb | Success | 133.33 | test_loadbalance.py
test_02_create_lb_rule_non_nat | Success | 187.07 | test_loadbalance.py
test_01_create_lb_rule_src_nat | Success | 203.46 | test_loadbalance.py
test_03_list_snapshots | Success | 0.06 | test_list_ids_parameter.py
test_02_list_templates | Success | 0.03 | test_list_ids_parameter.py
test_01_list_volumes | Success | 0.02 | test_list_ids_parameter.py
test_07_list_default_iso | Success | 0.04 | test_iso.py
test_05_iso_permissions | Success | 0.04 | test_iso.py
test_04_extract_Iso | Success | 5.12 | test_iso.py
test_03_delete_iso | Success | 95.14 | test_iso.py
test_02_edit_iso | Success | 0.06 | test_iso.py
test_01_create_iso | Success | 20.67 | test_iso.py
test_04_rvpc_internallb_haproxy_stats_on_all_interfaces | Success | 448.67 | test_internal_lb.py
test_03_vpc_internallb_haproxy_stats_on_all_interfaces | Success | 338.05 | test_internal_lb.py
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 | Success | 940.89 | test_internal_lb.py
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 | Success | 699.35 | test_internal_lb.py
test_dedicateGuestVlanRange | Success | 10.20 | test_guest_vlan_range.py
test_UpdateConfigParamWithScope | Success | 0.10 | test_global_settings.py
test_rolepermission_lifecycle_update | Success | 5.78 | test_dynamicroles.py
test_rolepermission_lifecycle_list | Success | 5.67 | test_dynamicroles.py
test_rolepermission_lifecycle_delete | Success | 5.57 | test_dynamicroles.py
test_rolepermission_lifecycle_create | Success | 5.59 | test_dynamicroles.py
test_rolepermission_lifecycle_concurrent_updates | Success | 5.70 | test_dynamicroles.py
test_role_lifecycle_update_role_inuse | Success | 5.61 | test_dynamicroles.py
test_role_lifecycle_update | Success | 5.76 | test_dynamicroles.py
test_role_lifecycle_list | Success | 5.69 | test_dynamicroles.py
test_role_lifecycle_delete | Success | 5.61 | test_dynamicroles.py
test_role_lifecycle_create | Success | 5.60 | test_dynamicroles.py
test_role_inuse_deletion | Success | 5.59 | test_dynamicroles.py
test_role_account_acls_multiple_mgmt_servers | Success | 6.97 | test_dynamicroles.py
test_role_account_acls | Success | 7.28 | test_dynamicroles.py
test_default_role_deletion | Success | 5.66 | test_dynamicroles.py
test_04_create_fat_type_disk_offering | Success | 0.05 | test_disk_offerings.py
test_03_delete_disk_offering | Success | 0.03 | test_disk_offerings.py
test_02_edit_disk_offering | Success | 0.04 | test_disk_offerings.py
test_02_create_sparse_type_disk_offering | Success | 0.05 | test_disk_offerings.py
test_01_create_disk_offering | Success | 0.08 | test_disk_offerings.py
test_deployvm_userdispersing | Success | 40.52 | test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userconcentrated | Success | 65.63 | test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_firstfit | Success | 135.90 | test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userdata_post | Success | 20.35 | test_deploy_vm_with_userdata.py
test_deployvm_userdata | Success | 130.91 | test_deploy_vm_with_userdata.py
test_02_deploy_vm_root_resize | Success | 5.58 | test_deploy_vm_root_resize.py
test_01_deploy_vm_root_resize | Success | 5.58 | test_deploy_vm_root_resize.py
test_00_deploy_vm_root_resize | Success | 5.69 | test_deploy_vm_root_resize.py
test_deploy_vm_from_iso | Success | 181.75 | test_deploy_vm_iso.py
test_3d_gpu_support | Success | 378.87 | test_deploy_vgpu_enabled_vm.py
test_DeployVmAntiAffinityGroup | Success | 191.33 | test_affinity_groups.py
test_08_resize_volume | Skipped | 5.72 | test_volumes.py
test_07_resize_fail | Skipped | 10.21 | test_volumes.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 | 66.31 | test_scale_vm.py
test_01_primary_storage_iscsi | Skipped | 0.03 | test_primary_storage.py
test_06_copy_iso | Skipped | 0.00 | test_iso.py
test_deploy_vgpu_enabled_vm | Skipped | 0.73 | test_deploy_vgpu_enabled_vm.py
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by blueorangutan <gi...@git.apache.org>.
Github user blueorangutan commented on the issue:
https://github.com/apache/cloudstack/pull/1862
@borisstoyanov unsupported parameters provided. Supported mgmt server os are: `centos6, centos7, ubuntu`. Supported hypervisors are: `kvm-centos6, kvm-centos7, kvm-ubuntu, xenserver-65sp1, xenserver-62sp1, vmware-60u2, vmware-55u3, vmware-51u1, vmware-50u1`
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by anshul1886 <gi...@git.apache.org>.
Github user anshul1886 commented on the issue:
https://github.com/apache/cloudstack/pull/1862
@sateesh-chodapuneedi code changes LGTM
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1862: CLOUDSTACK-9704 Remove dependency on VmwareCo...
Posted by sureshanaparti <gi...@git.apache.org>.
Github user sureshanaparti commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1862#discussion_r94206268
--- Diff: plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---
@@ -5620,4 +5623,39 @@ private String getAbsoluteVmdkFile(VirtualDisk disk) {
}
return vmdkAbsFile;
}
+
+ protected File getSystemVmKeyFile() {
+ if (s_systemVmKeyFile == null) {
+ syncFetchSystemVmKeyFile();
+ }
+ return s_systemVmKeyFile;
+ }
+
+ private static void syncFetchSystemVmKeyFile() {
+ synchronized (s_syncLockObjectFetchKeyFile) {
+ if (s_systemVmKeyFile == null) {
+ s_systemVmKeyFile = fetchSystemVmKeyFile();
+ }
+ }
+ }
+
+ private static File fetchSystemVmKeyFile() {
+ String filePath = s_relativePathSystemVmKeyFileInstallDir;
+ s_logger.debug("Looking for file [" + filePath + "] in the classpath.");
+ URL url = Script.class.getClassLoader().getResource(filePath);
+ File keyFile = null;
+ if (url != null) {
+ keyFile = new File(url.getPath());
+ }
+ if (keyFile == null || !keyFile.exists()) {
+ filePath = s_defaultPathSystemVmKeyFile;
+ keyFile = new File(filePath);
+ s_logger.debug("Looking for file [" + filePath + "] in the classpath.");
+ }
+ assert (keyFile != null);
--- End diff --
This assert statement is always true. Not needed here.
Rest code changes LGTM.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by sateesh-chodapuneedi <gi...@git.apache.org>.
Github user sateesh-chodapuneedi commented on the issue:
https://github.com/apache/cloudstack/pull/1862
Thanks @sureshanaparti for review.
I have addressed that now. Pushed the code changes, please check.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by borisstoyanov <gi...@git.apache.org>.
Github user borisstoyanov commented on the issue:
https://github.com/apache/cloudstack/pull/1862
@blueorangutan test centos7 vmware65
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by sateesh-chodapuneedi <gi...@git.apache.org>.
Github user sateesh-chodapuneedi commented on the issue:
https://github.com/apache/cloudstack/pull/1862
Thanks @borisstoyanov
The 3 test failures listed in results doesn't seem related to the code changes in PR.
```
2017-03-02 17:45:11,699 - CRITICAL - EXCEPTION: test_02_list_snapshots_with_removed_data_store: ['Traceback (most recent call last):\n', ' File "/usr/lib64/python2.7/unittest/case.py", line 369, in run\n testMethod()\n', ' File "/usr/lib/python2.7/site-packages/marvin/lib/decoratorGenerators.py", line 30, in test_wrapper\n return test(self, *args, **kwargs)\n', ' File "/marvin/tests/smoke/test_snapshots.py", line 363, in test_02_list_snapshots_with_removed_data_store\n id=snapshot.id\n', ' File "/usr/lib/python2.7/site-packages/marvin/lib/base.py", line 1125, in list\n return(apiclient.listSnapshots(cmd))\n', ' File "/usr/lib/python2.7/site-packages/marvin/cloudstackAPI/cloudstackAPIClient.py", line 1161, in listSnapshots\n response = self.connection.marvinRequest(command, response_type=response, method=method)\n', ' File "/usr/lib/python2.7/site-packages/marvin/cloudstackConnection.py", line 379, in marvinRequest\n raise e\n', 'CloudstackAPIException: Exe
cute cmd: listsnapshots failed, due to: errorCode: 530, errorText:Unable to locate datastore with id 5\n']
2017-03-02 17:45:16,772 - CRITICAL - EXCEPTION: test_02_list_snapshots_with_removed_data_store: ['Traceback (most recent call last):\n', ' File "/usr/lib64/python2.7/unittest/case.py", line 398, in run\n self.tearDown()\n', ' File "/marvin/tests/smoke/test_snapshots.py", line 174, in tearDown\n raise Exception("Warning: Exception during cleanup : %s" % e)\n', "Exception: Warning: Exception during cleanup : Job failed: {jobprocstatus : 0, created : u'2017-03-02T17:45:13+0000', jobresult : {errorcode : 431, errortext : u'Unable to find a virtual machine with specified vmId'}, cmd : u'org.apache.cloudstack.api.command.admin.vm.DestroyVMCmdByAdmin', userid : u'87233b2e-ff35-11e6-be08-06674c01070f', jobstatus : 2, jobid : u'43f0ee45-e763-45bc-b777-795c7eaeb26a', jobresultcode : 530, jobinstanceid : u'3be27ffe-1884-493b-9566-e616cf2d85d0', jobresulttype : u'object', jobinstancetype : u'VirtualMachine', accountid : u'872334ae-ff35-11e6-be08-06674c01070f'}\n"]
2017-03-02 17:45:41,985 - CRITICAL - EXCEPTION: test_02_list_snapshots_with_removed_data_store: ['Traceback (most recent call last):\n', ' File "/usr/lib/python2.7/site-packages/nose/suite.py", line 228, in run\n self.tearDown()\n', ' File "/usr/lib/python2.7/site-packages/nose/suite.py", line 351, in tearDown\n self.teardownContext(ancestor)\n', ' File "/usr/lib/python2.7/site-packages/nose/suite.py", line 367, in teardownContext\n try_run(context, names)\n', ' File "/usr/lib/python2.7/site-packages/nose/util.py", line 471, in try_run\n return func()\n', ' File "/marvin/tests/smoke/test_snapshots.py", line 160, in tearDownClass\n raise Exception("Warning: Exception during cleanup : %s" % e)\n', "Exception: Warning: Exception during cleanup : Job failed: {jobprocstatus : 0, created : u'2017-03-02T17:45:39+0000', jobresult : {errorcode : 530, errortext : u'Failed to delete template'}, cmd : u'org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd', u
serid : u'87233b2e-ff35-11e6-be08-06674c01070f', jobstatus : 2, jobid : u'df91fb7f-b9fd-4b9f-8d07-654821c42d69', jobresultcode : 530, jobinstanceid : u'5fc32822-46b8-43e9-ac33-8ad5bb00e775', jobresulttype : u'object', jobinstancetype : u'Template', accountid : u'872334ae-ff35-11e6-be08-06674c01070f'}\n"]
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by blueorangutan <gi...@git.apache.org>.
Github user blueorangutan commented on the issue:
https://github.com/apache/cloudstack/pull/1862
@borisstoyanov a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by borisstoyanov <gi...@git.apache.org>.
Github user borisstoyanov commented on the issue:
https://github.com/apache/cloudstack/pull/1862
yes, @sateesh-chodapuneedi those are addressed in another PR.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by blueorangutan <gi...@git.apache.org>.
Github user blueorangutan commented on the issue:
https://github.com/apache/cloudstack/pull/1862
Packaging result: \u2714centos6 \u2714centos7 \u2714debian. JID-557
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1862: CLOUDSTACK-9704 Remove dependency on VmwareCo...
Posted by sateesh-chodapuneedi <gi...@git.apache.org>.
Github user sateesh-chodapuneedi commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1862#discussion_r94214404
--- Diff: plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---
@@ -5620,4 +5623,39 @@ private String getAbsoluteVmdkFile(VirtualDisk disk) {
}
return vmdkAbsFile;
}
+
+ protected File getSystemVmKeyFile() {
+ if (s_systemVmKeyFile == null) {
+ syncFetchSystemVmKeyFile();
+ }
+ return s_systemVmKeyFile;
+ }
+
+ private static void syncFetchSystemVmKeyFile() {
+ synchronized (s_syncLockObjectFetchKeyFile) {
+ if (s_systemVmKeyFile == null) {
+ s_systemVmKeyFile = fetchSystemVmKeyFile();
+ }
+ }
+ }
+
+ private static File fetchSystemVmKeyFile() {
+ String filePath = s_relativePathSystemVmKeyFileInstallDir;
+ s_logger.debug("Looking for file [" + filePath + "] in the classpath.");
+ URL url = Script.class.getClassLoader().getResource(filePath);
+ File keyFile = null;
+ if (url != null) {
+ keyFile = new File(url.getPath());
+ }
+ if (keyFile == null || !keyFile.exists()) {
+ filePath = s_defaultPathSystemVmKeyFile;
+ keyFile = new File(filePath);
+ s_logger.debug("Looking for file [" + filePath + "] in the classpath.");
+ }
+ assert (keyFile != null);
--- End diff --
Thanks @sureshanaparti for review.
I have addressed that now. Pushed the code changes, please check.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by borisstoyanov <gi...@git.apache.org>.
Github user borisstoyanov commented on the issue:
https://github.com/apache/cloudstack/pull/1862
@blueorangutan test centos7 vmware-60u2
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by sateesh-chodapuneedi <gi...@git.apache.org>.
Github user sateesh-chodapuneedi commented on the issue:
https://github.com/apache/cloudstack/pull/1862
ping @anshulgangwar @karuturi
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by sateesh-chodapuneedi <gi...@git.apache.org>.
Github user sateesh-chodapuneedi commented on the issue:
https://github.com/apache/cloudstack/pull/1862
tag:mergeready
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by sureshanaparti <gi...@git.apache.org>.
Github user sureshanaparti commented on the issue:
https://github.com/apache/cloudstack/pull/1862
@sateesh-chodapuneedi Code changes LGTM
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by blueorangutan <gi...@git.apache.org>.
Github user blueorangutan commented on the issue:
https://github.com/apache/cloudstack/pull/1862
@borisstoyanov a Trillian-Jenkins test job (centos7 mgmt + vmware-60u2) has been kicked to run smoke tests
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by sateesh-chodapuneedi <gi...@git.apache.org>.
Github user sateesh-chodapuneedi commented on the issue:
https://github.com/apache/cloudstack/pull/1862
@borisstoyanov @borisroman Can you please run trillian tests for this PR?
This already has enough code LGTMs, and needs tests for merge.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1862: CLOUDSTACK-9704 Remove dependency on VmwareContext o...
Posted by borisstoyanov <gi...@git.apache.org>.
Github user borisstoyanov commented on the issue:
https://github.com/apache/cloudstack/pull/1862
Sure @sateesh-chodapuneedi
@blueorangutan package
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---