Merge branch 'trunk' into LIBCLOUD-556_azure_compute_driver
Conflicts:
libcloud/compute/types.py
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/01610985
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/01610985
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/01610985
Branch: refs/heads/trunk
Commit: 01610985d1abeaa3041b1917f6824f170fe3f1da
Parents: 33e0090 06cdd4e
Author: Tomaz Muraus <[email protected]>
Authored: Sat Apr 4 23:48:47 2015 +0200
Committer: Tomaz Muraus <[email protected]>
Committed: Sat Apr 4 23:48:47 2015 +0200
----------------------------------------------------------------------
.travis.yml | 2 +-
CHANGES.rst | 349 +++
MANIFEST.in | 1 +
README.rst | 12 +-
.../generate_provider_feature_matrix_table.py | 17 +-
contrib/scrape-ec2-prices.py | 17 +-
demos/gce_demo.py | 467 +++-
demos/gce_lb_demo.py | 304 ---
doap_libcloud.rdf | 25 +-
.../_static/images/provider_logos/pcextreme.png | Bin 0 -> 4938 bytes
docs/committer_guide.rst | 28 +-
.../_supported_methods_block_storage.rst | 16 +-
.../_supported_methods_image_management.rst | 8 +-
.../_supported_methods_key_pair_management.rst | 8 +-
docs/compute/_supported_methods_main.rst | 8 +-
docs/compute/_supported_providers.rst | 142 +-
docs/compute/drivers/auroracompute.rst | 26 +
docs/compute/drivers/digital_ocean.rst | 49 +
docs/compute/drivers/gce.rst | 40 +-
docs/compute/drivers/vultr.rst | 2 +-
docs/developer_information.rst | 8 +-
docs/development.rst | 4 +-
docs/dns/_supported_methods.rst | 4 +-
docs/dns/_supported_providers.rst | 4 +-
.../digitalocean/instantiate_api_v1.0.py | 5 +
.../digitalocean/instantiate_api_v2.0.py | 9 +
.../ec2/create_general_purpose_ssd_volume.py | 2 +-
docs/examples/compute/gce/gce_internal_auth.py | 7 +-
.../examples/compute/gce/gce_service_account.py | 2 +
docs/third_party_drivers.rst | 4 +-
docs/upgrade_notes.rst | 25 +
libcloud/__init__.py | 2 +-
libcloud/common/abiquo.py | 17 +-
libcloud/common/aws.py | 211 +-
libcloud/common/cloudsigma.py | 19 +-
libcloud/common/google.py | 43 +-
libcloud/common/linode.py | 7 +-
libcloud/common/softlayer.py | 88 +
libcloud/common/types.py | 20 +-
libcloud/compute/base.py | 40 +-
libcloud/compute/drivers/abiquo.py | 130 +-
libcloud/compute/drivers/auroracompute.py | 29 +
libcloud/compute/drivers/cloudstack.py | 1098 ++++++++-
libcloud/compute/drivers/digitalocean.py | 383 ++-
libcloud/compute/drivers/ec2.py | 302 ++-
libcloud/compute/drivers/gce.py | 2280 ++++++++++++++++--
libcloud/compute/drivers/hostvirtual.py | 245 +-
libcloud/compute/drivers/ibm_sce.py | 2 +-
libcloud/compute/drivers/joyent.py | 13 +
libcloud/compute/drivers/linode.py | 141 +-
libcloud/compute/drivers/openstack.py | 170 +-
libcloud/compute/drivers/profitbricks.py | 2 +-
libcloud/compute/drivers/rackspace.py | 8 +-
libcloud/compute/drivers/rimuhosting.py | 4 +-
libcloud/compute/drivers/softlayer.py | 70 +-
libcloud/compute/drivers/vcloud.py | 6 +-
libcloud/compute/providers.py | 2 +
libcloud/compute/ssh.py | 21 +-
libcloud/compute/types.py | 20 +-
libcloud/data/pricing.json | 136 +-
libcloud/dns/drivers/google.py | 1 +
libcloud/dns/drivers/hostvirtual.py | 39 +-
libcloud/dns/drivers/route53.py | 30 +-
libcloud/dns/drivers/softlayer.py | 213 ++
libcloud/dns/providers.py | 2 +
libcloud/dns/types.py | 1 +
libcloud/httplib_ssl.py | 68 +-
libcloud/loadbalancer/drivers/brightbox.py | 4 +-
libcloud/loadbalancer/drivers/cloudstack.py | 47 +-
libcloud/loadbalancer/drivers/elb.py | 1 +
libcloud/security.py | 9 +
libcloud/storage/base.py | 74 +-
libcloud/storage/drivers/azure_blobs.py | 2 +-
libcloud/storage/drivers/cloudfiles.py | 18 +-
libcloud/storage/drivers/s3.py | 7 +-
libcloud/test/common/fixtures/google/pkey.json | 7 +
libcloud/test/common/fixtures/google/pkey.pem | 15 +
libcloud/test/common/test_aws.py | 239 ++
libcloud/test/common/test_google.py | 32 +-
libcloud/test/compute/__init__.py | 5 +-
libcloud/test/compute/fixtures/abiquo/vdc_4.xml | 2 +-
.../abiquo/vdc_4_vapp_5_vm_3_not_allocated.xml | 6 +-
.../fixtures/abiquo/vdc_4_vapp_5_vms.xml | 8 +-
.../fixtures/abiquo/vdc_4_vapp_6_vm_3.xml | 4 +-
.../abiquo/vdc_4_vapp_6_vm_3_allocated.xml | 4 +-
.../abiquo/vdc_4_vapp_6_vm_3_deployed.xml | 4 +-
.../fixtures/abiquo/vdc_4_vapp_6_vms.xml | 8 +-
.../abiquo/vdc_4_vapp_6_vms_allocated.xml | 8 +-
libcloud/test/compute/fixtures/abiquo/vdcs.xml | 2 +-
.../cloudstack/createAffinityGroup_default.json | 1 +
.../cloudstack/createVpnConnection_default.json | 5 +
.../createVpnCustomerGateway_default.json | 5 +
.../cloudstack/createVpnGateway_default.json | 6 +
.../cloudstack/deleteAffinityGroup_default.json | 1 +
.../cloudstack/deleteVpnConnection_default.json | 1 +
.../deleteVpnCustomerGateway_default.json | 5 +
.../cloudstack/deleteVpnGateway_default.json | 1 +
.../deployVirtualMachine_rootdisksize.json | 1 +
.../listAffinityGroupTypes_default.json | 1 +
.../cloudstack/listAffinityGroups_default.json | 1 +
.../listIpForwardingRules_default.json | 1 +
.../cloudstack/listNetworks_rootdisksize.json | 1 +
.../listServiceOfferings_rootdisksize.json | 1 +
.../cloudstack/listTemplates_rootdisksize.json | 1 +
.../cloudstack/listVolumes_rootdisksize.json | 1 +
.../cloudstack/listVpnConnections_default.json | 27 +
.../listVpnCustomerGateways_default.json | 22 +
.../cloudstack/listVpnGateways_default.json | 15 +
.../cloudstack/listZones_rootdisksize.json | 1 +
.../cloudstack/queryAsyncJobResult_1300004.json | 1 +
.../cloudstack/queryAsyncJobResult_1300005.json | 1 +
.../cloudstack/queryAsyncJobResult_1300006.json | 62 +
...queryAsyncJobResult_createVpnConnection.json | 35 +
...AsyncJobResult_createVpnCustomerGateway.json | 30 +
.../queryAsyncJobResult_createVpnGateway.json | 23 +
...queryAsyncJobResult_deleteVpnConnection.json | 16 +
...AsyncJobResult_deleteVpnCustomerGateway.json | 16 +
.../queryAsyncJobResult_deleteVpnGateway.json | 16 +
.../queryAsyncJobResult_deployrootdisksize.json | 1 +
.../updateVMAffinityGroup_default.json | 1 +
.../fixtures/digitalocean/create_image.json | 12 +
.../fixtures/digitalocean/create_key_pair.json | 8 +
.../fixtures/digitalocean/create_node.json | 1 -
.../fixtures/digitalocean/destroy_node.json | 1 -
.../compute/fixtures/digitalocean/error.json | 1 +
.../compute/fixtures/digitalocean/error.txt | 1 -
.../digitalocean/error_invalid_image.json | 1 -
.../digitalocean/ex_create_ssh_key.json | 1 -
.../digitalocean/ex_destroy_ssh_key.json | 1 -
.../fixtures/digitalocean/ex_list_ssh_keys.json | 1 -
.../fixtures/digitalocean/ex_power_on_node.json | 12 +
.../fixtures/digitalocean/ex_rename_node.json | 1 -
.../fixtures/digitalocean/ex_shutdown_node.json | 12 +
.../fixtures/digitalocean/get_image.json | 14 +
.../fixtures/digitalocean/list_images.json | 145 --
.../fixtures/digitalocean/list_key_pairs.json | 13 +
.../fixtures/digitalocean/list_locations.json | 1 -
.../fixtures/digitalocean/list_nodes.json | 1 -
.../fixtures/digitalocean/list_nodes_empty.json | 1 -
.../digitalocean/list_nodes_page_1.json | 95 +
.../fixtures/digitalocean/list_sizes.json | 1 -
.../fixtures/digitalocean/reboot_node.json | 1 -
.../fixtures/digitalocean_v1/create_node.json | 1 +
.../fixtures/digitalocean_v1/destroy_node.json | 1 +
.../compute/fixtures/digitalocean_v1/error.txt | 1 +
.../digitalocean_v1/error_invalid_image.json | 1 +
.../digitalocean_v1/ex_create_ssh_key.json | 1 +
.../digitalocean_v1/ex_destroy_ssh_key.json | 1 +
.../digitalocean_v1/ex_list_ssh_keys.json | 1 +
.../digitalocean_v1/ex_rename_node.json | 1 +
.../fixtures/digitalocean_v1/list_images.json | 145 ++
.../digitalocean_v1/list_locations.json | 1 +
.../fixtures/digitalocean_v1/list_nodes.json | 1 +
.../digitalocean_v1/list_nodes_empty.json | 1 +
.../digitalocean_v1/list_nodes_page_2.json | 95 +
.../fixtures/digitalocean_v1/list_sizes.json | 1 +
.../fixtures/digitalocean_v1/reboot_node.json | 1 +
.../fixtures/digitalocean_v2/create_image.json | 12 +
.../digitalocean_v2/create_key_pair.json | 8 +
.../fixtures/digitalocean_v2/create_node.json | 13 +
.../compute/fixtures/digitalocean_v2/error.json | 1 +
.../digitalocean_v2/error_invalid_image.json | 1 +
.../digitalocean_v2/ex_power_on_node.json | 12 +
.../digitalocean_v2/ex_rename_node.json | 13 +
.../digitalocean_v2/ex_shutdown_node.json | 12 +
.../fixtures/digitalocean_v2/get_image.json | 14 +
.../fixtures/digitalocean_v2/list_images.json | 44 +
.../digitalocean_v2/list_key_pairs.json | 13 +
.../digitalocean_v2/list_locations.json | 48 +
.../fixtures/digitalocean_v2/list_nodes.json | 89 +
.../digitalocean_v2/list_nodes_empty.json | 7 +
.../digitalocean_v2/list_nodes_page_1.json | 95 +
.../fixtures/digitalocean_v2/list_sizes.json | 35 +
.../fixtures/digitalocean_v2/reboot_node.json | 13 +
.../fixtures/ec2/create_placement_groups.xml | 4 +
.../fixtures/ec2/delete_placement_groups.xml | 4 +
.../fixtures/ec2/describe_placement_groups.xml | 15 +
.../compute/fixtures/ec2/describe_snapshots.xml | 24 +-
.../compute/fixtures/ec2/describe_volumes.xml | 6 +-
.../fixtures/gce/aggregated_addresses.json | 16 +-
.../fixtures/gce/aggregated_disktypes.json | 112 +
.../gce/aggregated_targetInstances.json | 127 +
.../fixtures/gce/aggregated_targetPools.json | 33 +
.../compute/fixtures/gce/global_addresses.json | 17 +
.../gce/global_addresses_lcaddressglobal.json | 10 +
...global_addresses_lcaddressglobal_delete.json | 14 +
.../fixtures/gce/global_addresses_post.json | 13 +
.../gce/global_backendServices-empty.json | 5 +
.../gce/global_backendServices-web-service.json | 38 +
.../gce/global_backendServices_no_backends.json | 15 +
.../gce/global_backendServices_post.json | 13 +
.../gce/global_backendServices_web_service.json | 31 +
...obal_backendServices_web_service_delete.json | 14 +
.../fixtures/gce/global_forwardingRules.json | 29 +
.../gce/global_forwardingRules_http_rule.json | 12 +
...global_forwardingRules_http_rule_delete.json | 14 +
.../gce/global_forwardingRules_post.json | 13 +
.../compute/fixtures/gce/global_images.json | 70 +-
...es_debian_6_squeeze_v20130926_deprecate.json | 14 -
...images_debian_7_wheezy_v20130617_delete.json | 15 -
...ges_debian_7_wheezy_v20131014_deprecate.json | 14 +
...images_debian_7_wheezy_v20131120_delete.json | 15 +
.../fixtures/gce/global_networks_lcnetwork.json | 3 +-
.../compute/fixtures/gce/global_routes.json | 58 +
.../fixtures/gce/global_routes_lcdemoroute.json | 27 +
.../gce/global_routes_lcdemoroute_delete.json | 13 +
.../fixtures/gce/global_routes_post.json | 13 +
.../fixtures/gce/global_targetHttpProxies.json | 23 +
.../gce/global_targetHttpProxies_post.json | 13 +
.../gce/global_targetHttpProxies_web_proxy.json | 8 +
...obal_targetHttpProxies_web_proxy_delete.json | 14 +
.../compute/fixtures/gce/global_urlMaps.json | 16 +
.../fixtures/gce/global_urlMaps_post.json | 13 +
.../fixtures/gce/global_urlMaps_web_map.json | 9 +
.../gce/global_urlMaps_web_map_delete.json | 14 +
...global_addresses_lcaddressglobal_delete.json | 14 +
...rations_operation_global_addresses_post.json | 14 +
...s_operation_global_backendServices_post.json | 15 +
...obal_backendServices_web_service_delete.json | 15 +
...global_forwardingRules_http_rule_delete.json | 15 +
...s_operation_global_forwardingRules_post.json | 15 +
..._operation_global_images_debian7_delete.json | 2 +-
...ration_global_routes_lcdemoroute_delete.json | 13 +
...operations_operation_global_routes_post.json | 13 +
...operation_global_targetHttpProxies_post.json | 15 +
...obal_targetHttpProxies_web_proxy_delete.json | 15 +
...perations_operation_global_urlMaps_post.json | 15 +
...operation_global_urlMaps_web_map_delete.json | 15 +
...ral1_targetPools_lb_pool_setBackup_post.json | 16 +
...ons_operation_setCommonInstanceMetadata.json | 15 +
...erations_operation_setUsageExportBucket.json | 14 +
...nstances_node_name_addAccessConfig_done.json | 15 +
...nstances_node_name_addAccessConfig_post.json | 15 +
...ances_node_name_deleteAccessConfig_done.json | 15 +
...ances_node_name_deleteAccessConfig_post.json | 15 +
...targetInstances_lctargetinstance_delete.json | 15 +
...ones_us-central1-a_targetInstances_post.json | 14 +
...s_central1_a_node_name_setMetadata_post.json | 15 +
libcloud/test/compute/fixtures/gce/project.json | 155 +-
.../projects_centos-cloud_global_images.json | 479 ++++
.../projects_coreos-cloud_global_images.json | 1515 ++++++++++++
.../projects_debian-cloud_global_images.json | 12 +-
.../gce/projects_gce-nvme_global_images.json | 55 +
...rojects_google-containers_global_images.json | 179 ++
.../projects_opensuse-cloud_global_images.json | 102 +
.../gce/projects_rhel-cloud_global_images.json | 49 +
..._rhel-cloud_global_licenses_rhel_server.json | 6 +
.../gce/projects_suse-cloud_global_images.json | 160 ++
...ects_suse-cloud_global_licenses_sles_11.json | 6 +
...ects_suse-cloud_global_licenses_sles_12.json | 6 +
.../projects_ubuntu-os-cloud_global_images.json | 169 ++
.../projects_windows-cloud_global_images.json | 26 +
...obal_licenses_windows_server_2008_r2_dc.json | 6 +
.../gce/regions_us-central1_targetPools.json | 35 +-
...ons_us-central1_targetPools_backup_pool.json | 15 +
...regions_us-central1_targetPools_lb_pool.json | 17 +
...-central1_targetPools_lb_pool_getHealth.json | 10 +
...ral1_targetPools_lb_pool_setBackup_post.json | 16 +
.../gce/setCommonInstanceMetadata_post.json | 15 +
.../fixtures/gce/setUsageExportBucket_post.json | 14 +
...es_europe-west1-a_diskTypes_pd_standard.json | 10 +
.../gce/zones_us-central1-a_diskTypes.json | 27 +
.../zones_us-central1-a_diskTypes_pd_ssd.json | 10 +
...nes_us-central1-a_diskTypes_pd_standard.json | 10 +
.../zones_us-central1-a_disktypes_pd-ssd.json | 10 +
...1-a_instances_node_name_getSerialOutput.json | 5 +
.../zones_us-central1-a_targetInstances.json | 27 +
...ral1-a_targetInstances_lctargetinstance.json | 10 +
...targetInstances_lctargetinstance_delete.json | 15 +
...ones_us-central1-a_targetInstances_post.json | 14 +
..._a_instances_node_name_setMetadata_post.json | 15 +
..._us_central1_a_instances_node_name_stop.json | 15 +
...es_us_central1_a_instances_stopped_node.json | 48 +
...central1_a_instances_stopped_node_start.json | 15 +
..._central1_a_instances_stopped_node_stop.json | 15 +
...ntral1_a_operations_operation_startnode.json | 15 +
...entral1_a_operations_operation_stopnode.json | 15 +
.../fixtures/hostvirtual/cancel_package.json | 3 +
.../fixtures/hostvirtual/create_node.json | 3 -
.../fixtures/hostvirtual/list_packages.json | 61 +
.../fixtures/hostvirtual/node_destroy.json | 3 -
.../fixtures/hostvirtual/order_package.json | 3 +
.../fixtures/hostvirtual/unlink_package.json | 3 +
.../fixtures/linode/_linode_disk_list.json | 28 +
.../openstack_v1.1/_flavors_detail.json | 2 +-
.../fixtures/openstack_v1.1/_os_snapshots.json | 11 +-
.../openstack_v1.1/_os_snapshots_rackspace.json | 11 +-
.../fixtures/openstack_v1.1/_os_volumes.json | 4 +-
.../openstack_v1.1/_servers_detail.json | 10 +-
libcloud/test/compute/test_abiquo.py | 7 +
libcloud/test/compute/test_auroracompute.py | 27 +
libcloud/test/compute/test_base.py | 6 +-
libcloud/test/compute/test_cloudstack.py | 187 +-
libcloud/test/compute/test_digitalocean.py | 181 --
libcloud/test/compute/test_digitalocean_v1.py | 182 ++
libcloud/test/compute/test_digitalocean_v2.py | 268 ++
libcloud/test/compute/test_dreamhost.py | 6 +-
libcloud/test/compute/test_ec2.py | 67 +-
libcloud/test/compute/test_gce.py | 1090 ++++++++-
libcloud/test/compute/test_gridspot.py | 37 +-
libcloud/test/compute/test_hostvirtual.py | 44 +-
libcloud/test/compute/test_joyent.py | 12 +-
libcloud/test/compute/test_ktucloud.py | 18 +-
libcloud/test/compute/test_linode.py | 44 +-
libcloud/test/compute/test_openstack.py | 82 +-
libcloud/test/compute/test_opsource.py | 12 +-
libcloud/test/compute/test_rackspace.py | 1 +
.../fixtures/hostvirtual/list_records_none.json | 6 +
.../test/dns/fixtures/softlayer/not_found.xml | 21 +
...r_Dns_Domain_ResourceRecord_createObject.xml | 331 +++
...r_Dns_Domain_ResourceRecord_deleteObject.xml | 8 +
...yer_Dns_Domain_ResourceRecord_editObject.xml | 8 +
...ayer_Dns_Domain_ResourceRecord_getObject.xml | 81 +
..._Domain_ResourceRecord_getObject_changed.xml | 81 +
.../v3_SoftLayer_Dns_Domain_createObject.xml | 506 ++++
.../v3_SoftLayer_Dns_Domain_deleteObject.xml | 8 +
.../v3_SoftLayer_Dns_Domain_getByDomainName.xml | 39 +
.../v3_SoftLayer_Dns_Domain_getObject.xml | 39 +
..._SoftLayer_Dns_Domain_getResourceRecords.xml | 297 +++
libcloud/test/dns/test_hostvirtual.py | 30 +-
libcloud/test/dns/test_route53.py | 34 +
libcloud/test/dns/test_softlayer.py | 255 ++
.../createLoadBalancerRule_default.json | 2 +-
.../listLoadBalancerRules_default.json | 2 +-
libcloud/test/loadbalancer/test_cloudstack.py | 4 +-
libcloud/test/secrets.py-dist | 3 +-
libcloud/test/storage/test_cloudfiles.py | 110 +-
libcloud/test/test_httplib_ssl.py | 126 -
libcloud/utils/dist.py | 3 +-
libcloud/utils/files.py | 2 +-
libcloud/utils/py3.py | 16 +
requirements-tests.txt | 2 +
setup.cfg | 3 +
setup.py | 59 +-
tox.ini | 34 +-
335 files changed, 16341 insertions(+), 2033 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/01610985/libcloud/compute/providers.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/01610985/libcloud/compute/types.py
----------------------------------------------------------------------
diff --cc libcloud/compute/types.py
index 84732b3,e59a397..df818ed
--- a/libcloud/compute/types.py
+++ b/libcloud/compute/types.py
@@@ -79,11 -78,8 +78,10 @@@ class Provider(object)
:cvar OUTSCALE_INC: Outscale INC driver.
:cvar PROFIT_BRICKS: ProfitBricks driver.
:cvar VULTR: vultr driver.
- =======
- >>>>>>> LIBCLOUD-556_azure_compute_driver
+ :cvar AZURE: Azure driver.
+ :cvar AURORACOMPUTE: Aurora Compute driver.
"""
+ AZURE = 'azure'
DUMMY = 'dummy'
EC2 = 'ec2_us_east'
RACKSPACE = 'rackspace'
http://git-wip-us.apache.org/repos/asf/libcloud/blob/01610985/libcloud/httplib_ssl.py
----------------------------------------------------------------------
