Skip to content

CLOUDSTACK-9971: Bugfix/listaccounts parameter consistency - #2156

Merged
yadvr merged 1 commit into
apache:masterfrom
myENA:bugfix/listaccounts-parameter-consistency
Jan 3, 2018
Merged

CLOUDSTACK-9971: Bugfix/listaccounts parameter consistency#2156
yadvr merged 1 commit into
apache:masterfrom
myENA:bugfix/listaccounts-parameter-consistency

Conversation

@dcarbone

@dcarbone dcarbone commented Jun 20, 2017

Copy link
Copy Markdown
Contributor

Ran into an issue today where we passed both the "id" and "domainid" parameters into "listAccounts" and received a response despite the account id passed not belonging to the domainid passed.

This PR aims to correct this issue, along with a few other small updates.

JIRA Issue: CLOUDSTACK-9971

@kiwiflyer

Copy link
Copy Markdown
Contributor

@dcarbone Daniel, can you create a jira issue for this and reference it in the PR subject?

@dcarbone
dcarbone force-pushed the bugfix/listaccounts-parameter-consistency branch from 8a30798 to 548698c Compare June 21, 2017 15:40
@dcarbone

Copy link
Copy Markdown
Contributor Author

@kiwiflyer done

@kiwiflyer

Copy link
Copy Markdown
Contributor

@dcarbone Thanks!

Allow usage of "domainid" AND "id" in "listAccounts"
- Adding "AccountDoa::findActiveAccountById"
- Adding "AccountDaoImpl::findActiveAccountById"
- Removing seemingly pointless "listForDomain" parameter
- Updating "typeNEQ" value from "5" to "Account.ACCOUNT_TYPE_PROJECT"
  (which is "5")
- Only attempt to load domain for "path" query parameter once

"searchForAccountsInternal" input validation logic pseudo-code:
  - If "domainid" set, check immediately
  - If "id" not set:
    - and user is admin and "listall" is true
      - if "domainid" not set, use caller domain id
      - force "isrecursive" true
    - else use caller account id
  - Else if "domainid" and "name" set
    - verify existence of account and that user has access
  - Else:
    - if "domainid" not set, locate account by "id"
    - else, locate account by "id" and "domainid"
    - verify account found and caller has access rights
@dcarbone
dcarbone force-pushed the bugfix/listaccounts-parameter-consistency branch from 548698c to b27eb02 Compare June 21, 2017 15:45
@cloudmonger

Copy link
Copy Markdown

ACS CI BVT Run

Sumarry:
Build Number 907
Hypervisor xenserver
NetworkType Advanced
Passed=105
Failed=8
Skipped=12

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

Failed tests:

  • test_deploy_vm_iso.py

  • test_deploy_vm_from_iso Failed

  • test_volumes.py

  • test_06_download_detached_volume Failed

  • test_vm_life_cycle.py

  • test_10_attachAndDetach_iso Failed

  • test_routers_network_ops.py

  • test_01_isolate_network_FW_PF_default_routes_egress_true Failing since 34 runs

  • test_02_isolate_network_FW_PF_default_routes_egress_false Failing since 34 runs

  • test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true Failing since 34 runs

  • test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false Failing since 34 runs

  • test_03_RVR_Network_check_router_state Failing since 3 runs

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_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_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_disk_offerings.py

@borisstoyanov

Copy link
Copy Markdown
Contributor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@borisstoyanov 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-792

@borisstoyanov

Copy link
Copy Markdown
Contributor

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@borisstoyanov 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-1189)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34356 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2156-t1189-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Test completed. 49 look ok, 2 have error(s)

Test Result Time (s) Test File
test_05_rvpc_multi_tiers Failure 191.58 test_vpc_redundant.py
test_04_rvpc_privategw_static_routes Failure 361.50 test_privategw_acl.py
test_01_vpc_site2site_vpn Success 149.81 test_vpc_vpn.py
test_01_vpc_remote_access_vpn Success 61.16 test_vpc_vpn.py
test_01_redundant_vpc_site2site_vpn Success 230.50 test_vpc_vpn.py
test_02_VPC_default_routes Success 254.43 test_vpc_router_nics.py
test_01_VPC_nics_after_destroy Success 498.64 test_vpc_router_nics.py
test_04_rvpc_network_garbage_collector_nics Success 1397.59 test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Success 531.75 test_vpc_redundant.py
test_02_redundant_VPC_default_routes Success 733.47 test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Success 1269.19 test_vpc_redundant.py
test_09_delete_detached_volume Success 151.64 test_volumes.py
test_08_resize_volume Success 156.53 test_volumes.py
test_07_resize_fail Success 161.59 test_volumes.py
test_06_download_detached_volume Success 156.40 test_volumes.py
test_05_detach_volume Success 145.78 test_volumes.py
test_04_delete_attached_volume Success 151.31 test_volumes.py
test_03_download_attached_volume Success 156.43 test_volumes.py
test_02_attach_volume Success 84.30 test_volumes.py
test_01_create_volume Success 621.82 test_volumes.py
test_03_delete_vm_snapshots Success 275.16 test_vm_snapshots.py
test_02_revert_vm_snapshots Success 100.90 test_vm_snapshots.py
test_01_create_vm_snapshots Success 139.35 test_vm_snapshots.py
test_deploy_vm_multiple Success 278.02 test_vm_life_cycle.py
test_deploy_vm Success 0.04 test_vm_life_cycle.py
test_advZoneVirtualRouter Success 0.03 test_vm_life_cycle.py
test_10_attachAndDetach_iso Success 26.66 test_vm_life_cycle.py
test_09_expunge_vm Success 125.26 test_vm_life_cycle.py
test_08_migrate_vm Success 66.22 test_vm_life_cycle.py
test_07_restore_vm Success 0.15 test_vm_life_cycle.py
test_06_destroy_vm Success 125.93 test_vm_life_cycle.py
test_03_reboot_vm Success 125.90 test_vm_life_cycle.py
test_02_start_vm Success 5.20 test_vm_life_cycle.py
test_01_stop_vm_forced Success 5.18 test_vm_life_cycle.py
test_01_stop_vm Success 30.30 test_vm_life_cycle.py
test_CreateTemplateWithDuplicateName Success 80.75 test_templates.py
test_08_list_system_templates Success 0.06 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.19 test_templates.py
test_03_delete_template Success 5.13 test_templates.py
test_02_edit_template Success 90.20 test_templates.py
test_01_create_template Success 95.90 test_templates.py
test_10_destroy_cpvm Success 131.42 test_ssvm.py
test_09_destroy_ssvm Success 168.36 test_ssvm.py
test_08_reboot_cpvm Success 101.39 test_ssvm.py
test_07_reboot_ssvm Success 133.20 test_ssvm.py
test_06_stop_cpvm Success 131.57 test_ssvm.py
test_05_stop_ssvm Success 133.59 test_ssvm.py
test_04_cpvm_internals Success 1.17 test_ssvm.py
test_03_ssvm_internals Success 3.88 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_02_list_snapshots_with_removed_data_store Success 82.15 test_snapshots.py
test_01_snapshot_root_disk Success 11.42 test_snapshots.py
test_04_change_offering_small Success 210.34 test_service_offerings.py
test_03_delete_service_offering Success 0.04 test_service_offerings.py
test_02_edit_service_offering Success 0.06 test_service_offerings.py
test_01_create_service_offering Success 0.18 test_service_offerings.py
test_02_sys_template_ready Success 0.17 test_secondary_storage.py
test_01_sys_vm_start Success 0.23 test_secondary_storage.py
test_09_reboot_router Success 35.31 test_routers.py
test_08_start_router Success 25.30 test_routers.py
test_07_stop_router Success 10.18 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.63 test_routers.py
test_03_restart_network_cleanup Success 60.58 test_routers.py
test_02_router_internal_adv Success 0.88 test_routers.py
test_01_router_internal_basic Success 0.47 test_routers.py
test_router_dns_guestipquery Success 76.88 test_router_dns.py
test_router_dns_externalipquery Success 0.07 test_router_dns.py
test_router_dhcphosts Success 272.03 test_router_dhcphosts.py
test_router_dhcp_opts Success 21.62 test_router_dhcphosts.py
test_01_updatevolumedetail Success 5.12 test_resource_detail.py
test_01_reset_vm_on_reboot Success 131.06 test_reset_vm_on_reboot.py
test_createRegion Success 0.05 test_regions.py
test_create_pvlan_network Success 5.23 test_pvlan.py
test_dedicatePublicIpRange Success 0.55 test_public_ip_range.py
test_03_vpc_privategw_restart_vpc_cleanup Success 490.26 test_privategw_acl.py
test_02_vpc_privategw_static_routes Success 386.42 test_privategw_acl.py
test_01_vpc_privategw_acl Success 82.54 test_privategw_acl.py
test_03_migration_options_storage_tags Success 161.91 test_primary_storage.py
test_02_edit_primary_storage_tags Success 0.30 test_primary_storage.py
test_01_primary_storage_nfs Success 36.07 test_primary_storage.py
test_01_deploy_vms_storage_tags Success 21.46 test_primary_storage.py
test_createPortablePublicIPRange Success 15.22 test_portable_publicip.py
test_createPortablePublicIPAcquire Success 15.61 test_portable_publicip.py
test_isolate_network_password_server Success 90.61 test_password_server.py
test_UpdateStorageOverProvisioningFactor Success 0.14 test_over_provisioning.py
test_oobm_zchange_password Success 26.03 test_outofbandmanagement.py
test_oobm_multiple_mgmt_server_ownership Success 16.70 test_outofbandmanagement.py
test_oobm_issue_power_status Success 5.52 test_outofbandmanagement.py
test_oobm_issue_power_soft Success 15.50 test_outofbandmanagement.py
test_oobm_issue_power_reset Success 10.62 test_outofbandmanagement.py
test_oobm_issue_power_on Success 15.72 test_outofbandmanagement.py
test_oobm_issue_power_off Success 10.59 test_outofbandmanagement.py
test_oobm_issue_power_cycle Success 10.74 test_outofbandmanagement.py
test_oobm_enabledisable_across_clusterzones Success 83.32 test_outofbandmanagement.py
test_oobm_enable_feature_valid Success 5.44 test_outofbandmanagement.py
test_oobm_enable_feature_invalid Success 5.16 test_outofbandmanagement.py
test_oobm_disable_feature_valid Success 0.23 test_outofbandmanagement.py
test_oobm_disable_feature_invalid Success 0.24 test_outofbandmanagement.py
test_oobm_configure_invalid_driver Success 0.19 test_outofbandmanagement.py
test_oobm_configure_default_driver Success 0.18 test_outofbandmanagement.py
test_oobm_background_powerstate_sync Success 23.62 test_outofbandmanagement.py
test_extendPhysicalNetworkVlan Success 15.54 test_non_contigiousvlan.py
test_01_nic Success 450.57 test_nic.py
test_releaseIP Success 147.79 test_network.py
test_reboot_router Success 389.21 test_network.py
test_public_ip_user_account Success 10.37 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 67.11 test_network.py
test_network_rules_acquired_public_ip_2_nat_rule Success 61.79 test_network.py
test_network_rules_acquired_public_ip_1_static_nat_rule Success 120.91 test_network.py
test_delete_account Success 298.34 test_network.py
test_02_port_fwd_on_non_src_nat Success 55.80 test_network.py
test_01_port_fwd_on_src_nat Success 112.06 test_network.py
test_nic_secondaryip_add_remove Success 243.54 test_multipleips_per_nic.py
test_list_zones_metrics Success 0.38 test_metrics_api.py
test_list_volumes_metrics Success 5.71 test_metrics_api.py
test_list_vms_metrics Success 227.80 test_metrics_api.py
test_list_pstorage_metrics Success 0.58 test_metrics_api.py
test_list_infrastructure_metrics Success 0.64 test_metrics_api.py
test_list_hosts_metrics Success 0.49 test_metrics_api.py
test_list_clusters_metrics Success 0.54 test_metrics_api.py
login_test_saml_user Success 19.99 test_login.py
test_assign_and_removal_lb Success 134.69 test_loadbalance.py
test_02_create_lb_rule_non_nat Success 188.21 test_loadbalance.py
test_01_create_lb_rule_src_nat Success 208.89 test_loadbalance.py
test_03_list_snapshots Success 0.09 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.10 test_iso.py
test_05_iso_permissions Success 0.14 test_iso.py
test_04_extract_Iso Success 5.36 test_iso.py
test_03_delete_iso Success 95.22 test_iso.py
test_02_edit_iso Success 0.10 test_iso.py
test_01_create_iso Success 21.11 test_iso.py
test_04_rvpc_internallb_haproxy_stats_on_all_interfaces Success 188.68 test_internal_lb.py
test_03_vpc_internallb_haproxy_stats_on_all_interfaces Success 138.08 test_internal_lb.py
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 Success 500.07 test_internal_lb.py
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 Success 482.50 test_internal_lb.py
test_dedicateGuestVlanRange Success 10.38 test_guest_vlan_range.py
test_UpdateConfigParamWithScope Success 0.24 test_global_settings.py
test_rolepermission_lifecycle_update Success 6.71 test_dynamicroles.py
test_rolepermission_lifecycle_list Success 6.18 test_dynamicroles.py
test_rolepermission_lifecycle_delete Success 6.04 test_dynamicroles.py
test_rolepermission_lifecycle_create Success 6.14 test_dynamicroles.py
test_rolepermission_lifecycle_concurrent_updates Success 6.33 test_dynamicroles.py
test_role_lifecycle_update_role_inuse Success 6.11 test_dynamicroles.py
test_role_lifecycle_update Success 6.17 test_dynamicroles.py
test_role_lifecycle_list Success 5.97 test_dynamicroles.py
test_role_lifecycle_delete Success 11.17 test_dynamicroles.py
test_role_lifecycle_create Success 6.26 test_dynamicroles.py
test_role_inuse_deletion Success 6.19 test_dynamicroles.py
test_role_account_acls_multiple_mgmt_servers Success 10.12 test_dynamicroles.py
test_role_account_acls Success 10.14 test_dynamicroles.py
test_default_role_deletion Success 6.50 test_dynamicroles.py
test_04_create_fat_type_disk_offering Success 0.10 test_disk_offerings.py
test_03_delete_disk_offering Success 0.06 test_disk_offerings.py
test_02_edit_disk_offering Success 0.08 test_disk_offerings.py
test_02_create_sparse_type_disk_offering Success 0.13 test_disk_offerings.py
test_01_create_disk_offering Success 0.16 test_disk_offerings.py
test_deployvm_userdispersing Success 20.61 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userconcentrated Success 20.62 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_firstfit Success 111.31 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userdata_post Success 50.77 test_deploy_vm_with_userdata.py
test_deployvm_userdata Success 45.95 test_deploy_vm_with_userdata.py
test_02_deploy_vm_root_resize Success 0.07 test_deploy_vm_root_resize.py
test_01_deploy_vm_root_resize Success 0.08 test_deploy_vm_root_resize.py
test_00_deploy_vm_root_resize Success 222.23 test_deploy_vm_root_resize.py
test_deploy_vm_from_iso Success 212.77 test_deploy_vm_iso.py
test_06_verify_guest_lspci_again Success 37.44 test_deploy_virtio_scsi_vm.py
test_05_change_vm_ostype_restart Success 16.09 test_deploy_virtio_scsi_vm.py
test_04_verify_guest_lspci Success 40.45 test_deploy_virtio_scsi_vm.py
test_03_verify_libvirt_attach_disk Success 10.73 test_deploy_virtio_scsi_vm.py
test_02_verify_libvirt_after_restart Success 136.74 test_deploy_virtio_scsi_vm.py
test_01_verify_libvirt Success 0.40 test_deploy_virtio_scsi_vm.py
test_DeployVmAntiAffinityGroup Success 61.32 test_affinity_groups.py
test_change_service_offering_for_vm_with_snapshots Skipped 0.00 test_vm_snapshots.py
test_09_copy_delete_template Skipped 0.02 test_templates.py
test_06_copy_template Skipped 0.00 test_templates.py
test_static_role_account_acls Skipped 0.07 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.05 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.06 test_deploy_vgpu_enabled_vm.py
test_3d_gpu_support Skipped 0.04 test_deploy_vgpu_enabled_vm.py

@borisstoyanov borisstoyanov left a comment

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.

@dcarbone can you please add JIRA item in the title, same as the other PRs in the repo.

@dcarbone dcarbone changed the title Bugfix/listaccounts parameter consistency CLOUDSTACK-9971 - Bugfix/listaccounts parameter consistency Jul 11, 2017
@dcarbone dcarbone changed the title CLOUDSTACK-9971 - Bugfix/listaccounts parameter consistency CLOUDSTACK-9971: Bugfix/listaccounts parameter consistency Jul 11, 2017
@dcarbone

Copy link
Copy Markdown
Contributor Author

@borisstoyanov: updated, sorry for the delay!

@borisstoyanov borisstoyanov left a comment

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.

Thanks, this LGTM

@yadvr yadvr added this to the 4.11 milestone Dec 28, 2017
@yadvr

yadvr commented Dec 28, 2017

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-1521

@yadvr

yadvr commented Dec 28, 2017

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-1940)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 36986 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2156-t1940-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
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_vpc_redundant.py
Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 65 look OK, 1 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_hostha_kvm_host_fencing Error 656.03 test_hostha_kvm.py

@yadvr yadvr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM.

@yadvr

yadvr commented Jan 3, 2018

Copy link
Copy Markdown
Member

Tests lgtm. Merging this based on two lgtms and test results.

@yadvr
yadvr merged commit 000ee36 into apache:master Jan 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants