Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/libcloud into trunk
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/90044ce8 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/90044ce8 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/90044ce8 Branch: refs/heads/trunk Commit: 90044ce84e89a076f3816b502fd1689cece4f1de Parents: e633ce4 1ae9f1c Author: anthony-shaw <anthonys...@apache.org> Authored: Wed May 25 14:34:06 2016 +1000 Committer: anthony-shaw <anthonys...@apache.org> Committed: Wed May 25 14:34:06 2016 +1000 ---------------------------------------------------------------------- CHANGES.rst | 28 + contrib/scrape-ec2-prices.py | 9 +- demos/gce_demo.py | 96 +- docs/other/ssl-certificate-validation.rst | 1 + libcloud/compute/drivers/ec2.py | 34 +- libcloud/compute/drivers/gce.py | 321 +++++- libcloud/data/pricing.json | 971 +++++++++---------- libcloud/pricing.py | 8 +- libcloud/storage/drivers/rgw.py | 121 +++ libcloud/storage/drivers/s3.py | 33 +- libcloud/storage/providers.py | 4 +- libcloud/storage/types.py | 6 +- .../fixtures/gce/aggregated_subnetworks.json | 66 ++ .../compute/fixtures/gce/global_networks.json | 75 +- .../fixtures/gce/global_networks_cf.json | 14 + .../gce/global_networks_custom_network.json | 14 + ...on_regions_us-central1_subnetworks_post.json | 15 + .../fixtures/gce/regions_asia-east1.json | 65 ++ .../fixtures/gce/regions_europe-west1.json | 64 ++ .../fixtures/gce/regions_us-central1.json | 65 ++ .../gce/regions_us-central1_subnetworks.json | 18 + ...entral1_subnetworks_cf_972cf02e6ad49112.json | 11 + .../regions_us-central1_subnetworks_post.json | 14 + .../compute/fixtures/gce/regions_us-east1.json | 64 ++ .../fixtures/gce/zones_asia-east1-b.json | 10 + ...es_us-central1-a_instances_sn-node-name.json | 49 + .../compute/fixtures/gce/zones_us-east1-b.json | 10 + libcloud/test/compute/test_ec2.py | 12 +- libcloud/test/compute/test_gce.py | 181 +++- libcloud/test/compute/test_openstack.py | 2 +- libcloud/test/storage/test_rgw.py | 99 ++ 31 files changed, 1877 insertions(+), 603 deletions(-) ----------------------------------------------------------------------
