Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CLOUDSTACK-9643] Now returning os info with the list snapshot response #1618

Merged
merged 1 commit into from Dec 7, 2016
Merged

[CLOUDSTACK-9643] Now returning os info with the list snapshot response #1618

merged 1 commit into from Dec 7, 2016

Conversation

ProjectMoon
Copy link

This commit adds the ID and display name of the OS on the volume.

@ProjectMoon ProjectMoon changed the title GQSS-2277 Now returning os info with the list snapshot response Now returning os info with the list snapshot response Aug 2, 2016
@ProjectMoon
Copy link
Author

Rebased to latest master.

@rohityadavcloud
Copy link
Member

@blueorangutan package
@ProjectMoon can you push -f to rekick Travis?

@blueorangutan
Copy link

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

@blueorangutan
Copy link

Packaging result: ✔centos6 ✔centos7 ✔debian repo: http://packages.shapeblue.com/cloudstack/pr/1618

@ProjectMoon ProjectMoon closed this Aug 8, 2016
@ProjectMoon ProjectMoon reopened this Aug 8, 2016
@@ -157,6 +156,7 @@
import org.apache.cloudstack.usage.Usage;
import org.apache.cloudstack.usage.UsageService;
import org.apache.cloudstack.usage.UsageTypes;
import org.apache.commons.collections.CollectionUtils;
Copy link
Contributor

Choose a reason for hiding this comment

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

Why was this import added? I don't see it used anywhere in the patch.

Copy link
Author

Choose a reason for hiding this comment

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

It is used in ApiResponseHelper.

@koushik-das
Copy link
Contributor

Please add/modify Marvin tests based on these scenarios.

@rohityadavcloud
Copy link
Member

@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

@ProjectMoon
Copy link
Author

Rebased to latest master. The comments will also be addressed soon, hopefully.

@ProjectMoon
Copy link
Author

Code review issues have been addressed, with the exception of combining the Guest OS ID/VM Instance ID into a join method on VolumeDao. There was some compilation failure in the F5 plugin when I tried building locally. Will see if that happens here too.

@rohityadavcloud
Copy link
Member

@ProjectMoon thanks, can you add a JIRA id for this and also use that in your commit's PR.
@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

@ProjectMoon
Copy link
Author

Updated to latest master, and now with a JIRA ticket.

https://issues.apache.org/jira/browse/CLOUDSTACK-9643

@ProjectMoon ProjectMoon changed the title Now returning os info with the list snapshot response [CLOUDSTACK-9643] Now returning os info with the list snapshot response Dec 1, 2016
@rohityadavcloud
Copy link
Member

Thanks @ProjectMoon
@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

@rohityadavcloud
Copy link
Member

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

Trillian test result (tid-550)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 30876 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1618-t550-kvm-centos7.zip
Test completed. 48 look ok, 1 have error(s)

Test Result Time (s) Test File
test_02_redundant_VPC_default_routes Failure 905.94 test_vpc_redundant.py
test_01_vpc_site2site_vpn Success 160.74 test_vpc_vpn.py
test_01_vpc_remote_access_vpn Success 62.06 test_vpc_vpn.py
test_01_redundant_vpc_site2site_vpn Success 276.68 test_vpc_vpn.py
test_02_VPC_default_routes Success 285.77 test_vpc_router_nics.py
test_01_VPC_nics_after_destroy Success 560.26 test_vpc_router_nics.py
test_05_rvpc_multi_tiers Success 527.35 test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nics Success 1418.50 test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Success 629.80 test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Success 1321.89 test_vpc_redundant.py
test_09_delete_detached_volume Success 15.76 test_volumes.py
test_08_resize_volume Success 15.41 test_volumes.py
test_07_resize_fail Success 20.48 test_volumes.py
test_06_download_detached_volume Success 15.31 test_volumes.py
test_05_detach_volume Success 100.29 test_volumes.py
test_04_delete_attached_volume Success 10.22 test_volumes.py
test_03_download_attached_volume Success 15.32 test_volumes.py
test_02_attach_volume Success 44.91 test_volumes.py
test_01_create_volume Success 623.07 test_volumes.py
test_deploy_vm_multiple Success 309.13 test_vm_life_cycle.py
test_deploy_vm Success 0.03 test_vm_life_cycle.py
test_advZoneVirtualRouter Success 0.03 test_vm_life_cycle.py
test_10_attachAndDetach_iso Success 26.69 test_vm_life_cycle.py
test_09_expunge_vm Success 125.16 test_vm_life_cycle.py
test_08_migrate_vm Success 76.47 test_vm_life_cycle.py
test_07_restore_vm Success 0.15 test_vm_life_cycle.py
test_06_destroy_vm Success 130.94 test_vm_life_cycle.py
test_03_reboot_vm Success 130.97 test_vm_life_cycle.py
test_02_start_vm Success 10.18 test_vm_life_cycle.py
test_01_stop_vm Success 45.36 test_vm_life_cycle.py
test_CreateTemplateWithDuplicateName Success 181.53 test_templates.py
test_08_list_system_templates Success 0.03 test_templates.py
test_07_list_public_templates Success 0.04 test_templates.py
test_05_template_permissions Success 0.06 test_templates.py
test_04_extract_template Success 5.29 test_templates.py
test_03_delete_template Success 5.15 test_templates.py
test_02_edit_template Success 90.17 test_templates.py
test_01_create_template Success 75.66 test_templates.py
test_10_destroy_cpvm Success 202.06 test_ssvm.py
test_09_destroy_ssvm Success 168.92 test_ssvm.py
test_08_reboot_cpvm Success 136.85 test_ssvm.py
test_07_reboot_ssvm Success 172.71 test_ssvm.py
test_06_stop_cpvm Success 136.65 test_ssvm.py
test_05_stop_ssvm Success 144.75 test_ssvm.py
test_04_cpvm_internals Success 1.09 test_ssvm.py
test_03_ssvm_internals Success 4.84 test_ssvm.py
test_02_list_cpvm_vm Success 0.14 test_ssvm.py
test_01_list_sec_storage_vm Success 0.15 test_ssvm.py
test_01_snapshot_root_disk Success 11.48 test_snapshots.py
test_04_change_offering_small Success 240.28 test_service_offerings.py
test_03_delete_service_offering Success 0.04 test_service_offerings.py
test_02_edit_service_offering Success 0.08 test_service_offerings.py
test_01_create_service_offering Success 0.12 test_service_offerings.py
test_02_sys_template_ready Success 0.15 test_secondary_storage.py
test_01_sys_vm_start Success 0.21 test_secondary_storage.py
test_09_reboot_router Success 45.39 test_routers.py
test_08_start_router Success 35.34 test_routers.py
test_07_stop_router Success 15.19 test_routers.py
test_06_router_advanced Success 0.07 test_routers.py
test_05_router_basic Success 0.06 test_routers.py
test_04_restart_network_wo_cleanup Success 5.70 test_routers.py
test_03_restart_network_cleanup Success 80.69 test_routers.py
test_02_router_internal_adv Success 1.08 test_routers.py
test_01_router_internal_basic Success 0.58 test_routers.py
test_router_dns_guestipquery Success 76.83 test_router_dns.py
test_router_dns_externalipquery Success 0.09 test_router_dns.py
test_router_dhcphosts Success 325.49 test_router_dhcphosts.py
test_router_dhcp_opts Success 21.57 test_router_dhcphosts.py
test_01_updatevolumedetail Success 0.08 test_resource_detail.py
test_01_reset_vm_on_reboot Success 140.99 test_reset_vm_on_reboot.py
test_createRegion Success 0.04 test_regions.py
test_create_pvlan_network Success 5.23 test_pvlan.py
test_dedicatePublicIpRange Success 0.43 test_public_ip_range.py
test_04_rvpc_privategw_static_routes Success 588.50 test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup Success 710.93 test_privategw_acl.py
test_02_vpc_privategw_static_routes Success 454.99 test_privategw_acl.py
test_01_vpc_privategw_acl Success 93.80 test_privategw_acl.py
test_01_primary_storage_nfs Success 36.48 test_primary_storage.py
test_createPortablePublicIPRange Success 15.24 test_portable_publicip.py
test_createPortablePublicIPAcquire Success 15.62 test_portable_publicip.py
test_isolate_network_password_server Success 87.12 test_password_server.py
test_UpdateStorageOverProvisioningFactor Success 0.16 test_over_provisioning.py
test_oobm_zchange_password Success 30.83 test_outofbandmanagement.py
test_oobm_multiple_mgmt_server_ownership Success 16.46 test_outofbandmanagement.py
test_oobm_issue_power_status Success 10.36 test_outofbandmanagement.py
test_oobm_issue_power_soft Success 15.39 test_outofbandmanagement.py
test_oobm_issue_power_reset Success 15.38 test_outofbandmanagement.py
test_oobm_issue_power_on Success 15.45 test_outofbandmanagement.py
test_oobm_issue_power_off Success 15.43 test_outofbandmanagement.py
test_oobm_issue_power_cycle Success 15.89 test_outofbandmanagement.py
test_oobm_enabledisable_across_clusterzones Success 93.05 test_outofbandmanagement.py
test_oobm_enable_feature_valid Success 5.21 test_outofbandmanagement.py
test_oobm_enable_feature_invalid Success 0.12 test_outofbandmanagement.py
test_oobm_disable_feature_valid Success 0.20 test_outofbandmanagement.py
test_oobm_disable_feature_invalid Success 0.12 test_outofbandmanagement.py
test_oobm_configure_invalid_driver Success 0.10 test_outofbandmanagement.py
test_oobm_configure_default_driver Success 0.10 test_outofbandmanagement.py
test_oobm_background_powerstate_sync Success 29.68 test_outofbandmanagement.py
test_extendPhysicalNetworkVlan Success 15.38 test_non_contigiousvlan.py
test_01_nic Success 571.49 test_nic.py
test_releaseIP Success 263.95 test_network.py
test_reboot_router Success 505.25 test_network.py
test_public_ip_user_account Success 10.27 test_network.py
test_public_ip_admin_account Success 40.30 test_network.py
test_network_rules_acquired_public_ip_3_Load_Balancer_Rule Success 66.94 test_network.py
test_network_rules_acquired_public_ip_2_nat_rule Success 61.56 test_network.py
test_network_rules_acquired_public_ip_1_static_nat_rule Success 123.92 test_network.py
test_delete_account Success 349.32 test_network.py
test_02_port_fwd_on_non_src_nat Success 55.72 test_network.py
test_01_port_fwd_on_src_nat Success 112.47 test_network.py
test_nic_secondaryip_add_remove Success 249.43 test_multipleips_per_nic.py
login_test_saml_user Success 24.93 test_login.py
test_assign_and_removal_lb Success 133.95 test_loadbalance.py
test_02_create_lb_rule_non_nat Success 188.45 test_loadbalance.py
test_01_create_lb_rule_src_nat Success 208.15 test_loadbalance.py
test_03_list_snapshots Success 0.10 test_list_ids_parameter.py
test_02_list_templates Success 0.05 test_list_ids_parameter.py
test_01_list_volumes Success 0.04 test_list_ids_parameter.py
test_07_list_default_iso Success 0.06 test_iso.py
test_05_iso_permissions Success 0.07 test_iso.py
test_04_extract_Iso Success 5.22 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 21.93 test_iso.py
test_04_rvpc_internallb_haproxy_stats_on_all_interfaces Success 385.11 test_internal_lb.py
test_03_vpc_internallb_haproxy_stats_on_all_interfaces Success 260.84 test_internal_lb.py
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 Success 564.18 test_internal_lb.py
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 Success 555.64 test_internal_lb.py
test_dedicateGuestVlanRange Success 10.30 test_guest_vlan_range.py
test_UpdateConfigParamWithScope Success 0.19 test_global_settings.py
test_rolepermission_lifecycle_update Success 7.23 test_dynamicroles.py
test_rolepermission_lifecycle_list Success 6.94 test_dynamicroles.py
test_rolepermission_lifecycle_delete Success 6.83 test_dynamicroles.py
test_rolepermission_lifecycle_create Success 6.86 test_dynamicroles.py
test_rolepermission_lifecycle_concurrent_updates Success 6.99 test_dynamicroles.py
test_role_lifecycle_update_role_inuse Success 7.35 test_dynamicroles.py
test_role_lifecycle_update Success 11.98 test_dynamicroles.py
test_role_lifecycle_list Success 6.88 test_dynamicroles.py
test_role_lifecycle_delete Success 11.93 test_dynamicroles.py
test_role_lifecycle_create Success 6.85 test_dynamicroles.py
test_role_inuse_deletion Success 6.92 test_dynamicroles.py
test_role_account_acls_multiple_mgmt_servers Success 9.18 test_dynamicroles.py
test_role_account_acls Success 9.52 test_dynamicroles.py
test_default_role_deletion Success 7.03 test_dynamicroles.py
test_04_create_fat_type_disk_offering Success 0.08 test_disk_offerings.py
test_03_delete_disk_offering Success 0.05 test_disk_offerings.py
test_02_edit_disk_offering Success 0.20 test_disk_offerings.py
test_02_create_sparse_type_disk_offering Success 0.10 test_disk_offerings.py
test_01_create_disk_offering Success 0.13 test_disk_offerings.py
test_deployvm_userdispersing Success 81.05 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userconcentrated Success 20.67 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_firstfit Success 55.87 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userdata_post Success 10.45 test_deploy_vm_with_userdata.py
test_deployvm_userdata Success 65.84 test_deploy_vm_with_userdata.py
test_02_deploy_vm_root_resize Success 7.27 test_deploy_vm_root_resize.py
test_01_deploy_vm_root_resize Success 7.03 test_deploy_vm_root_resize.py
test_00_deploy_vm_root_resize Success 238.70 test_deploy_vm_root_resize.py
test_deploy_vm_from_iso Success 213.68 test_deploy_vm_iso.py
test_DeployVmAntiAffinityGroup Success 55.91 test_affinity_groups.py
test_03_delete_vm_snapshots Skipped 0.00 test_vm_snapshots.py
test_02_revert_vm_snapshots Skipped 0.00 test_vm_snapshots.py
test_01_test_vm_volume_snapshot Skipped 0.00 test_vm_snapshots.py
test_01_create_vm_snapshots Skipped 0.00 test_vm_snapshots.py
test_06_copy_template Skipped 0.00 test_templates.py
test_static_role_account_acls Skipped 0.03 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.04 test_primary_storage.py
test_nested_virtualization_vmware Skipped 0.00 test_nested_virtualization.py
test_06_copy_iso Skipped 0.00 test_iso.py
test_deploy_vgpu_enabled_vm Skipped 0.03 test_deploy_vgpu_enabled_vm.py
test_3d_gpu_support Skipped 0.04 test_deploy_vgpu_enabled_vm.py

@rohityadavcloud
Copy link
Member

LGTM, the failure in Travis is caused by env issue and not the PR itself. Merging this based on review, and test results.

@asfgit asfgit merged commit 7ef87b6 into apache:master Dec 7, 2016
asfgit pushed a commit that referenced this pull request Dec 7, 2016
[CLOUDSTACK-9643] Now returning os info with the list snapshot responseThis commit adds the ID and display name of the OS on the volume.

* pr/1618:
  CLOUDSTACK-9643: Now returning os info with the list snapshot response

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@ProjectMoon ProjectMoon deleted the pr-return-os-info-snapshots branch December 8, 2016 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants