Skip to content

server: fix for vm snapshot search (#3208)#3257

Merged
yadvr merged 3 commits into
apache:masterfrom
shapeblue:fix-vm-snapshot-search-3208
Apr 8, 2019
Merged

server: fix for vm snapshot search (#3208)#3257
yadvr merged 3 commits into
apache:masterfrom
shapeblue:fix-vm-snapshot-search-3208

Conversation

@shwstppr

@shwstppr shwstppr commented Apr 3, 2019

Copy link
Copy Markdown
Contributor

Description

Fixes #3208

Using db column instead of VO variable name was causing issue with SQL select statement.
This PR fixes the problem by using VO variable for adding conditional.
Additionally in UI listAll parameter was being sent twice in the listVMSnapshot API call. It is fixed with this PR.

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Screenshots (if appropriate):

Original behavior giving error,
Screenshot from 2019-04-03 13-06-09

With changes,
Screenshot from 2019-04-03 13-09-04
Screenshot from 2019-04-03 13-08-18

How Has This Been Tested?

From UI and cmk

shwstppr added 2 commits April 3, 2019 12:59
Using db column instead of VO variable name was causing issue with SQL select statement.
This change fixes the problem by using VO variable for adding conditional.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
)

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
@andrijapanicsb

Copy link
Copy Markdown
Contributor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@andrijapanicsb 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-2672

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

lots of formatting in addition. 👍

@yadvr

yadvr commented Apr 4, 2019

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-3467)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 17175 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3257-t3467-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_public_ip_range.py
Intermittent failure detected: /marvin/tests/smoke/test_reset_vm_on_reboot.py
Intermittent failure detected: /marvin/tests/smoke/test_resource_accounting.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dns.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dnsservice.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_routers.py
Intermittent failure detected: /marvin/tests/smoke/test_secondary_storage.py
Intermittent failure detected: /marvin/tests/smoke/test_service_offerings.py
Intermittent failure detected: /marvin/tests/smoke/test_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
Intermittent failure detected: /marvin/tests/smoke/test_templates.py
Intermittent failure detected: /marvin/tests/smoke/test_usage.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 50 look OK, 20 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
ContextSuite context=TestResetVmOnReboot>:setup Error 0.00 test_reset_vm_on_reboot.py
test_01_so_removal_resource_update Error 1.41 test_resource_accounting.py
ContextSuite context=TestISOUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestLBRuleUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestNatRuleUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestPublicIPUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestSnapshotUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestVmUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestVolumeUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestVpnUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestRouterDHCPHosts>:setup Error 0.00 test_router_dhcphosts.py
ContextSuite context=TestRouterDHCPOpts>:setup Error 0.00 test_router_dhcphosts.py
ContextSuite context=TestRouterDns>:setup Error 0.00 test_router_dns.py
ContextSuite context=TestRouterDnsService>:setup Error 0.00 test_router_dnsservice.py
test_02_routervm_iptables_policies Error 1.30 test_routers_iptables_default_policy.py
test_01_single_VPC_iptables_policies Error 4.38 test_routers_iptables_default_policy.py
test_01_isolate_network_FW_PF_default_routes_egress_true Error 1.42 test_routers_network_ops.py
test_02_isolate_network_FW_PF_default_routes_egress_false Error 1.40 test_routers_network_ops.py
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true Error 6.09 test_routers_network_ops.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false Error 5.99 test_routers_network_ops.py
test_03_RVR_Network_check_router_state Error 5.99 test_routers_network_ops.py
ContextSuite context=TestRouterServices>:setup Error 0.00 test_routers.py
test_01_sys_vm_start Failure 0.11 test_secondary_storage.py
ContextSuite context=TestCpuCapServiceOfferings>:setup Error 0.00 test_service_offerings.py
ContextSuite context=TestServiceOfferings>:setup Error 2.24 test_service_offerings.py
ContextSuite context=TestCreateVolume>:setup Error 0.00 test_volumes.py
ContextSuite context=TestVolumes>:setup Error 0.00 test_volumes.py
ContextSuite context=TestSnapshotRootDisk>:setup Error 0.00 test_snapshots.py
test_01_list_sec_storage_vm Failure 0.04 test_ssvm.py
test_02_list_cpvm_vm Failure 0.03 test_ssvm.py
test_03_ssvm_internals Failure 0.04 test_ssvm.py
test_04_cpvm_internals Failure 0.04 test_ssvm.py
test_05_stop_ssvm Failure 0.04 test_ssvm.py
test_06_stop_cpvm Failure 0.05 test_ssvm.py
test_07_reboot_ssvm Failure 0.04 test_ssvm.py
test_08_reboot_cpvm Failure 0.04 test_ssvm.py
test_09_destroy_ssvm Failure 0.04 test_ssvm.py
test_10_destroy_cpvm Failure 0.04 test_ssvm.py
test_02_create_template_with_checksum_sha1 Error 65.46 test_templates.py
test_03_create_template_with_checksum_sha256 Error 65.49 test_templates.py
test_04_create_template_with_checksum_md5 Error 65.48 test_templates.py
test_05_create_template_with_no_checksum Error 65.48 test_templates.py
test_02_deploy_vm_from_direct_download_template Error 1.32 test_templates.py
test_03_deploy_vm_wrong_checksum Error 1.39 test_templates.py
ContextSuite context=TestTemplates>:setup Error 17.75 test_templates.py
ContextSuite context=Test01DeployVM>:setup Error 0.00 test_vm_life_cycle.py
ContextSuite context=Test02VMLifeCycle>:setup Error 0.00 test_vm_life_cycle.py
test_14_secure_to_secure_vm_migration Error 11.48 test_vm_life_cycle.py
test_15_secured_to_nonsecured_vm_migration Error 74.61 test_vm_life_cycle.py
test_16_nonsecured_to_secured_vm_migration Error 1.30 test_vm_life_cycle.py
ContextSuite context=TestVmSnapshot>:setup Error 2.12 test_vm_snapshots.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Error 7.27 test_vpc_redundant.py
test_02_redundant_VPC_default_routes Error 8.13 test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Error 6.08 test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nics Error 6.13 test_vpc_redundant.py
test_05_rvpc_multi_tiers Error 8.20 test_vpc_redundant.py
test_01_VPC_nics_after_destroy Error 4.00 test_vpc_router_nics.py
test_02_VPC_default_routes Error 4.00 test_vpc_router_nics.py
test_01_redundant_vpc_site2site_vpn Failure 6.51 test_vpc_vpn.py
test_01_vpc_site2site_vpn_multiple_options Failure 6.50 test_vpc_vpn.py
test_01_vpc_remote_access_vpn Failure 4.26 test_vpc_vpn.py
test_01_vpc_site2site_vpn Failure 4.40 test_vpc_vpn.py

@anuragaw

anuragaw commented Apr 5, 2019

Copy link
Copy Markdown
Contributor

Lgtm

@shwstppr

shwstppr commented Apr 5, 2019

Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@shwstppr 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-3474)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34873 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3257-t3474-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 70 look OK, 0 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File

@yadvr

yadvr commented Apr 8, 2019

Copy link
Copy Markdown
Member

Test pass OK.

@yadvr
yadvr merged commit 9b14e17 into apache:master Apr 8, 2019
pbankonier pushed a commit to pbankonier/cloudstack that referenced this pull request Apr 24, 2019
Using db column instead of VO variable name was causing issue with SQL select statement.
This change fixes the problem by using VO variable for adding conditional.

Fixes apache#3208

Using db column instead of VO variable name was causing issue with SQL select statement.
This PR fixes the problem by using VO variable for adding conditional.
Additionally in UI listAll parameter was being sent twice in the listVMSnapshot API call. It is fixed with this PR.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
winterhazel pushed a commit that referenced this pull request Jan 28, 2026
Correção na tabela `backup_details`

Closes #3257

See merge request scclouds/scclouds!1356
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Error while searching through VM snapshots

6 participants