Skip to content

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

Merged
asfgit merged 1 commit into
apache:masterfrom
greenqloud:pr-template-bits
Dec 7, 2016
Merged

[CLOUDSTACK-9644] Adding missing bits field to TemplateResponse#1622
asfgit merged 1 commit into
apache:masterfrom
greenqloud:pr-template-bits

Conversation

@ProjectMoon

Copy link
Copy Markdown

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

@yadvr

yadvr commented Aug 3, 2016

Copy link
Copy Markdown
Member

LGTM

@blueorangutan

Copy link
Copy Markdown

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

@jburwell

Copy link
Copy Markdown
Contributor

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

@jburwell

jburwell commented Aug 4, 2016

Copy link
Copy Markdown
Contributor

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

@yadvr

yadvr commented Aug 5, 2016

Copy link
Copy Markdown
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
Copy Markdown
Author

Will check the smoke tests for Marvin.

@blueorangutan

Copy link
Copy Markdown

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

@jburwell

jburwell commented Aug 5, 2016

Copy link
Copy Markdown
Contributor

@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
Copy Markdown
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
Copy Markdown

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

@yadvr

yadvr commented Aug 5, 2016

Copy link
Copy Markdown
Member

@blueorangutan kick

@blueorangutan

Copy link
Copy Markdown

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
Copy Markdown

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

@ProjectMoon

Copy link
Copy Markdown
Author

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

@jburwell

Copy link
Copy Markdown
Contributor

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

private Map details;

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

Copy link
Copy Markdown
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

@yadvr

Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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

@ProjectMoon

Copy link
Copy Markdown
Author

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

@ProjectMoon

Copy link
Copy Markdown
Author

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

@yadvr

Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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

@ProjectMoon

Copy link
Copy Markdown
Author

Rebased to latest master.

@yadvr

Copy link
Copy Markdown
Member

Thanks @ProjectMoon
@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@yadvr

Copy link
Copy Markdown
Member

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

@blueorangutan

Copy link
Copy Markdown

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

@ProjectMoonProjectMoon changed the title Adding missing bits field to TemplateResponse[CLOUDSTACK-9644] Adding missing bits field to TemplateResponseDec 1, 2016
@ProjectMoon

Copy link
Copy Markdown
Author

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

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

@yadvr

yadvr commented Dec 2, 2016

Copy link
Copy Markdown
Member

Thanks @ProjectMoon
@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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

@yadvr

yadvr commented Dec 2, 2016

Copy link
Copy Markdown
Member

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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)

TestResultTime (s)Test File
test_06_download_detached_volumeError15.29test_volumes.py
test_01_vpc_site2site_vpnSuccess200.81test_vpc_vpn.py
test_01_vpc_remote_access_vpnSuccess61.31test_vpc_vpn.py
test_01_redundant_vpc_site2site_vpnSuccess341.41test_vpc_vpn.py
test_02_VPC_default_routesSuccess275.51test_vpc_router_nics.py
test_01_VPC_nics_after_destroySuccess545.40test_vpc_router_nics.py
test_05_rvpc_multi_tiersSuccess554.40test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nicsSuccess1483.94test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routersSuccess698.95test_vpc_redundant.py
test_02_redundant_VPC_default_routesSuccess950.13test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACLSuccess1405.56test_vpc_redundant.py
test_09_delete_detached_volumeSuccess15.57test_volumes.py
test_08_resize_volumeSuccess15.46test_volumes.py
test_07_resize_failSuccess20.50test_volumes.py
test_05_detach_volumeSuccess100.30test_volumes.py
test_04_delete_attached_volumeSuccess10.21test_volumes.py
test_03_download_attached_volumeSuccess15.30test_volumes.py
test_02_attach_volumeSuccess73.83test_volumes.py
test_01_create_volumeSuccess738.53test_volumes.py
test_deploy_vm_multipleSuccess379.91test_vm_life_cycle.py
test_deploy_vmSuccess0.03test_vm_life_cycle.py
test_advZoneVirtualRouterSuccess0.03test_vm_life_cycle.py
test_10_attachAndDetach_isoSuccess67.70test_vm_life_cycle.py
test_09_expunge_vmSuccess125.24test_vm_life_cycle.py
test_08_migrate_vmSuccess41.01test_vm_life_cycle.py
test_07_restore_vmSuccess1.44test_vm_life_cycle.py
test_06_destroy_vmSuccess131.17test_vm_life_cycle.py
test_03_reboot_vmSuccess130.97test_vm_life_cycle.py
test_02_start_vmSuccess10.19test_vm_life_cycle.py
test_01_stop_vmSuccess50.46test_vm_life_cycle.py
test_CreateTemplateWithDuplicateNameSuccess95.86test_templates.py
test_08_list_system_templatesSuccess0.03test_templates.py
test_07_list_public_templatesSuccess0.04test_templates.py
test_05_template_permissionsSuccess0.07test_templates.py
test_04_extract_templateSuccess5.40test_templates.py
test_03_delete_templateSuccess5.11test_templates.py
test_02_edit_templateSuccess90.13test_templates.py
test_01_create_templateSuccess115.91test_templates.py
test_10_destroy_cpvmSuccess196.95test_ssvm.py
test_09_destroy_ssvmSuccess138.98test_ssvm.py
test_08_reboot_cpvmSuccess136.91test_ssvm.py
test_07_reboot_ssvmSuccess138.99test_ssvm.py
test_06_stop_cpvmSuccess142.01test_ssvm.py
test_05_stop_ssvmSuccess174.14test_ssvm.py
test_04_cpvm_internalsSuccess1.56test_ssvm.py
test_03_ssvm_internalsSuccess7.17test_ssvm.py
test_02_list_cpvm_vmSuccess0.17test_ssvm.py
test_01_list_sec_storage_vmSuccess0.15test_ssvm.py
test_01_snapshot_root_diskSuccess21.47test_snapshots.py
test_04_change_offering_smallSuccess247.92test_service_offerings.py
test_03_delete_service_offeringSuccess0.04test_service_offerings.py
test_02_edit_service_offeringSuccess0.10test_service_offerings.py
test_01_create_service_offeringSuccess0.11test_service_offerings.py
test_02_sys_template_readySuccess0.14test_secondary_storage.py
test_01_sys_vm_startSuccess0.19test_secondary_storage.py
test_09_reboot_routerSuccess50.46test_routers.py
test_08_start_routerSuccess35.35test_routers.py
test_07_stop_routerSuccess15.19test_routers.py
test_06_router_advancedSuccess0.07test_routers.py
test_05_router_basicSuccess0.04test_routers.py
test_04_restart_network_wo_cleanupSuccess5.71test_routers.py
test_03_restart_network_cleanupSuccess65.59test_routers.py
test_02_router_internal_advSuccess1.15test_routers.py
test_01_router_internal_basicSuccess0.60test_routers.py
test_router_dns_guestipquerySuccess76.94test_router_dns.py
test_router_dns_externalipquerySuccess0.14test_router_dns.py
test_router_dhcphostsSuccess287.18test_router_dhcphosts.py
test_router_dhcp_optsSuccess21.84test_router_dhcphosts.py
test_01_updatevolumedetailSuccess0.11test_resource_detail.py
test_01_reset_vm_on_rebootSuccess201.60test_reset_vm_on_reboot.py
test_createRegionSuccess0.05test_regions.py
test_create_pvlan_networkSuccess5.30test_pvlan.py
test_dedicatePublicIpRangeSuccess0.52test_public_ip_range.py
test_04_rvpc_privategw_static_routesSuccess531.47test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanupSuccess634.58test_privategw_acl.py
test_02_vpc_privategw_static_routesSuccess423.25test_privategw_acl.py
test_01_vpc_privategw_aclSuccess93.49test_privategw_acl.py
test_01_primary_storage_nfsSuccess35.89test_primary_storage.py
test_createPortablePublicIPRangeSuccess15.21test_portable_publicip.py
test_createPortablePublicIPAcquireSuccess15.56test_portable_publicip.py
test_isolate_network_password_serverSuccess90.14test_password_server.py
test_UpdateStorageOverProvisioningFactorSuccess0.19test_over_provisioning.py
test_oobm_zchange_passwordSuccess31.24test_outofbandmanagement.py
test_oobm_multiple_mgmt_server_ownershipSuccess16.41test_outofbandmanagement.py
test_oobm_issue_power_statusSuccess5.33test_outofbandmanagement.py
test_oobm_issue_power_softSuccess10.37test_outofbandmanagement.py
test_oobm_issue_power_resetSuccess15.44test_outofbandmanagement.py
test_oobm_issue_power_onSuccess15.38test_outofbandmanagement.py
test_oobm_issue_power_offSuccess15.47test_outofbandmanagement.py
test_oobm_issue_power_cycleSuccess15.39test_outofbandmanagement.py
test_oobm_enabledisable_across_clusterzonesSuccess93.02test_outofbandmanagement.py
test_oobm_enable_feature_validSuccess5.73test_outofbandmanagement.py
test_oobm_enable_feature_invalidSuccess0.15test_outofbandmanagement.py
test_oobm_disable_feature_validSuccess5.22test_outofbandmanagement.py
test_oobm_disable_feature_invalidSuccess0.12test_outofbandmanagement.py
test_oobm_configure_invalid_driverSuccess0.11test_outofbandmanagement.py
test_oobm_configure_default_driverSuccess0.11test_outofbandmanagement.py
test_oobm_background_powerstate_syncSuccess29.52test_outofbandmanagement.py
test_extendPhysicalNetworkVlanSuccess15.34test_non_contigiousvlan.py
test_01_nicSuccess541.26test_nic.py
test_releaseIPSuccess254.63test_network.py
test_reboot_routerSuccess505.89test_network.py
test_public_ip_user_accountSuccess10.29test_network.py
test_public_ip_admin_accountSuccess40.28test_network.py
test_network_rules_acquired_public_ip_3_Load_Balancer_RuleSuccess67.35test_network.py
test_network_rules_acquired_public_ip_2_nat_ruleSuccess62.47test_network.py
test_network_rules_acquired_public_ip_1_static_nat_ruleSuccess124.57test_network.py
test_delete_accountSuccess304.26test_network.py
test_02_port_fwd_on_non_src_natSuccess55.73test_network.py
test_01_port_fwd_on_src_natSuccess112.21test_network.py
test_nic_secondaryip_add_removeSuccess213.80test_multipleips_per_nic.py
login_test_saml_userSuccess24.97test_login.py
test_assign_and_removal_lbSuccess134.59test_loadbalance.py
test_02_create_lb_rule_non_natSuccess187.89test_loadbalance.py
test_01_create_lb_rule_src_natSuccess229.30test_loadbalance.py
test_03_list_snapshotsSuccess0.08test_list_ids_parameter.py
test_02_list_templatesSuccess0.04test_list_ids_parameter.py
test_01_list_volumesSuccess0.03test_list_ids_parameter.py
test_07_list_default_isoSuccess0.06test_iso.py
test_05_iso_permissionsSuccess0.06test_iso.py
test_04_extract_IsoSuccess6.04test_iso.py
test_03_delete_isoSuccess95.23test_iso.py
test_02_edit_isoSuccess0.07test_iso.py
test_01_create_isoSuccess21.93test_iso.py
test_04_rvpc_internallb_haproxy_stats_on_all_interfacesSuccess334.19test_internal_lb.py
test_03_vpc_internallb_haproxy_stats_on_all_interfacesSuccess203.62test_internal_lb.py
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80Success530.95test_internal_lb.py
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80Success455.89test_internal_lb.py
test_dedicateGuestVlanRangeSuccess10.33test_guest_vlan_range.py
test_UpdateConfigParamWithScopeSuccess0.14test_global_settings.py
test_rolepermission_lifecycle_updateSuccess7.12test_dynamicroles.py
test_rolepermission_lifecycle_listSuccess6.89test_dynamicroles.py
test_rolepermission_lifecycle_deleteSuccess6.80test_dynamicroles.py
test_rolepermission_lifecycle_createSuccess6.89test_dynamicroles.py
test_rolepermission_lifecycle_concurrent_updatesSuccess6.91test_dynamicroles.py
test_role_lifecycle_update_role_inuseSuccess6.86test_dynamicroles.py
test_role_lifecycle_updateSuccess11.93test_dynamicroles.py
test_role_lifecycle_listSuccess6.83test_dynamicroles.py
test_role_lifecycle_deleteSuccess6.85test_dynamicroles.py
test_role_lifecycle_createSuccess6.96test_dynamicroles.py
test_role_inuse_deletionSuccess6.82test_dynamicroles.py
test_role_account_acls_multiple_mgmt_serversSuccess9.07test_dynamicroles.py
test_role_account_aclsSuccess9.38test_dynamicroles.py
test_default_role_deletionSuccess6.92test_dynamicroles.py
test_04_create_fat_type_disk_offeringSuccess0.09test_disk_offerings.py
test_03_delete_disk_offeringSuccess0.05test_disk_offerings.py
test_02_edit_disk_offeringSuccess0.07test_disk_offerings.py
test_02_create_sparse_type_disk_offeringSuccess0.09test_disk_offerings.py
test_01_create_disk_offeringSuccess0.12test_disk_offerings.py
test_deployvm_userdispersingSuccess20.60test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userconcentratedSuccess45.77test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_firstfitSuccess55.74test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userdata_postSuccess10.42test_deploy_vm_with_userdata.py
test_deployvm_userdataSuccess55.75test_deploy_vm_with_userdata.py
test_02_deploy_vm_root_resizeSuccess6.91test_deploy_vm_root_resize.py
test_01_deploy_vm_root_resizeSuccess6.89test_deploy_vm_root_resize.py
test_00_deploy_vm_root_resizeSuccess243.55test_deploy_vm_root_resize.py
test_deploy_vm_from_isoSuccess208.34test_deploy_vm_iso.py
test_DeployVmAntiAffinityGroupSuccess66.17test_affinity_groups.py
test_03_delete_vm_snapshotsSkipped0.00test_vm_snapshots.py
test_02_revert_vm_snapshotsSkipped0.00test_vm_snapshots.py
test_01_test_vm_volume_snapshotSkipped0.00test_vm_snapshots.py
test_01_create_vm_snapshotsSkipped0.00test_vm_snapshots.py
test_06_copy_templateSkipped0.00test_templates.py
test_static_role_account_aclsSkipped0.03test_staticroles.py
test_11_ss_nfs_version_on_ssvmSkipped0.03test_ssvm.py
test_01_scale_vmSkipped0.00test_scale_vm.py
test_01_primary_storage_iscsiSkipped0.04test_primary_storage.py
test_nested_virtualization_vmwareSkipped0.00test_nested_virtualization.py
test_06_copy_isoSkipped0.00test_iso.py
test_deploy_vgpu_enabled_vmSkipped0.03test_deploy_vgpu_enabled_vm.py
test_3d_gpu_supportSkipped0.04test_deploy_vgpu_enabled_vm.py

@ustcweizhou

Copy link
Copy Markdown
Contributor

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

@yadvr

yadvr commented Dec 7, 2016

Copy link
Copy Markdown
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:masterDec 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 freeto 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.

8 participants

@ProjectMoon@yadvr@blueorangutan@jburwell@ustcweizhou@koushik-das@asfgit@bluebottle