Merge remote-tracking branch 'upstream/trunk' into oneandone
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/e3dbb377 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/e3dbb377 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/e3dbb377 Branch: refs/heads/trunk Commit: e3dbb3775d74c1d743195d723d38128cc0e328cc Parents: ff028ae a5731ab Author: jasminSPC <jas...@stackpointcloud.com> Authored: Tue Apr 11 00:20:45 2017 +0200 Committer: jasminSPC <jas...@stackpointcloud.com> Committed: Tue Apr 11 00:20:45 2017 +0200 ---------------------------------------------------------------------- CHANGES.rst | 227 ++++- contrib/scrape-ec2-prices.py | 19 +- demos/secrets.py-dist | 5 +- doap_libcloud.rdf | 7 + docs/_static/images/provider_logos/outscale.jpg | Bin 0 -> 17361 bytes docs/_static/images/provider_logos/outscale.png | Bin 8437 -> 0 bytes .../_supported_methods_image_management.rst | 2 +- .../_supported_methods_key_pair_management.rst | 2 +- docs/compute/_supported_methods_main.rst | 2 +- docs/compute/_supported_providers.rst | 120 +-- docs/compute/drivers/cloudscale.rst | 4 +- docs/compute/drivers/dimensiondata.rst | 22 + docs/compute/drivers/outscale_inc.rst | 11 +- docs/compute/drivers/outscale_sas.rst | 21 +- docs/dns/_supported_methods.rst | 2 + docs/dns/_supported_providers.rst | 2 + docs/dns/drivers/onapp.rst | 23 + .../Nodes_Create_mcp2_Uncustomised.py | 57 ++ docs/examples/compute/onapp/functionality.py | 39 +- docs/examples/dns/onapp/instantiate_driver.py | 9 + docs/loadbalancer/_supported_providers.rst | 2 +- docs/other/changes_in_2_0.rst | 18 +- docs/storage/_supported_methods_cdn.rst | 16 +- docs/storage/_supported_methods_main.rst | 16 +- docs/storage/_supported_providers.rst | 16 +- integration/README.rst | 20 + integration/__init__.py | 0 integration/__main__.py | 41 + integration/api/__init__.py | 0 integration/api/__main__.py | 21 + integration/api/data.py | 37 + integration/api/routes.py | 33 + integration/api/util.py | 33 + integration/config.py | 21 + integration/driver/__init__.py | 0 integration/driver/test.py | 76 ++ integration/requirements.txt | 1 + libcloud/__init__.py | 2 +- libcloud/common/aws.py | 4 +- libcloud/common/azure_arm.py | 2 +- libcloud/common/base.py | 32 +- libcloud/common/linode.py | 25 +- libcloud/common/ovh.py | 2 +- libcloud/compute/drivers/azure_arm.py | 7 +- libcloud/compute/drivers/cloudscale.py | 8 +- libcloud/compute/drivers/digitalocean.py | 3 +- libcloud/compute/drivers/dimensiondata.py | 1 - libcloud/compute/drivers/ec2.py | 931 ++++++++++++++++--- libcloud/compute/drivers/ecs.py | 59 +- libcloud/compute/drivers/gce.py | 94 +- libcloud/compute/drivers/linode.py | 50 +- libcloud/compute/drivers/onapp.py | 107 ++- libcloud/compute/types.py | 4 + libcloud/data/pricing.json | 630 ++++++++++--- libcloud/dns/drivers/onapp.py | 332 +++++++ libcloud/dns/drivers/route53.py | 17 +- libcloud/dns/providers.py | 2 + libcloud/dns/types.py | 1 + libcloud/http.py | 299 ++++++ libcloud/httplib_ssl.py | 273 ------ libcloud/security.py | 2 +- libcloud/storage/drivers/s3.py | 424 +++++++-- libcloud/storage/providers.py | 12 + libcloud/storage/types.py | 6 + .../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 | 14 +- .../ec2/describe_images_ex_imageids.xml | 9 +- .../ec2/describe_import_snapshot_tasks.xml | 18 + .../describe_import_snapshot_tasks_active.xml | 17 + .../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 +- .../compute/fixtures/ec2/import_snapshot.xml | 16 + .../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 +- .../fixtures/ecs/join_security_group_by_id.xml | 4 + .../fixtures/ecs/leave_security_group_by_id.xml | 4 + ...entral1_subnetworks_cf_972cf02e6ad49112.json | 1 + .../compute/fixtures/onapp/get_key_pair.json | 9 + .../compute/fixtures/onapp/import_key_pair.json | 9 + .../compute/fixtures/onapp/list_images.json | 47 + .../compute/fixtures/onapp/list_key_pairs.json | 20 + .../test/compute/fixtures/onapp/profile.json | 12 + .../test/compute/test_dimensiondata_v2_4.py | 49 + libcloud/test/compute/test_ec2.py | 77 +- libcloud/test/compute/test_ecs.py | 20 + libcloud/test/compute/test_onapp.py | 61 ++ .../test/dns/fixtures/onapp/create_record.json | 9 + .../test/dns/fixtures/onapp/create_zone.json | 10 + .../dns/fixtures/onapp/dns_zone_not_found.json | 5 + .../test/dns/fixtures/onapp/get_record.json | 9 + .../fixtures/onapp/get_record_after_update.json | 9 + libcloud/test/dns/fixtures/onapp/get_zone.json | 10 + .../test/dns/fixtures/onapp/list_records.json | 65 ++ .../test/dns/fixtures/onapp/list_zones.json | 22 + libcloud/test/dns/test_onapp.py | 223 +++++ libcloud/test/secrets.py-dist | 1 + libcloud/test/storage/test_s3.py | 54 +- libcloud/test/test_connection.py | 19 +- libcloud/test/test_http.py | 87 ++ libcloud/test/test_httplib_ssl.py | 87 -- libcloud/test/test_logging_connection.py | 18 +- libcloud/test/test_response_classes.py | 2 +- libcloud/utils/compression.py | 42 - libcloud/utils/loggingconnection.py | 7 - tox.ini | 9 +- 172 files changed, 4409 insertions(+), 1071 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/e3dbb377/libcloud/common/base.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/e3dbb377/libcloud/compute/types.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/e3dbb377/libcloud/test/secrets.py-dist ----------------------------------------------------------------------
