Merge branch 'LIBCLOUD-450_GCEv1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/6fda82f3 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/6fda82f3 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/6fda82f3 Branch: refs/heads/trunk Commit: 6fda82f34f4c0d0629f3043e1fa6c28109a7ae17 Parents: 039f742 f519acb Author: Tomaz Muraus <[email protected]> Authored: Fri Jan 3 15:32:28 2014 +0100 Committer: Tomaz Muraus <[email protected]> Committed: Fri Jan 3 15:32:37 2014 +0100 ---------------------------------------------------------------------- demos/gce_demo.py | 34 +- demos/gce_lb_demo.py | 3 +- libcloud/common/google.py | 45 +- libcloud/compute/drivers/gce.py | 1539 +++++++++------ .../fixtures/gce/aggregated_addresses.json | 18 +- .../compute/fixtures/gce/aggregated_disks.json | 115 +- .../gce/aggregated_forwardingRules.json | 32 +- .../fixtures/gce/aggregated_instances.json | 260 +-- .../fixtures/gce/aggregated_machineTypes.json | 1825 ++++++++++-------- .../fixtures/gce/aggregated_targetPools.json | 28 +- .../test/compute/fixtures/gce/generic_disk.json | 13 + .../compute/fixtures/gce/global_firewalls.json | 22 +- .../gce/global_firewalls_lcfirewall.json | 4 +- .../gce/global_firewalls_lcfirewall_delete.json | 4 +- .../gce/global_firewalls_lcfirewall_put.json | 4 +- .../fixtures/gce/global_firewalls_post.json | 4 +- .../fixtures/gce/global_httpHealthChecks.json | 24 +- .../global_httpHealthChecks_basic-check.json | 2 +- .../global_httpHealthChecks_lchealthcheck.json | 2 +- ...l_httpHealthChecks_lchealthcheck_delete.json | 4 +- ...obal_httpHealthChecks_lchealthcheck_put.json | 4 +- ...althChecks_libcloud-lb-demo-healthcheck.json | 2 +- .../gce/global_httpHealthChecks_post.json | 4 +- .../compute/fixtures/gce/global_images.json | 10 +- .../compute/fixtures/gce/global_networks.json | 8 +- .../fixtures/gce/global_networks_default.json | 2 +- .../fixtures/gce/global_networks_lcnetwork.json | 2 +- .../gce/global_networks_lcnetwork_delete.json | 4 +- ...l_networks_libcloud-demo-europe-network.json | 2 +- .../global_networks_libcloud-demo-network.json | 2 +- .../fixtures/gce/global_networks_post.json | 4 +- .../compute/fixtures/gce/global_snapshots.json | 31 + .../gce/global_snapshots_lcsnapshot.json | 12 + .../gce/global_snapshots_lcsnapshot_delete.json | 14 + ...tion_global_firewalls_lcfirewall_delete.json | 4 +- ...eration_global_firewalls_lcfirewall_put.json | 4 +- ...rations_operation_global_firewalls_post.json | 4 +- ...l_httpHealthChecks_lchealthcheck_delete.json | 4 +- ...obal_httpHealthChecks_lchealthcheck_put.json | 4 +- ..._operation_global_httpHealthChecks_post.json | 4 +- ...ration_global_networks_lcnetwork_delete.json | 4 +- ...erations_operation_global_networks_post.json | 4 +- ...tion_global_snapshots_lcsnapshot_delete.json | 15 + ..._us-central1_addresses_lcaddress_delete.json | 6 +- ...tion_regions_us-central1_addresses_post.json | 6 +- ...forwardingRules_lcforwardingrule_delete.json | 6 +- ...egions_us-central1_forwardingRules_post.json | 6 +- ...tPools_lctargetpool_addHealthCheck_post.json | 6 +- ...rgetPools_lctargetpool_addInstance_post.json | 6 +- ...entral1_targetPools_lctargetpool_delete.json | 6 +- ...ols_lctargetpool_removeHealthCheck_post.json | 6 +- ...tPools_lctargetpool_removeInstance_post.json | 6 +- ...on_regions_us-central1_targetPools_post.json | 6 +- ...ion_zones_europe-west1-a_instances_post.json | 6 +- ...ral1-a_disks_lcdisk_createSnapshot_post.json | 16 + ...zones_us-central1-a_disks_lcdisk_delete.json | 6 +- ...peration_zones_us-central1-a_disks_post.json | 6 +- ...-central1-a_instances_lcnode-000_delete.json | 6 +- ...-central1-a_instances_lcnode-001_delete.json | 6 +- ...1-a_instances_node-name_attachDisk_post.json | 6 +- ...s-central1-a_instances_node-name_delete.json | 6 +- ...1-a_instances_node-name_detachDisk_post.json | 6 +- ...ntral1-a_instances_node-name_reset_post.json | 6 +- ...ral1-a_instances_node-name_setTags_post.json | 6 +- ...tion_zones_us-central1-a_instances_post.json | 6 +- libcloud/test/compute/fixtures/gce/project.json | 2 +- .../projects_debian-cloud_global_images.json | 172 +- libcloud/test/compute/fixtures/gce/regions.json | 18 +- .../gce/regions_us-central1_addresses.json | 10 +- ...regions_us-central1_addresses_lcaddress.json | 4 +- ..._us-central1_addresses_lcaddress_delete.json | 6 +- .../gce/regions_us-central1_addresses_post.json | 6 +- .../regions_us-central1_forwardingRules.json | 14 +- ...ntral1_forwardingRules_lcforwardingrule.json | 6 +- ...forwardingRules_lcforwardingrule_delete.json | 6 +- ...al1_forwardingRules_libcloud-lb-demo-lb.json | 6 +- ...egions_us-central1_forwardingRules_post.json | 6 +- .../gce/regions_us-central1_targetPools.json | 24 +- ...ns_us-central1_targetPools_lctargetpool.json | 10 +- ...tPools_lctargetpool_addHealthCheck_post.json | 6 +- ...rgetPools_lctargetpool_addInstance_post.json | 6 +- ...entral1_targetPools_lctargetpool_delete.json | 6 +- ...ols_lctargetpool_removeHealthCheck_post.json | 6 +- ...tPools_lctargetpool_removeInstance_post.json | 6 +- ...ral1_targetPools_libcloud-lb-demo-lb-tp.json | 12 +- .../regions_us-central1_targetPools_post.json | 6 +- ...egions_us-central1_targetPools_www-pool.json | 12 +- libcloud/test/compute/fixtures/gce/zones.json | 35 +- .../gce/zones_europe-west1-a_instances.json | 83 +- .../zones_europe-west1-a_instances_post.json | 6 +- ...rope-west1-a_machineTypes_n1-standard-1.json | 2 +- .../fixtures/gce/zones_us-central1-a.json | 4 +- .../fixtures/gce/zones_us-central1-a_disks.json | 33 +- .../gce/zones_us-central1-a_disks_lcdisk.json | 4 +- ...ral1-a_disks_lcdisk_createSnapshot_post.json | 15 + ...zones_us-central1-a_disks_lcdisk_delete.json | 6 +- .../gce/zones_us-central1-a_disks_post.json | 6 +- .../gce/zones_us-central1-a_instances.json | 213 +- ...ones_us-central1-a_instances_lcnode-000.json | 28 +- ...-central1-a_instances_lcnode-000_delete.json | 6 +- ...ones_us-central1-a_instances_lcnode-001.json | 26 +- ...-central1-a_instances_lcnode-001_delete.json | 6 +- ...zones_us-central1-a_instances_node-name.json | 26 +- ...1-a_instances_node-name_attachDisk_post.json | 6 +- ...s-central1-a_instances_node-name_delete.json | 8 +- ...1-a_instances_node-name_detachDisk_post.json | 6 +- ...ntral1-a_instances_node-name_reset_post.json | 6 +- ...ral1-a_instances_node-name_setTags_post.json | 6 +- .../gce/zones_us-central1-a_instances_post.json | 6 +- .../gce/zones_us-central1-a_machineTypes.json | 96 +- ...s-central1-a_machineTypes_n1-standard-1.json | 2 +- ...l1-b_instances_libcloud-lb-demo-www-000.json | 29 +- ...l1-b_instances_libcloud-lb-demo-www-001.json | 31 +- libcloud/test/compute/test_gce.py | 163 +- libcloud/test/loadbalancer/test_gce.py | 6 +- 115 files changed, 3281 insertions(+), 2205 deletions(-) ----------------------------------------------------------------------
