Merge branch 'trunk' into integration_testing
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/9aee8e72 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/9aee8e72 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/9aee8e72 Branch: refs/heads/trunk Commit: 9aee8e72bae8c2158546f1ffbfb7e963c3980d80 Parents: 040067b 1a6987d Author: Anthony Shaw <anthonys...@apache.org> Authored: Sat Apr 1 15:54:05 2017 +1100 Committer: Anthony Shaw <anthonys...@apache.org> Committed: Sat Apr 1 15:54:05 2017 +1100 ---------------------------------------------------------------------- CHANGES.rst | 83 ++- contrib/scrape-ec2-prices.py | 12 + docs/compute/_supported_providers.rst | 4 +- docs/compute/drivers/cloudscale.rst | 4 +- docs/compute/drivers/dimensiondata.rst | 22 + .../Nodes_Create_mcp2_Uncustomised.py | 57 ++ docs/examples/compute/onapp/functionality.py | 2 +- docs/other/changes_in_2_0.rst | 131 ++++ docs/other/ssl-certificate-validation.rst | 4 +- docs/other/using-http-proxy.rst | 4 +- libcloud/__init__.py | 2 +- libcloud/common/aws.py | 4 +- libcloud/common/base.py | 11 +- libcloud/compute/drivers/azure_arm.py | 4 +- libcloud/compute/drivers/cloudscale.py | 8 +- libcloud/compute/drivers/dimensiondata.py | 1 - libcloud/compute/drivers/ec2.py | 336 +++++++++- libcloud/compute/drivers/gce.py | 94 ++- libcloud/compute/drivers/linode.py | 50 +- libcloud/compute/drivers/profitbricks.py | 2 +- libcloud/compute/types.py | 4 + libcloud/data/pricing.json | 630 ++++++++++++++----- libcloud/dns/drivers/route53.py | 17 +- libcloud/httplib_ssl.py | 65 +- libcloud/security.py | 2 +- libcloud/storage/base.py | 10 +- libcloud/storage/drivers/s3.py | 352 +++++++++-- .../2.4/deploy_customised_server.xml | 7 + .../compute/fixtures/ec2/allocate_address.xml | 2 +- .../fixtures/ec2/allocate_vpc_address.xml | 2 +- .../compute/fixtures/ec2/associate_address.xml | 2 +- .../fixtures/ec2/associate_vpc_address.xml | 2 +- .../fixtures/ec2/attach_internet_gateway.xml | 2 +- .../fixtures/ec2/attach_network_interface.xml | 2 +- .../test/compute/fixtures/ec2/attach_volume.xml | 2 +- .../ec2/authorize_security_group_egress.xml | 2 +- .../ec2/authorize_security_group_ingress.xml | 2 +- .../test/compute/fixtures/ec2/copy_image.xml | 2 +- .../test/compute/fixtures/ec2/create_image.xml | 2 +- .../fixtures/ec2/create_internet_gateway.xml | 2 +- .../compute/fixtures/ec2/create_key_pair.xml | 2 +- .../fixtures/ec2/create_network_interface.xml | 2 +- .../fixtures/ec2/create_placement_groups.xml | 2 +- .../fixtures/ec2/create_security_group.xml | 2 +- .../compute/fixtures/ec2/create_snapshot.xml | 2 +- .../test/compute/fixtures/ec2/create_subnet.xml | 2 +- .../test/compute/fixtures/ec2/create_tags.xml | 2 +- .../test/compute/fixtures/ec2/create_volume.xml | 2 +- .../test/compute/fixtures/ec2/create_vpc.xml | 2 +- .../fixtures/ec2/delete_internet_gateway.xml | 2 +- .../compute/fixtures/ec2/delete_key_pair.xml | 2 +- .../fixtures/ec2/delete_network_interface.xml | 2 +- .../fixtures/ec2/delete_placement_groups.xml | 2 +- .../fixtures/ec2/delete_security_group.xml | 2 +- .../compute/fixtures/ec2/delete_snapshot.xml | 2 +- .../test/compute/fixtures/ec2/delete_subnet.xml | 2 +- .../test/compute/fixtures/ec2/delete_tags.xml | 2 +- .../test/compute/fixtures/ec2/delete_volume.xml | 2 +- .../test/compute/fixtures/ec2/delete_vpc.xml | 2 +- .../compute/fixtures/ec2/deregister_image.xml | 2 +- .../ec2/describe_account_attributes.xml | 2 +- .../compute/fixtures/ec2/describe_addresses.xml | 2 +- .../fixtures/ec2/describe_addresses_all.xml | 2 +- .../fixtures/ec2/describe_addresses_multi.xml | 2 +- .../fixtures/ec2/describe_addresses_single.xml | 2 +- .../ec2/describe_availability_zones.xml | 2 +- .../compute/fixtures/ec2/describe_images.xml | 2 +- .../ec2/describe_images_ex_imageids.xml | 2 +- .../compute/fixtures/ec2/describe_instances.xml | 2 +- .../fixtures/ec2/describe_internet_gateways.xml | 2 +- .../compute/fixtures/ec2/describe_key_pairs.xml | 2 +- .../ec2/describe_network_interfaces.xml | 2 +- .../fixtures/ec2/describe_placement_groups.xml | 2 +- .../ec2/describe_reserved_instances.xml | 2 +- .../fixtures/ec2/describe_security_groups.xml | 2 +- .../compute/fixtures/ec2/describe_snapshots.xml | 2 +- .../compute/fixtures/ec2/describe_subnets.xml | 2 +- .../test/compute/fixtures/ec2/describe_tags.xml | 2 +- .../compute/fixtures/ec2/describe_volumes.xml | 2 +- .../test/compute/fixtures/ec2/describe_vpcs.xml | 2 +- .../fixtures/ec2/detach_internet_gateway.xml | 2 +- .../fixtures/ec2/detach_network_interface.xml | 2 +- .../test/compute/fixtures/ec2/detach_volume.xml | 2 +- .../fixtures/ec2/disassociate_address.xml | 2 +- .../compute/fixtures/ec2/get_console_output.xml | 2 +- .../compute/fixtures/ec2/import_key_pair.xml | 2 +- .../fixtures/ec2/modify_image_attribute.xml | 2 +- .../fixtures/ec2/modify_instance_attribute.xml | 2 +- .../fixtures/ec2/modify_snapshot_attribute.xml | 4 + .../compute/fixtures/ec2/reboot_instances.xml | 2 +- .../compute/fixtures/ec2/register_image.xml | 2 +- .../compute/fixtures/ec2/release_address.xml | 2 +- .../ec2/revoke_security_group_egress.xml | 2 +- .../ec2/revoke_security_group_ingress.xml | 2 +- .../test/compute/fixtures/ec2/run_instances.xml | 2 +- .../fixtures/ec2/run_instances_iam_profile.xml | 2 +- .../compute/fixtures/ec2/run_instances_idem.xml | 2 +- ...instances_with_subnet_and_security_group.xml | 2 +- .../compute/fixtures/ec2/start_instances.xml | 2 +- .../compute/fixtures/ec2/stop_instances.xml | 2 +- .../fixtures/ec2/terminate_instances.xml | 2 +- ...entral1_subnetworks_cf_972cf02e6ad49112.json | 1 + .../test/compute/test_dimensiondata_v2_4.py | 49 ++ libcloud/test/compute/test_ec2.py | 29 +- libcloud/test/compute/test_profitbricks.py | 2 +- libcloud/test/storage/test_s3.py | 54 +- libcloud/test/test_connection.py | 51 ++ libcloud/test/test_logging_connection.py | 53 ++ libcloud/utils/loggingconnection.py | 15 +- 109 files changed, 1896 insertions(+), 428 deletions(-) ----------------------------------------------------------------------
