----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/16324/ -----------------------------------------------------------
(Updated Dec. 23, 2013, 5:11 p.m.) Review request for cloudstack and Girish Shilamkar. Changes ------- Updated the patch by correcting the imports. In many files imports were not specified correctly, but they were working fine because the objects were somehow getting imported from chaining of imports (import *). When imports in the Marvin got corrected with previous patch, many suits failed in nose while picking up the tests due to this. I have corrected the imports in all other files, specifically related to "cleanup_resources" function. Bugs: CLOUDSTACK-4780 https://issues.apache.org/jira/browse/CLOUDSTACK-4780 Repository: cloudstack-git Description ------- Changes: 1) Appended snapshot extension to the snapshot path coming from database. As discussed with Harikrishna, Product bug (5135) is invalid, snapshot path in database won't contain the extension of the snapshot. So changing the code so as to append the extension based on hypervisor type. 2) Code movement and cleanup - Moved function get_hypervisor_type from common to utils to avoid cyclic dependency of libraries. Also, cleaned up the imports. Diffs (updated) ----- test/integration/component/test_add_remove_network.py f1508e1 test/integration/component/test_assign_vm.py cbdce73 test/integration/component/test_cpu_domain_limits.py 4e8fc6d test/integration/component/test_cpu_limits.py d721a45 test/integration/component/test_cpu_max_limits.py 9161cee test/integration/component/test_cpu_project_limits.py 63d1a98 test/integration/component/test_egress_fw_rules.py 09e1dd6 test/integration/component/test_haproxy.py c734012 test/integration/component/test_mm_domain_limits.py c856087 test/integration/component/test_mm_max_limits.py b1ebbb4 test/integration/component/test_mm_project_limits.py ffeb20a test/integration/component/test_snapshots.py d3fac42 test/integration/component/test_vpc_network_lbrules.py e7cb823 test/integration/component/test_vpc_network_pfrules.py 0d8e2f1 test/integration/component/test_vpc_network_staticnatrule.py dd3d249 test/integration/component/test_vpn_users.py 9ee907b tools/marvin/marvin/integration/lib/common.py 096b073 tools/marvin/marvin/integration/lib/utils.py d046235 Diff: https://reviews.apache.org/r/16324/diff/ Testing ------- Tested locally on VMware. KVM should not have impact of this change as the snapshot created on KVM was found not to have any extension. Log: test_01_snapshot_root_disk (test_snapshots.TestSnapshotRootDisk) Test Snapshot Root Disk ... ok ---------------------------------------------------------------------- Ran 1 test in 513.783s OK Thanks, Gaurav Aradhye