Merge branch 'trunk' of https://github.com/apache/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/5c76d0e7 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/5c76d0e7 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/5c76d0e7 Branch: refs/heads/trunk Commit: 5c76d0e790ca595f33d86becd6b6b64f414e6bbd Parents: c9ffae1 1ed5888 Author: Jens Deppe <[email protected]> Authored: Fri Mar 31 21:09:49 2017 -0700 Committer: Jens Deppe <[email protected]> Committed: Fri Mar 31 21:09:49 2017 -0700 ---------------------------------------------------------------------- CHANGES.rst | 50 +++ docs/compute/_supported_providers.rst | 4 +- docs/compute/drivers/cloudscale.rst | 4 +- libcloud/common/aws.py | 4 +- libcloud/common/base.py | 2 +- libcloud/compute/drivers/azure_arm.py | 4 +- libcloud/compute/drivers/cloudscale.py | 8 +- libcloud/compute/drivers/ec2.py | 70 +++- libcloud/compute/drivers/gce.py | 74 +++- libcloud/compute/drivers/linode.py | 50 ++- libcloud/storage/drivers/s3.py | 352 ++++++++++++++++--- .../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 +- libcloud/test/compute/test_ec2.py | 17 +- libcloud/test/storage/test_s3.py | 54 +-- 86 files changed, 661 insertions(+), 180 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/5c76d0e7/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/5c76d0e7/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --cc libcloud/test/compute/test_ec2.py index ab6500b,bbf0823..7702d82 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@@ -435,17 -435,17 +435,17 @@@ class EC2Tests(LibcloudTestCase, TestCa self.assertTrue('cr1.8xlarge' in ids) self.assertTrue('x1.32xlarge' in ids) elif region_name == 'us-west-1': - self.assertEqual(len(sizes), 46) + self.assertEqual(len(sizes), 52) if region_name == 'us-west-2': - self.assertEqual(len(sizes), 59) - self.assertEqual(len(sizes), 56) ++ self.assertEqual(len(sizes), 62) elif region_name == 'ap-southeast-1': - self.assertEqual(len(sizes), 45) + self.assertEqual(len(sizes), 51) elif region_name == 'ap-southeast-2': - self.assertEqual(len(sizes), 49) + self.assertEqual(len(sizes), 55) elif region_name == 'eu-west-1': - self.assertEqual(len(sizes), 53) + self.assertEqual(len(sizes), 59) elif region_name == 'ap-south-1': - self.assertEqual(len(sizes), 29) + self.assertEqual(len(sizes), 35) self.driver.region_name = region_old
