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-9644] Adding missing bits field to TemplateResponse #1622

Merged
merged 1 commit into from Dec 7, 2016
Merged

[CLOUDSTACK-9644] Adding missing bits field to TemplateResponse #1622

merged 1 commit into from Dec 7, 2016

Conversation

ProjectMoon
Copy link

This pull request adds a bits field for template size, and sets it equal to ISO size.

@rohityadavcloud
Copy link
Member

LGTM

@blueorangutan
Copy link

RPM packages built and available at: http://packages.shapeblue.com/cloudstack/custom/github-1622.

@jburwell
Copy link
Contributor

jburwell commented Aug 4, 2016

@rhtyd Travis appears to have failed due to a missing file. Could you please investigate?

@jburwell
Copy link
Contributor

jburwell commented Aug 4, 2016

@ProjectMoon is there a JIRA associated with this change? Also, could you please update the test_templates smoke test to check that the API returns this value as expected?

@rohityadavcloud
Copy link
Member

@ProjectMoon can you push -f or close+open this PR to re-kick Travis?
@jburwell Travis was failing on master due to a missing db path, a fix was merged yesterday. All PRs with failing Travis/Jenkins on master need to push -f or close/open the PR.

@ProjectMoon
Copy link
Author

Will check the smoke tests for Marvin.

@blueorangutan
Copy link

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

@ProjectMoon ProjectMoon closed this Aug 5, 2016
@ProjectMoon ProjectMoon reopened this Aug 5, 2016
@jburwell
Copy link
Contributor

jburwell commented Aug 5, 2016

@ProjectMoon Travis is now passing, but Jenkins failed. Could you please investigate the failure and fix it? Also, updating the test_templates test case to verify that the API returns bit field correctly is required to merge this PR.

@ProjectMoon
Copy link
Author

Will check it out on Monday. Very weird that the end of the build is not an error specifically. Just "ending due to build failure" or some such.

The first exception I see is:

2016-08-05 17:25:38,700 ERROR [network.guru.NiciraNvpGuestNetworkGuru] (main:) Unable to store logical switch id in broadcast uri, uuid = c63b0770-2e6c-4189-8c99-9f9a764f2cf1
java.net.URISyntaxException: Expected scheme-specific part at index 8: lswitch:
    at java.net.URI$Parser.fail(URI.java:2848)
    at java.net.URI$Parser.failExpecting(URI.java:2854)
    at java.net.URI$Parser.parse(URI.java:3057)
    at java.net.URI.<init>(URI.java:820)
    at com.cloud.network.guru.NiciraNvpGuestNetworkGuru.implement(NiciraNvpGuestNetworkGuru.java:235)
    at com.cloud.network.guru.NiciraNvpGuestNetworkGuruTest.testImplementURIException(NiciraNvpGuestNetworkGuruTest.java:410)
    at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
    at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
    at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
    at java.lang.reflect.Method.invoke(Method.java:498)
    at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
    at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
    at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
    at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
    at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
    at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
    at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
    at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
    at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
    at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
    at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
    at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
    at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
    at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
    at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:283)
    at org.apache.maven.surefire.junit4.JUnit4Provider.executeWithRerun(JUnit4Provider.java:173)
    at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:153)
    at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:128)
    at org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:203)
    at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:155)
    at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:103)

Is that relevant?

@blueorangutan
Copy link

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

@rohityadavcloud
Copy link
Member

@blueorangutan kick

@blueorangutan
Copy link

A Trillian-Jenkins job has been kicked to build packages and start testing. I'll keep you posted as I make progress.

@blueorangutan
Copy link

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

@ProjectMoon
Copy link
Author

Rebased to latest master, though I still haven't checked into the Jenkins issue.

@jburwell
Copy link
Contributor

jburwell commented Aug 8, 2016

@ProjectMoon the URI exception is caused by a attempting to parse an unrecognized/unregistered scheme (lswitch). It would be a problem at runtime for the management server, and need to be addressed.

@@ -169,6 +169,10 @@
@Param(description = "additional key/value details tied with template")
private Map details;

@SerializedName(ApiConstants.BITS)
@Param(description="the processor bit size")
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add "since" in Param

@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-76

@ProjectMoon
Copy link
Author

This has been rebased to the latest master, and the code review suggestions applied.

@ProjectMoon
Copy link
Author

Build failed due to running out of disk space. Will re-trigger.

@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-206

@ProjectMoon
Copy link
Author

Rebased to latest master.

@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.

@rohityadavcloud
Copy link
Member

@ProjectMoon can you add a JIRA id for this, also in the commit's summary

@blueorangutan
Copy link

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

@ProjectMoon ProjectMoon changed the title Adding missing bits field to TemplateResponse [CLOUDSTACK-9644] Adding missing bits field to TemplateResponse Dec 1, 2016
@ProjectMoon
Copy link
Author

Updated to latest master, and a JIRA ticket has been created.

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

@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-303

@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-545)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 29748 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1622-t545-kvm-centos7.zip
Test completed. 48 look ok, 1 have error(s)

Test Result Time (s) Test File
test_06_download_detached_volume Error 15.29 test_volumes.py
test_01_vpc_site2site_vpn Success 200.81 test_vpc_vpn.py
test_01_vpc_remote_access_vpn Success 61.31 test_vpc_vpn.py
test_01_redundant_vpc_site2site_vpn Success 341.41 test_vpc_vpn.py
test_02_VPC_default_routes Success 275.51 test_vpc_router_nics.py
test_01_VPC_nics_after_destroy Success 545.40 test_vpc_router_nics.py
test_05_rvpc_multi_tiers Success 554.40 test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nics Success 1483.94 test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Success 698.95 test_vpc_redundant.py
test_02_redundant_VPC_default_routes Success 950.13 test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Success 1405.56 test_vpc_redundant.py
test_09_delete_detached_volume Success 15.57 test_volumes.py
test_08_resize_volume Success 15.46 test_volumes.py
test_07_resize_fail Success 20.50 test_volumes.py
test_05_detach_volume Success 100.30 test_volumes.py
test_04_delete_attached_volume Success 10.21 test_volumes.py
test_03_download_attached_volume Success 15.30 test_volumes.py
test_02_attach_volume Success 73.83 test_volumes.py
test_01_create_volume Success 738.53 test_volumes.py
test_deploy_vm_multiple Success 379.91 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 67.70 test_vm_life_cycle.py
test_09_expunge_vm Success 125.24 test_vm_life_cycle.py
test_08_migrate_vm Success 41.01 test_vm_life_cycle.py
test_07_restore_vm Success 1.44 test_vm_life_cycle.py
test_06_destroy_vm Success 131.17 test_vm_life_cycle.py
test_03_reboot_vm Success 130.97 test_vm_life_cycle.py
test_02_start_vm Success 10.19 test_vm_life_cycle.py
test_01_stop_vm Success 50.46 test_vm_life_cycle.py
test_CreateTemplateWithDuplicateName Success 95.86 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.07 test_templates.py
test_04_extract_template Success 5.40 test_templates.py
test_03_delete_template Success 5.11 test_templates.py
test_02_edit_template Success 90.13 test_templates.py
test_01_create_template Success 115.91 test_templates.py
test_10_destroy_cpvm Success 196.95 test_ssvm.py
test_09_destroy_ssvm Success 138.98 test_ssvm.py
test_08_reboot_cpvm Success 136.91 test_ssvm.py
test_07_reboot_ssvm Success 138.99 test_ssvm.py
test_06_stop_cpvm Success 142.01 test_ssvm.py
test_05_stop_ssvm Success 174.14 test_ssvm.py
test_04_cpvm_internals Success 1.56 test_ssvm.py
test_03_ssvm_internals Success 7.17 test_ssvm.py
test_02_list_cpvm_vm Success 0.17 test_ssvm.py
test_01_list_sec_storage_vm Success 0.15 test_ssvm.py
test_01_snapshot_root_disk Success 21.47 test_snapshots.py
test_04_change_offering_small Success 247.92 test_service_offerings.py
test_03_delete_service_offering Success 0.04 test_service_offerings.py
test_02_edit_service_offering Success 0.10 test_service_offerings.py
test_01_create_service_offering Success 0.11 test_service_offerings.py
test_02_sys_template_ready Success 0.14 test_secondary_storage.py
test_01_sys_vm_start Success 0.19 test_secondary_storage.py
test_09_reboot_router Success 50.46 test_routers.py
test_08_start_router Success 35.35 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.04 test_routers.py
test_04_restart_network_wo_cleanup Success 5.71 test_routers.py
test_03_restart_network_cleanup Success 65.59 test_routers.py
test_02_router_internal_adv Success 1.15 test_routers.py
test_01_router_internal_basic Success 0.60 test_routers.py
test_router_dns_guestipquery Success 76.94 test_router_dns.py
test_router_dns_externalipquery Success 0.14 test_router_dns.py
test_router_dhcphosts Success 287.18 test_router_dhcphosts.py
test_router_dhcp_opts Success 21.84 test_router_dhcphosts.py
test_01_updatevolumedetail Success 0.11 test_resource_detail.py
test_01_reset_vm_on_reboot Success 201.60 test_reset_vm_on_reboot.py
test_createRegion Success 0.05 test_regions.py
test_create_pvlan_network Success 5.30 test_pvlan.py
test_dedicatePublicIpRange Success 0.52 test_public_ip_range.py
test_04_rvpc_privategw_static_routes Success 531.47 test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup Success 634.58 test_privategw_acl.py
test_02_vpc_privategw_static_routes Success 423.25 test_privategw_acl.py
test_01_vpc_privategw_acl Success 93.49 test_privategw_acl.py
test_01_primary_storage_nfs Success 35.89 test_primary_storage.py
test_createPortablePublicIPRange Success 15.21 test_portable_publicip.py
test_createPortablePublicIPAcquire Success 15.56 test_portable_publicip.py
test_isolate_network_password_server Success 90.14 test_password_server.py
test_UpdateStorageOverProvisioningFactor Success 0.19 test_over_provisioning.py
test_oobm_zchange_password Success 31.24 test_outofbandmanagement.py
test_oobm_multiple_mgmt_server_ownership Success 16.41 test_outofbandmanagement.py
test_oobm_issue_power_status Success 5.33 test_outofbandmanagement.py
test_oobm_issue_power_soft Success 10.37 test_outofbandmanagement.py
test_oobm_issue_power_reset Success 15.44 test_outofbandmanagement.py
test_oobm_issue_power_on Success 15.38 test_outofbandmanagement.py
test_oobm_issue_power_off Success 15.47 test_outofbandmanagement.py
test_oobm_issue_power_cycle Success 15.39 test_outofbandmanagement.py
test_oobm_enabledisable_across_clusterzones Success 93.02 test_outofbandmanagement.py
test_oobm_enable_feature_valid Success 5.73 test_outofbandmanagement.py
test_oobm_enable_feature_invalid Success 0.15 test_outofbandmanagement.py
test_oobm_disable_feature_valid Success 5.22 test_outofbandmanagement.py
test_oobm_disable_feature_invalid Success 0.12 test_outofbandmanagement.py
test_oobm_configure_invalid_driver Success 0.11 test_outofbandmanagement.py
test_oobm_configure_default_driver Success 0.11 test_outofbandmanagement.py
test_oobm_background_powerstate_sync Success 29.52 test_outofbandmanagement.py
test_extendPhysicalNetworkVlan Success 15.34 test_non_contigiousvlan.py
test_01_nic Success 541.26 test_nic.py
test_releaseIP Success 254.63 test_network.py
test_reboot_router Success 505.89 test_network.py
test_public_ip_user_account Success 10.29 test_network.py
test_public_ip_admin_account Success 40.28 test_network.py
test_network_rules_acquired_public_ip_3_Load_Balancer_Rule Success 67.35 test_network.py
test_network_rules_acquired_public_ip_2_nat_rule Success 62.47 test_network.py
test_network_rules_acquired_public_ip_1_static_nat_rule Success 124.57 test_network.py
test_delete_account Success 304.26 test_network.py
test_02_port_fwd_on_non_src_nat Success 55.73 test_network.py
test_01_port_fwd_on_src_nat Success 112.21 test_network.py
test_nic_secondaryip_add_remove Success 213.80 test_multipleips_per_nic.py
login_test_saml_user Success 24.97 test_login.py
test_assign_and_removal_lb Success 134.59 test_loadbalance.py
test_02_create_lb_rule_non_nat Success 187.89 test_loadbalance.py
test_01_create_lb_rule_src_nat Success 229.30 test_loadbalance.py
test_03_list_snapshots Success 0.08 test_list_ids_parameter.py
test_02_list_templates Success 0.04 test_list_ids_parameter.py
test_01_list_volumes Success 0.03 test_list_ids_parameter.py
test_07_list_default_iso Success 0.06 test_iso.py
test_05_iso_permissions Success 0.06 test_iso.py
test_04_extract_Iso Success 6.04 test_iso.py
test_03_delete_iso Success 95.23 test_iso.py
test_02_edit_iso Success 0.07 test_iso.py
test_01_create_iso Success 21.93 test_iso.py
test_04_rvpc_internallb_haproxy_stats_on_all_interfaces Success 334.19 test_internal_lb.py
test_03_vpc_internallb_haproxy_stats_on_all_interfaces Success 203.62 test_internal_lb.py
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 Success 530.95 test_internal_lb.py
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 Success 455.89 test_internal_lb.py
test_dedicateGuestVlanRange Success 10.33 test_guest_vlan_range.py
test_UpdateConfigParamWithScope Success 0.14 test_global_settings.py
test_rolepermission_lifecycle_update Success 7.12 test_dynamicroles.py
test_rolepermission_lifecycle_list Success 6.89 test_dynamicroles.py
test_rolepermission_lifecycle_delete Success 6.80 test_dynamicroles.py
test_rolepermission_lifecycle_create Success 6.89 test_dynamicroles.py
test_rolepermission_lifecycle_concurrent_updates Success 6.91 test_dynamicroles.py
test_role_lifecycle_update_role_inuse Success 6.86 test_dynamicroles.py
test_role_lifecycle_update Success 11.93 test_dynamicroles.py
test_role_lifecycle_list Success 6.83 test_dynamicroles.py
test_role_lifecycle_delete Success 6.85 test_dynamicroles.py
test_role_lifecycle_create Success 6.96 test_dynamicroles.py
test_role_inuse_deletion Success 6.82 test_dynamicroles.py
test_role_account_acls_multiple_mgmt_servers Success 9.07 test_dynamicroles.py
test_role_account_acls Success 9.38 test_dynamicroles.py
test_default_role_deletion Success 6.92 test_dynamicroles.py
test_04_create_fat_type_disk_offering Success 0.09 test_disk_offerings.py
test_03_delete_disk_offering Success 0.05 test_disk_offerings.py
test_02_edit_disk_offering Success 0.07 test_disk_offerings.py
test_02_create_sparse_type_disk_offering Success 0.09 test_disk_offerings.py
test_01_create_disk_offering Success 0.12 test_disk_offerings.py
test_deployvm_userdispersing Success 20.60 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userconcentrated Success 45.77 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_firstfit Success 55.74 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userdata_post Success 10.42 test_deploy_vm_with_userdata.py
test_deployvm_userdata Success 55.75 test_deploy_vm_with_userdata.py
test_02_deploy_vm_root_resize Success 6.91 test_deploy_vm_root_resize.py
test_01_deploy_vm_root_resize Success 6.89 test_deploy_vm_root_resize.py
test_00_deploy_vm_root_resize Success 243.55 test_deploy_vm_root_resize.py
test_deploy_vm_from_iso Success 208.34 test_deploy_vm_iso.py
test_DeployVmAntiAffinityGroup Success 66.17 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.03 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

@ustcweizhou
Copy link
Contributor

@ProjectMoon is there any possible ui change for this? if yes, I suggest to commit it together with this PR.

@rohityadavcloud
Copy link
Member

LGTM, Travis/Jenkins failure is not caused by this. Validated build, and Trillian tests. Merging this now.

@asfgit asfgit merged commit 52f5284 into apache:master Dec 7, 2016
asfgit pushed a commit that referenced this pull request Dec 7, 2016
[CLOUDSTACK-9644] Adding missing bits field to TemplateResponseThis pull request adds a bits field for template size, and sets it equal to ISO size.

* pr/1622:
  CLOUDSTACK-9644: Adding missing bits field to TemplateResponse

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@ProjectMoon ProjectMoon deleted the pr-template-bits 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

8 participants