Merge remote-tracking branch 'upstream/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/50a8328e Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/50a8328e Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/50a8328e Branch: refs/heads/trunk Commit: 50a8328e9c89db7e41107abd73d8eb0d1b607158 Parents: a9c2306 f18f653 Author: Juan Font Alonso <juanfontalo...@gmail.com> Authored: Tue Jun 21 14:28:43 2016 +0200 Committer: Juan Font Alonso <juanfontalo...@gmail.com> Committed: Tue Jun 21 14:28:43 2016 +0200 ---------------------------------------------------------------------- .gitignore | 1 + CHANGES.rst | 37 +- README.rst | 3 + doap_libcloud.rdf | 7 + docs/other/ssl-certificate-validation.rst | 15 + libcloud/__init__.py | 2 +- libcloud/backup/drivers/dimensiondata.py | 9 +- libcloud/common/aliyun.py | 19 +- libcloud/common/base.py | 2392 +++++++------- libcloud/common/dimensiondata.py | 2997 +++++++++--------- libcloud/common/openstack_identity.py | 161 +- libcloud/compute/drivers/cloudstack.py | 32 +- libcloud/compute/drivers/dimensiondata.py | 159 +- libcloud/compute/drivers/ecs.py | 2 +- libcloud/compute/drivers/gce.py | 3 + libcloud/compute/drivers/libvirt_driver.py | 32 +- libcloud/dns/drivers/auroradns.py | 2 +- libcloud/loadbalancer/drivers/dimensiondata.py | 9 +- libcloud/loadbalancer/drivers/elb.py | 9 +- libcloud/loadbalancer/drivers/slb.py | 2 +- libcloud/security.py | 17 + libcloud/test/__init__.py | 1 + .../fixtures/dimensiondata/_backup_DISABLE.xml | 7 + .../fixtures/dimensiondata/_backup_ENABLE.xml | 18 + .../fixtures/dimensiondata/_backup_EXISTS.xml | 7 + .../fixtures/dimensiondata/_backup_INFO.xml | 16 + .../dimensiondata/_backup_INFO_DISABLED.xml | 7 + .../dimensiondata/_backup_INFO_NOCLIENT.xml | 2 + .../dimensiondata/_backup_INFO_NOJOB.xml | 11 + ...76_c76d_4d7c_b39d_3b72be0384c8_cancelJob.xml | 7 + ...6d_4d7c_b39d_3b72be0384c8_cancelJob_FAIL.xml | 7 + .../_backup_client_SUCCESS_PUT.xml | 13 + .../_backup_client_schedulePolicy.xml | 5 + .../_backup_client_storagePolicy.xml | 6 + .../dimensiondata/_backup_client_type.xml | 6 + .../fixtures/dimensiondata/_backup_modify.xml | 7 + ...2f_4314_8725_c8a4f4d13a87_backup_DISABLE.xml | 7 - ...92f_4314_8725_c8a4f4d13a87_backup_ENABLE.xml | 18 - ...92f_4314_8725_c8a4f4d13a87_backup_EXISTS.xml | 7 - ..._692f_4314_8725_c8a4f4d13a87_backup_INFO.xml | 16 - ...4_8725_c8a4f4d13a87_backup_INFO_DISABLED.xml | 7 - ...4_8725_c8a4f4d13a87_backup_INFO_NOCLIENT.xml | 2 - ...4314_8725_c8a4f4d13a87_backup_INFO_NOJOB.xml | 11 - ...76_c76d_4d7c_b39d_3b72be0384c8_cancelJob.xml | 7 - ...6d_4d7c_b39d_3b72be0384c8_cancelJob_FAIL.xml | 7 - ...5_c8a4f4d13a87_backup_client_SUCCESS_PUT.xml | 13 - ...8a4f4d13a87_backup_client_schedulePolicy.xml | 5 - ...c8a4f4d13a87_backup_client_storagePolicy.xml | 6 - ...314_8725_c8a4f4d13a87_backup_client_type.xml | 6 - ...92f_4314_8725_c8a4f4d13a87_backup_modify.xml | 7 - libcloud/test/backup/test_dimensiondata.py | 980 +++--- libcloud/test/common/test_openstack_identity.py | 45 +- .../cloudstack/createVolume_withvolumetype.json | 1 + .../listDiskOfferings_withvolumetype.json | 1 + .../cloudstack/listVirtualMachines_default.json | 2 +- .../cloudstack/listZones_withvolumetype.json | 1 + .../dimensiondata/detailed_usage_report.csv | 42 + .../dimensiondata/summary_usage_report.csv | 13 + libcloud/test/compute/test_cloudstack.py | 44 + libcloud/test/compute/test_dimensiondata.py | 49 +- libcloud/test/dns/test_auroradns.py | 28 +- libcloud/test/storage/test_backblaze_b2.py | 476 +-- libcloud/test/test_httplib_ssl.py | 47 + 63 files changed, 4280 insertions(+), 3598 deletions(-) ----------------------------------------------------------------------
