fog-google 0.1.3 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.editorconfig +11 -0
- data/.gitignore +1 -0
- data/.hound.yml +2 -0
- data/.rubocop.yml +225 -5
- data/.travis.yml +13 -11
- data/CONTRIBUTORS.md +1 -0
- data/Gemfile +1 -1
- data/README.md +31 -16
- data/Rakefile +15 -39
- data/examples/backend_services.rb +12 -11
- data/examples/bootstrap.rb +11 -1
- data/examples/{create.rb → create_instance.rb} +20 -11
- data/examples/dns/project.rb +2 -3
- data/examples/dns/zones.rb +21 -21
- data/examples/get_list_images.rb +31 -15
- data/examples/get_list_snapshots.rb +20 -10
- data/examples/image_create.rb +5 -5
- data/examples/l7_load_balance.rb +56 -58
- data/examples/load-balance.rb +22 -23
- data/examples/metadata.rb +17 -9
- data/examples/monitoring/metric_descriptors.rb +19 -6
- data/examples/monitoring/timeseries_collection.rb +23 -11
- data/examples/monitoring/timeseries_descriptors.rb +23 -11
- data/examples/network.rb +25 -29
- data/examples/precreated_client.rb +3 -6
- data/examples/sql/flags.rb +2 -2
- data/examples/sql/instances.rb +18 -18
- data/examples/sql/operations.rb +9 -9
- data/examples/sql/ssl_certs.rb +13 -13
- data/examples/sql/tiers.rb +2 -2
- data/examples/storage.rb +37 -0
- data/examples/storage_json.rb +37 -0
- data/fog-google.gemspec +24 -21
- data/lib/fog/bin/google.rb +34 -32
- data/lib/fog/{google/compute.rb → compute/google.rb} +207 -151
- data/lib/fog/{google/models/compute → compute/google/models}/address.rb +24 -28
- data/lib/fog/{google/models/compute → compute/google/models}/addresses.rb +10 -14
- data/lib/fog/{google/models/compute → compute/google/models}/backend_service.rb +28 -34
- data/lib/fog/{google/models/compute → compute/google/models}/backend_services.rb +2 -5
- data/lib/fog/{google/models/compute → compute/google/models}/disk.rb +35 -39
- data/lib/fog/{google/models/compute → compute/google/models}/disk_type.rb +4 -6
- data/lib/fog/{google/models/compute → compute/google/models}/disk_types.rb +7 -10
- data/lib/fog/{google/models/compute → compute/google/models}/disks.rb +9 -12
- data/lib/fog/{google/models/compute → compute/google/models}/firewall.rb +10 -14
- data/lib/fog/{google/models/compute → compute/google/models}/firewalls.rb +1 -4
- data/lib/fog/compute/google/models/flavor.rb +31 -0
- data/lib/fog/{google/models/compute → compute/google/models}/flavors.rb +2 -5
- data/lib/fog/{google/models/compute → compute/google/models}/forwarding_rule.rb +24 -28
- data/lib/fog/{google/models/compute → compute/google/models}/forwarding_rules.rb +8 -11
- data/lib/fog/compute/google/models/global_forwarding_rule.rb +82 -0
- data/lib/fog/{google/models/compute → compute/google/models}/global_forwarding_rules.rb +2 -5
- data/lib/fog/compute/google/models/http_health_check.rb +80 -0
- data/lib/fog/{google/models/compute → compute/google/models}/http_health_checks.rb +2 -5
- data/lib/fog/{google/models/compute → compute/google/models}/image.rb +18 -22
- data/lib/fog/{google/models/compute → compute/google/models}/images.rb +24 -17
- data/lib/fog/{google/models/compute → compute/google/models}/instance_group.rb +5 -8
- data/lib/fog/{google/models/compute → compute/google/models}/instance_groups.rb +10 -13
- data/lib/fog/{google/models/compute → compute/google/models}/network.rb +9 -13
- data/lib/fog/{google/models/compute → compute/google/models}/networks.rb +1 -4
- data/lib/fog/{google/models/compute → compute/google/models}/operation.rb +16 -18
- data/lib/fog/{google/models/compute → compute/google/models}/operations.rb +8 -11
- data/lib/fog/{google/models/compute → compute/google/models}/project.rb +5 -7
- data/lib/fog/{google/models/compute → compute/google/models}/projects.rb +0 -3
- data/lib/fog/{google/models/compute → compute/google/models}/region.rb +5 -7
- data/lib/fog/{google/models/compute → compute/google/models}/regions.rb +1 -4
- data/lib/fog/compute/google/models/resource_view.rb +108 -0
- data/lib/fog/compute/google/models/resource_views.rb +54 -0
- data/lib/fog/{google/models/compute → compute/google/models}/route.rb +12 -16
- data/lib/fog/{google/models/compute → compute/google/models}/routes.rb +1 -4
- data/lib/fog/{google/models/compute → compute/google/models}/server.rb +81 -92
- data/lib/fog/{google/models/compute → compute/google/models}/servers.rb +13 -16
- data/lib/fog/compute/google/models/snapshot.rb +44 -0
- data/lib/fog/{google/models/compute → compute/google/models}/snapshots.rb +1 -4
- data/lib/fog/compute/google/models/subnetwork.rb +49 -0
- data/lib/fog/compute/google/models/subnetworks.rb +29 -0
- data/lib/fog/{google/models/compute → compute/google/models}/target_http_proxies.rb +2 -5
- data/lib/fog/{google/models/compute → compute/google/models}/target_http_proxy.rb +18 -22
- data/lib/fog/{google/models/compute → compute/google/models}/target_instance.rb +23 -28
- data/lib/fog/{google/models/compute → compute/google/models}/target_instances.rb +9 -12
- data/lib/fog/{google/models/compute → compute/google/models}/target_pool.rb +24 -28
- data/lib/fog/{google/models/compute → compute/google/models}/target_pools.rb +6 -9
- data/lib/fog/{google/models/compute → compute/google/models}/url_map.rb +32 -36
- data/lib/fog/{google/models/compute → compute/google/models}/url_maps.rb +1 -4
- data/lib/fog/compute/google/models/zone.rb +21 -0
- data/lib/fog/{google/models/compute → compute/google/models}/zones.rb +0 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_backend_service_backends.rb +5 -5
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_instance_group_instance.rb +4 -4
- data/lib/fog/compute/google/requests/add_region_view_resources.rb +27 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_server_access_config.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_target_pool_health_checks.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_target_pool_instances.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_url_map_host_rules.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/add_url_map_path_matchers.rb +7 -7
- data/lib/fog/compute/google/requests/add_zone_view_resources.rb +27 -0
- data/lib/fog/compute/google/requests/attach_disk.rb +34 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_address.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_backend_service.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_disk.rb +9 -11
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_firewall.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_forwarding_rule.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_global_forwarding_rule.rb +12 -12
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_global_operation.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_http_health_check.rb +7 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_image.rb +7 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_instance_group.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_network.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_region_operation.rb +6 -6
- data/lib/fog/compute/google/requests/delete_region_view.rb +24 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_route.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_server.rb +15 -17
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_server_access_config.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_snapshot.rb +3 -3
- data/lib/fog/compute/google/requests/delete_subnetwork.rb +49 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_target_http_proxy.rb +7 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_target_instance.rb +9 -11
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_target_pool.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_url_map.rb +7 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/delete_zone_operation.rb +5 -7
- data/lib/fog/compute/google/requests/delete_zone_view.rb +24 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/detach_disk.rb +5 -5
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_address.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_backend_service.rb +5 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_backend_service_health.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_backend_services.rb +6 -6
- data/lib/fog/compute/google/requests/get_disk.rb +46 -0
- data/lib/fog/compute/google/requests/get_disk_type.rb +40 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_firewall.rb +3 -3
- data/lib/fog/compute/google/requests/get_forwarding_rule.rb +44 -0
- data/lib/fog/compute/google/requests/get_global_forwarding_rule.rb +30 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_global_operation.rb +8 -8
- data/lib/fog/compute/google/requests/get_http_health_check.rb +37 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_image.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_instance_group.rb +5 -5
- data/lib/fog/compute/google/requests/get_machine_type.rb +41 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_network.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_project.rb +2 -2
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_region.rb +9 -9
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_region_operation.rb +11 -11
- data/lib/fog/compute/google/requests/get_region_view.rb +24 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_route.rb +3 -3
- data/lib/fog/compute/google/requests/get_server.rb +71 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_server_serial_port_output.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_snapshot.rb +5 -7
- data/lib/fog/compute/google/requests/get_subnetwork.rb +45 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_target_http_proxy.rb +4 -6
- data/lib/fog/compute/google/requests/get_target_instance.rb +28 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_target_pool.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_target_pool_health.rb +7 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_url_map.rb +4 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_zone.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/get_zone_operation.rb +10 -12
- data/lib/fog/compute/google/requests/get_zone_view.rb +24 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_address.rb +5 -5
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_backend_service.rb +17 -17
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_disk.rb +26 -30
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_firewall.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_forwarding_rule.rb +13 -13
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_global_forwarding_rule.rb +13 -13
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_http_health_check.rb +11 -11
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_image.rb +14 -14
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_instance_group.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_network.rb +6 -6
- data/lib/fog/compute/google/requests/insert_region_view.rb +25 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_route.rb +11 -11
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_server.rb +57 -57
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_snapshot.rb +8 -8
- data/lib/fog/compute/google/requests/insert_subnetwork.rb +75 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_target_http_proxy.rb +9 -9
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_target_instance.rb +11 -11
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_target_pool.rb +11 -11
- data/lib/fog/{google/requests/compute → compute/google/requests}/insert_url_map.rb +9 -9
- data/lib/fog/compute/google/requests/insert_zone_view.rb +26 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_addresses.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_aggregated_addresses.rb +3 -3
- data/lib/fog/compute/google/requests/list_aggregated_disk_types.rb +38 -0
- data/lib/fog/compute/google/requests/list_aggregated_disks.rb +37 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_aggregated_instance_groups.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_aggregated_machine_types.rb +1 -1
- data/lib/fog/compute/google/requests/list_aggregated_servers.rb +37 -0
- data/lib/fog/compute/google/requests/list_aggregated_subnetworks.rb +34 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_aggregated_target_instances.rb +10 -13
- data/lib/fog/compute/google/requests/list_backend_services.rb +27 -0
- data/lib/fog/compute/google/requests/list_disk_types.rb +44 -0
- data/lib/fog/compute/google/requests/list_disks.rb +27 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_firewalls.rb +1 -1
- data/lib/fog/compute/google/requests/list_forwarding_rules.rb +27 -0
- data/lib/fog/compute/google/requests/list_global_forwarding_rules.rb +28 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_global_operations.rb +1 -1
- data/lib/fog/compute/google/requests/list_http_health_checks.rb +27 -0
- data/lib/fog/compute/google/requests/list_images.rb +27 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_instance_group_instances.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_instance_groups.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_machine_types.rb +6 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_networks.rb +1 -1
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_region_operations.rb +3 -3
- data/lib/fog/compute/google/requests/list_region_view_resources.rb +24 -0
- data/lib/fog/compute/google/requests/list_region_views.rb +23 -0
- data/lib/fog/compute/google/requests/list_regions.rb +83 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_routes.rb +2 -2
- data/lib/fog/compute/google/requests/list_servers.rb +29 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_snapshots.rb +3 -3
- data/lib/fog/compute/google/requests/list_subnetworks.rb +35 -0
- data/lib/fog/compute/google/requests/list_target_http_proxies.rb +27 -0
- data/lib/fog/compute/google/requests/list_target_instances.rb +28 -0
- data/lib/fog/compute/google/requests/list_target_pools.rb +27 -0
- data/lib/fog/compute/google/requests/list_url_maps.rb +27 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/list_zone_operations.rb +3 -3
- data/lib/fog/compute/google/requests/list_zone_view_resources.rb +24 -0
- data/lib/fog/compute/google/requests/list_zone_views.rb +23 -0
- data/lib/fog/compute/google/requests/list_zones.rb +26 -0
- data/lib/fog/{google/requests/compute → compute/google/requests}/remove_instance_group_instance.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/remove_target_pool_health_checks.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/remove_target_pool_instance.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/remove_target_pool_instances.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/reset_server.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_common_instance_metadata.rb +3 -3
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_forwarding_rule_target.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_global_forwarding_rule_target.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_metadata.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_server_disk_auto_delete.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_server_scheduling.rb +7 -7
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_tags.rb +6 -6
- data/lib/fog/{google/requests/compute → compute/google/requests}/set_target_http_proxy_url_map.rb +5 -5
- data/lib/fog/{google/requests/compute → compute/google/requests}/start_server.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/stop_server.rb +4 -4
- data/lib/fog/{google/requests/compute → compute/google/requests}/update_url_map.rb +8 -8
- data/lib/fog/{google/requests/compute → compute/google/requests}/validate_url_map.rb +5 -5
- data/lib/fog/{google/dns.rb → dns/google.rb} +9 -9
- data/lib/fog/{google/models/dns → dns/google/models}/change.rb +5 -7
- data/lib/fog/{google/models/dns → dns/google/models}/changes.rb +1 -4
- data/lib/fog/{google/models/dns → dns/google/models}/project.rb +6 -8
- data/lib/fog/{google/models/dns → dns/google/models}/projects.rb +0 -3
- data/lib/fog/{google/models/dns → dns/google/models}/record.rb +17 -27
- data/lib/fog/{google/models/dns → dns/google/models}/records.rb +2 -5
- data/lib/fog/{google/models/dns → dns/google/models}/zone.rb +6 -8
- data/lib/fog/{google/models/dns → dns/google/models}/zones.rb +1 -4
- data/lib/fog/{google/requests/dns → dns/google/requests}/create_change.rb +17 -17
- data/lib/fog/dns/google/requests/create_managed_zone.rb +82 -0
- data/lib/fog/{google/requests/dns → dns/google/requests}/delete_managed_zone.rb +6 -6
- data/lib/fog/{google/requests/dns → dns/google/requests}/get_change.rb +7 -7
- data/lib/fog/{google/requests/dns → dns/google/requests}/get_managed_zone.rb +4 -4
- data/lib/fog/{google/requests/dns → dns/google/requests}/get_project.rb +12 -12
- data/lib/fog/{google/requests/dns → dns/google/requests}/list_changes.rb +7 -7
- data/lib/fog/{google/requests/dns → dns/google/requests}/list_managed_zones.rb +5 -5
- data/lib/fog/{google/requests/dns → dns/google/requests}/list_resource_record_sets.rb +11 -11
- data/lib/fog/google.rb +78 -71
- data/lib/fog/google/models/monitoring/metric_descriptor.rb +3 -3
- data/lib/fog/google/models/monitoring/metric_descriptors.rb +3 -3
- data/lib/fog/google/models/monitoring/timeseries.rb +2 -2
- data/lib/fog/google/models/monitoring/timeseries_collection.rb +3 -3
- data/lib/fog/google/models/monitoring/timeseries_descriptor.rb +1 -1
- data/lib/fog/google/models/monitoring/timeseries_descriptors.rb +3 -3
- data/lib/fog/google/models/sql/backup_run.rb +8 -8
- data/lib/fog/google/models/sql/backup_runs.rb +3 -3
- data/lib/fog/google/models/sql/flag.rb +5 -5
- data/lib/fog/google/models/sql/flags.rb +3 -3
- data/lib/fog/google/models/sql/instance.rb +54 -68
- data/lib/fog/google/models/sql/instances.rb +4 -4
- data/lib/fog/google/models/sql/operation.rb +15 -15
- data/lib/fog/google/models/sql/operations.rb +5 -5
- data/lib/fog/google/models/sql/ssl_cert.rb +17 -19
- data/lib/fog/google/models/sql/ssl_certs.rb +5 -5
- data/lib/fog/google/models/sql/tier.rb +3 -3
- data/lib/fog/google/models/sql/tiers.rb +3 -3
- data/lib/fog/google/monitoring.rb +8 -8
- data/lib/fog/google/requests/monitoring/list_metric_descriptors.rb +131 -131
- data/lib/fog/google/requests/monitoring/list_timeseries.rb +32 -32
- data/lib/fog/google/requests/monitoring/list_timeseries_descriptors.rb +50 -50
- data/lib/fog/google/requests/sql/clone_instance.rb +41 -41
- data/lib/fog/google/requests/sql/delete_instance.rb +26 -26
- data/lib/fog/google/requests/sql/delete_ssl_cert.rb +27 -27
- data/lib/fog/google/requests/sql/export_instance.rb +22 -22
- data/lib/fog/google/requests/sql/get_backup_run.rb +5 -5
- data/lib/fog/google/requests/sql/get_instance.rb +12 -12
- data/lib/fog/google/requests/sql/get_operation.rb +21 -21
- data/lib/fog/google/requests/sql/get_ssl_cert.rb +21 -21
- data/lib/fog/google/requests/sql/import_instance.rb +21 -21
- data/lib/fog/google/requests/sql/insert_instance.rb +76 -78
- data/lib/fog/google/requests/sql/insert_ssl_cert.rb +33 -33
- data/lib/fog/google/requests/sql/list_backup_runs.rb +4 -4
- data/lib/fog/google/requests/sql/list_flags.rb +84 -84
- data/lib/fog/google/requests/sql/list_instances.rb +3 -3
- data/lib/fog/google/requests/sql/list_operations.rb +13 -13
- data/lib/fog/google/requests/sql/list_ssl_certs.rb +13 -13
- data/lib/fog/google/requests/sql/list_tiers.rb +39 -39
- data/lib/fog/google/requests/sql/reset_instance_ssl_config.rb +16 -16
- data/lib/fog/google/requests/sql/restart_instance.rb +16 -16
- data/lib/fog/google/requests/sql/restore_instance_backup.rb +5 -5
- data/lib/fog/google/requests/sql/set_instance_root_password.rb +20 -20
- data/lib/fog/google/requests/sql/update_instance.rb +52 -52
- data/lib/fog/google/sql.rb +7 -7
- data/lib/fog/google/version.rb +1 -1
- data/lib/fog/parsers/storage/google.rb +15 -0
- data/lib/fog/{google/parsers/storage → parsers/storage/google}/access_control_list.rb +13 -13
- data/lib/fog/{google/parsers/storage → parsers/storage/google}/copy_object.rb +3 -3
- data/lib/fog/parsers/storage/google/get_bucket.rb +58 -0
- data/lib/fog/parsers/storage/google/get_bucket_logging.rb +36 -0
- data/lib/fog/parsers/storage/google/get_bucket_object_versions.rb +84 -0
- data/lib/fog/{google/parsers/storage → parsers/storage/google}/get_bucket_versioning.rb +3 -3
- data/lib/fog/{google/parsers/storage → parsers/storage/google}/get_request_payment.rb +1 -1
- data/lib/fog/{google/parsers/storage → parsers/storage/google}/get_service.rb +8 -8
- data/lib/fog/storage/google.rb +20 -0
- data/lib/fog/storage/google_json.rb +146 -0
- data/lib/fog/storage/google_json/models/directories.rb +26 -0
- data/lib/fog/storage/google_json/models/directory.rb +65 -0
- data/lib/fog/storage/google_json/models/file.rb +148 -0
- data/lib/fog/storage/google_json/models/files.rb +89 -0
- data/lib/fog/storage/google_json/requests/copy_object.rb +66 -0
- data/lib/fog/storage/google_json/requests/delete_bucket.rb +42 -0
- data/lib/fog/{google/requests/storage → storage/google_json/requests}/delete_object.rb +12 -12
- data/lib/fog/storage/google_json/requests/get_bucket.rb +86 -0
- data/lib/fog/{google/requests/storage → storage/google_json/requests}/get_bucket_acl.rb +12 -17
- data/lib/fog/storage/google_json/requests/get_object.rb +98 -0
- data/lib/fog/storage/google_json/requests/get_object_acl.rb +59 -0
- data/lib/fog/storage/google_json/requests/get_object_http_url.rb +40 -0
- data/lib/fog/storage/google_json/requests/get_object_https_url.rb +41 -0
- data/lib/fog/storage/google_json/requests/get_object_torrent.rb +13 -0
- data/lib/fog/storage/google_json/requests/get_object_url.rb +22 -0
- data/lib/fog/storage/google_json/requests/get_service.rb +54 -0
- data/lib/fog/storage/google_json/requests/head_object.rb +54 -0
- data/lib/fog/storage/google_json/requests/put_bucket.rb +68 -0
- data/lib/fog/storage/google_json/requests/put_bucket_acl.rb +34 -0
- data/lib/fog/storage/google_json/requests/put_object.rb +118 -0
- data/lib/fog/storage/google_json/requests/put_object_acl.rb +31 -0
- data/lib/fog/storage/google_json/requests/put_object_url.rb +45 -0
- data/lib/fog/{google/storage.rb → storage/google_xml.rb} +49 -53
- data/lib/fog/storage/google_xml/models/directories.rb +34 -0
- data/lib/fog/{google/models/storage → storage/google_xml/models}/directory.rb +13 -21
- data/lib/fog/{google/models/storage → storage/google_xml/models}/file.rb +34 -46
- data/lib/fog/{google/models/storage → storage/google_xml/models}/files.rb +21 -30
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/copy_object.rb +15 -21
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/delete_bucket.rb +10 -12
- data/lib/fog/storage/google_xml/requests/delete_object.rb +44 -0
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_bucket.rb +33 -43
- data/lib/fog/storage/google_xml/requests/get_bucket_acl.rb +53 -0
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object.rb +25 -37
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object_acl.rb +16 -24
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object_http_url.rb +8 -12
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object_https_url.rb +8 -12
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object_torrent.rb +10 -16
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object_url.rb +1 -1
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_service.rb +13 -17
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/head_object.rb +14 -20
- data/lib/fog/storage/google_xml/requests/put_bucket.rb +71 -0
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/put_bucket_acl.rb +12 -14
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/put_object.rb +23 -27
- data/lib/fog/{google/requests/storage → storage/google_xml/requests}/put_object_acl.rb +12 -14
- data/lib/fog/storage/google_xml/requests/put_object_url.rb +42 -0
- data/tasks/bundler.rake +3 -0
- data/tasks/console.rake +12 -0
- data/tasks/lint.rake +3 -0
- data/tasks/smoke.rake +15 -0
- data/tasks/test.rake +13 -0
- data/test/helpers/integration_test_helper.rb +3 -3
- data/test/helpers/test_collection.rb +1 -1
- data/test/helpers/test_helper.rb +8 -8
- data/test/integration/compute/test_servers.rb +1 -1
- data/test/integration/factories/backend_services_factory.rb +2 -2
- data/test/integration/factories/collection_factory.rb +4 -4
- data/test/integration/factories/disks_factory.rb +3 -3
- data/test/integration/factories/forwarding_rules_factory.rb +3 -4
- data/test/integration/factories/global_forwarding_rules_factory.rb +2 -2
- data/test/integration/factories/http_health_checks_factory.rb +1 -1
- data/test/integration/factories/images_factory.rb +2 -2
- data/test/integration/factories/servers_factory.rb +4 -4
- data/test/integration/factories/target_http_proxies_factory.rb +2 -2
- data/test/integration/factories/target_instances_factory.rb +3 -3
- data/test/integration/factories/target_pools_factory.rb +4 -4
- data/test/integration/factories/url_maps_factory.rb +2 -2
- data/test/integration/storage/test_buckets.rb +56 -0
- data/test/integration/storage/test_directories.rb +60 -0
- data/test/integration/storage/test_files.rb +132 -0
- data/test/integration/storage/test_objects.rb +111 -0
- data/test/integration/test_authentication.rb +14 -10
- data/tests/helper.rb +40 -42
- data/tests/helpers/collection_helper.rb +26 -37
- data/tests/helpers/compute/flavors_helper.rb +4 -8
- data/tests/helpers/compute/server_helper.rb +1 -5
- data/tests/helpers/compute/servers_helper.rb +0 -2
- data/tests/helpers/formats_helper.rb +12 -12
- data/tests/helpers/formats_helper_tests.rb +43 -47
- data/tests/helpers/mock_helper.rb +6 -8
- data/tests/helpers/model_helper.rb +6 -10
- data/tests/helpers/schema_validator_tests.rb +41 -47
- data/tests/helpers/succeeds_helper.rb +1 -1
- data/tests/models/dns/change_tests.rb +8 -10
- data/tests/models/dns/changes_tests.rb +8 -12
- data/tests/models/dns/projects_tests.rb +2 -5
- data/tests/models/dns/record_tests.rb +9 -10
- data/tests/models/dns/records_tests.rb +9 -13
- data/tests/models/dns/zone_tests.rb +6 -6
- data/tests/models/dns/zones_tests.rb +5 -5
- data/tests/models/monitoring/metric_descriptors_tests.rb +2 -5
- data/tests/models/monitoring/timeseries_collection_tests.rb +3 -6
- data/tests/models/monitoring/timeseries_descriptors_tests.rb +3 -6
- data/tests/models/sql/flags_tests.rb +2 -5
- data/tests/models/sql/instance_tests.rb +4 -7
- data/tests/models/sql/instances_tests.rb +4 -9
- data/tests/models/sql/operation_tests.rb +3 -6
- data/tests/models/sql/operations_tests.rb +4 -9
- data/tests/models/sql/ssl_cert_tests.rb +3 -6
- data/tests/models/sql/ssl_certs_tests.rb +4 -9
- data/tests/models/sql/tiers_tests.rb +2 -5
- data/tests/requests/compute/backend_service_tests.rb +43 -47
- data/tests/requests/compute/disk_tests.rb +42 -46
- data/tests/requests/compute/disk_type_tests.rb +18 -21
- data/tests/requests/compute/firewall_tests.rb +42 -45
- data/tests/requests/compute/forwarding_rules_tests.rb +44 -48
- data/tests/requests/compute/global_forwarding_rules_tests.rb +44 -48
- data/tests/requests/compute/http_health_checks_tests.rb +44 -48
- data/tests/requests/compute/image_tests.rb +41 -45
- data/tests/requests/compute/network_tests.rb +38 -41
- data/tests/requests/compute/operation_tests.rb +2 -3
- data/tests/requests/compute/region_tests.rb +18 -18
- data/tests/requests/compute/server_tests.rb +45 -47
- data/tests/requests/compute/target_http_proxies_test.rb +39 -43
- data/tests/requests/compute/target_instances_tests.rb +43 -47
- data/tests/requests/compute/target_pools_tests.rb +43 -47
- data/tests/requests/compute/url_maps_tests.rb +42 -46
- data/tests/requests/compute/zone_tests.rb +15 -19
- data/tests/requests/dns/change_tests.rb +18 -22
- data/tests/requests/dns/managed_zone_tests.rb +27 -30
- data/tests/requests/dns/project_tests.rb +13 -16
- data/tests/requests/dns/record_tests.rb +15 -18
- data/tests/requests/monitoring/metric_descriptor_tests.rb +9 -12
- data/tests/requests/monitoring/timeseries_collection_tests.rb +9 -12
- data/tests/requests/monitoring/timeseries_descriptor_tests.rb +10 -13
- data/tests/requests/sql/flag_tests.rb +11 -14
- data/tests/requests/sql/instance_tests.rb +36 -39
- data/tests/requests/sql/operation_tests.rb +17 -20
- data/tests/requests/sql/ssl_cert_tests.rb +21 -24
- data/tests/requests/sql/tier_tests.rb +9 -12
- data/tests/requests/storage/bucket_tests.rb +30 -36
- data/tests/requests/storage/object_tests.rb +21 -27
- metadata +309 -235
- data/examples/eric-fail.rb +0 -36
- data/examples/image_all.rb +0 -6
- data/examples/launch_micro_instance.rb +0 -29
- data/gemfiles/Gemfile.2.0.0+ +0 -6
- data/gemfiles/Gemfile.2.0.0- +0 -10
- data/lib/fog/google/models/compute/flavor.rb +0 -33
- data/lib/fog/google/models/compute/global_forwarding_rule.rb +0 -86
- data/lib/fog/google/models/compute/http_health_check.rb +0 -84
- data/lib/fog/google/models/compute/snapshot.rb +0 -48
- data/lib/fog/google/models/compute/zone.rb +0 -23
- data/lib/fog/google/models/storage/directories.rb +0 -39
- data/lib/fog/google/parsers/storage/get_bucket.rb +0 -58
- data/lib/fog/google/parsers/storage/get_bucket_logging.rb +0 -36
- data/lib/fog/google/parsers/storage/get_bucket_object_versions.rb +0 -84
- data/lib/fog/google/requests/compute/attach_disk.rb +0 -34
- data/lib/fog/google/requests/compute/get_disk.rb +0 -52
- data/lib/fog/google/requests/compute/get_disk_type.rb +0 -42
- data/lib/fog/google/requests/compute/get_forwarding_rule.rb +0 -46
- data/lib/fog/google/requests/compute/get_global_forwarding_rule.rb +0 -32
- data/lib/fog/google/requests/compute/get_http_health_check.rb +0 -39
- data/lib/fog/google/requests/compute/get_machine_type.rb +0 -43
- data/lib/fog/google/requests/compute/get_server.rb +0 -75
- data/lib/fog/google/requests/compute/get_target_instance.rb +0 -32
- data/lib/fog/google/requests/compute/list_aggregated_disk_types.rb +0 -40
- data/lib/fog/google/requests/compute/list_aggregated_disks.rb +0 -40
- data/lib/fog/google/requests/compute/list_aggregated_servers.rb +0 -40
- data/lib/fog/google/requests/compute/list_backend_services.rb +0 -29
- data/lib/fog/google/requests/compute/list_disk_types.rb +0 -46
- data/lib/fog/google/requests/compute/list_disks.rb +0 -29
- data/lib/fog/google/requests/compute/list_forwarding_rules.rb +0 -29
- data/lib/fog/google/requests/compute/list_global_forwarding_rules.rb +0 -30
- data/lib/fog/google/requests/compute/list_http_health_checks.rb +0 -29
- data/lib/fog/google/requests/compute/list_images.rb +0 -29
- data/lib/fog/google/requests/compute/list_regions.rb +0 -85
- data/lib/fog/google/requests/compute/list_servers.rb +0 -31
- data/lib/fog/google/requests/compute/list_target_http_proxies.rb +0 -30
- data/lib/fog/google/requests/compute/list_target_instances.rb +0 -30
- data/lib/fog/google/requests/compute/list_target_pools.rb +0 -29
- data/lib/fog/google/requests/compute/list_url_maps.rb +0 -29
- data/lib/fog/google/requests/compute/list_zones.rb +0 -28
- data/lib/fog/google/requests/dns/create_managed_zone.rb +0 -82
- data/lib/fog/google/requests/storage/put_bucket.rb +0 -71
- data/lib/fog/google/requests/storage/put_object_url.rb +0 -50
data/fog-google.gemspec
CHANGED
@@ -1,16 +1,16 @@
|
|
1
1
|
# coding: utf-8
|
2
|
-
lib = File.expand_path(
|
2
|
+
lib = File.expand_path("../lib", __FILE__)
|
3
3
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
4
|
-
require
|
4
|
+
require "fog/google/version"
|
5
5
|
|
6
6
|
Gem::Specification.new do |spec|
|
7
7
|
spec.name = "fog-google"
|
8
8
|
spec.version = Fog::Google::VERSION
|
9
|
-
spec.authors = ["Nat Welch", "Daniel Broudy", "Isaac Hollander McCreery"]
|
10
|
-
spec.email = ["nat@natwelch.com", "broudy@google.com", "ihmccreery@google.com"]
|
11
|
-
spec.summary =
|
12
|
-
spec.description =
|
13
|
-
to use the Google in applications.
|
9
|
+
spec.authors = ["Nat Welch", "Daniel Broudy", "Isaac Hollander McCreery", "Dean Putney"]
|
10
|
+
spec.email = ["nat@natwelch.com", "broudy@google.com", "ihmccreery@google.com", "dean@glowforge.com"]
|
11
|
+
spec.summary = "Module for the 'fog' gem to support Google."
|
12
|
+
spec.description = 'This library can be used as a module for `fog` or as standalone provider
|
13
|
+
to use the Google in applications.'
|
14
14
|
spec.homepage = "https://github.com/fog/fog-google"
|
15
15
|
spec.license = "MIT"
|
16
16
|
|
@@ -19,19 +19,22 @@ Gem::Specification.new do |spec|
|
|
19
19
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
20
20
|
spec.require_paths = ["lib"]
|
21
21
|
|
22
|
-
|
23
|
-
spec.
|
24
|
-
spec.add_dependency 'fog-xml'
|
25
|
-
spec.add_development_dependency 'google-api-client', '~> 0.6', '>= 0.6.2'
|
26
|
-
spec.add_development_dependency 'rake'
|
27
|
-
spec.add_development_dependency 'shindo'
|
28
|
-
spec.add_development_dependency 'minitest'
|
29
|
-
spec.add_development_dependency 'pry'
|
30
|
-
spec.add_development_dependency 'vcr'
|
31
|
-
spec.add_development_dependency 'webmock'
|
22
|
+
# As of 0.1.1
|
23
|
+
spec.required_ruby_version = ">= 2.0"
|
32
24
|
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
25
|
+
spec.add_dependency "fog-core"
|
26
|
+
spec.add_dependency "fog-json"
|
27
|
+
spec.add_dependency "fog-xml"
|
28
|
+
|
29
|
+
# TODO: Upgrade to 0.9, which is not compatible.
|
30
|
+
spec.add_development_dependency "google-api-client", "< 0.9", ">= 0.6.2"
|
31
|
+
spec.add_development_dependency "rake"
|
32
|
+
spec.add_development_dependency "shindo"
|
33
|
+
spec.add_development_dependency "minitest"
|
34
|
+
spec.add_development_dependency "pry"
|
35
|
+
spec.add_development_dependency "vcr"
|
36
|
+
spec.add_development_dependency "webmock"
|
37
|
+
spec.add_development_dependency "coveralls"
|
38
|
+
spec.add_development_dependency "rubocop"
|
39
|
+
spec.add_development_dependency "mime-types"
|
37
40
|
end
|
data/lib/fog/bin/google.rb
CHANGED
@@ -2,39 +2,41 @@ module Google # deviates from other bin stuff to accomodate gem
|
|
2
2
|
class << self
|
3
3
|
def class_for(key)
|
4
4
|
case key
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
5
|
+
when :compute
|
6
|
+
Fog::Compute::Google
|
7
|
+
when :dns
|
8
|
+
Fog::DNS::Google
|
9
|
+
when :monitoring
|
10
|
+
Fog::Google::Monitoring
|
11
|
+
when :storage
|
12
|
+
Fog::Storage::Google
|
13
|
+
when :storage_json
|
14
|
+
Fog::Storage::Google
|
15
|
+
when :sql
|
16
|
+
Fog::Google::SQL
|
17
|
+
else
|
18
|
+
raise ArgumentError, "Unsupported #{self} service: #{key}"
|
17
19
|
end
|
18
20
|
end
|
19
21
|
|
20
22
|
def [](service)
|
21
23
|
@@connections ||= Hash.new do |hash, key|
|
22
24
|
hash[key] = case key
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
25
|
+
when :compute
|
26
|
+
Fog::Logger.warning("Google[:compute] is not recommended, use Compute[:google] for portability")
|
27
|
+
Fog::Compute.new(:provider => "Google")
|
28
|
+
when :dns
|
29
|
+
Fog::Logger.warning("Google[:dns] is not recommended, use DNS[:google] for portability")
|
30
|
+
Fog::DNS.new(:provider => "Google")
|
31
|
+
when :monitoring
|
32
|
+
Fog::Google::Monitoring.new
|
33
|
+
when :sql
|
34
|
+
Fog::Google::SQL.new
|
35
|
+
when :storage
|
36
|
+
Fog::Logger.warning("Google[:storage] is not recommended, use Storage[:google] for portability")
|
37
|
+
Fog::Storage.new(:provider => "Google")
|
38
|
+
else
|
39
|
+
raise ArgumentError, "Unrecognized service: #{key.inspect}"
|
38
40
|
end
|
39
41
|
end
|
40
42
|
@@connections[service]
|
@@ -52,14 +54,14 @@ module Google # deviates from other bin stuff to accomodate gem
|
|
52
54
|
def available?
|
53
55
|
# Make sure the gem we use is enabled.
|
54
56
|
availability = if Gem::Specification.respond_to?(:find_all_by_name)
|
55
|
-
!Gem::Specification.find_all_by_name(
|
57
|
+
!Gem::Specification.find_all_by_name("google-api-client").empty? # newest rubygems
|
56
58
|
else
|
57
|
-
!Gem.source_index.find_name(
|
59
|
+
!Gem.source_index.find_name("google-api-client").empty? # legacy
|
58
60
|
end
|
59
61
|
# Then make sure we have all of the requirements
|
60
62
|
for service in services
|
61
63
|
begin
|
62
|
-
service =
|
64
|
+
service = class_for(service)
|
63
65
|
availability &&= service.requirements.all? { |requirement| Fog.credentials.include?(requirement) }
|
64
66
|
rescue ArgumentError => e
|
65
67
|
Fog::Logger.warning(e.message)
|
@@ -71,9 +73,9 @@ module Google # deviates from other bin stuff to accomodate gem
|
|
71
73
|
|
72
74
|
if availability
|
73
75
|
for service in services
|
74
|
-
for collection in
|
76
|
+
for collection in class_for(service).collections
|
75
77
|
unless self.respond_to?(collection)
|
76
|
-
|
78
|
+
class_eval <<-EOS, __FILE__, __LINE__
|
77
79
|
def self.#{collection}
|
78
80
|
self[:#{service}].#{collection}
|
79
81
|
end
|
@@ -5,15 +5,15 @@ module Fog
|
|
5
5
|
recognizes :app_name, :app_version, :google_client_email, :google_key_location, :google_key_string,
|
6
6
|
:google_client, :google_json_key_location, :google_json_key_string, :google_extra_global_projects
|
7
7
|
|
8
|
-
GOOGLE_COMPUTE_API_VERSION =
|
9
|
-
GOOGLE_COMPUTE_BASE_URL =
|
8
|
+
GOOGLE_COMPUTE_API_VERSION = "v1"
|
9
|
+
GOOGLE_COMPUTE_BASE_URL = "https://www.googleapis.com/compute/"
|
10
10
|
GOOGLE_COMPUTE_API_SCOPE_URLS = %w(https://www.googleapis.com/auth/compute
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
GOOGLE_COMPUTE_DEFAULT_NETWORK =
|
11
|
+
https://www.googleapis.com/auth/devstorage.read_write
|
12
|
+
https://www.googleapis.com/auth/ndev.cloudman
|
13
|
+
https://www.googleapis.com/auth/cloud-platform)
|
14
|
+
GOOGLE_COMPUTE_DEFAULT_NETWORK = "default"
|
15
15
|
|
16
|
-
request_path
|
16
|
+
request_path "fog/compute/google/requests"
|
17
17
|
request :list_servers
|
18
18
|
request :list_aggregated_servers
|
19
19
|
request :list_addresses
|
@@ -41,11 +41,17 @@ module Fog
|
|
41
41
|
request :list_global_forwarding_rules
|
42
42
|
request :list_url_maps
|
43
43
|
request :list_target_http_proxies
|
44
|
+
request :list_zone_views
|
45
|
+
request :list_region_views
|
46
|
+
request :list_region_view_resources
|
47
|
+
request :list_zone_view_resources
|
44
48
|
request :list_target_instances
|
45
49
|
request :list_aggregated_target_instances
|
46
50
|
request :list_instance_groups
|
47
51
|
request :list_aggregated_instance_groups
|
48
52
|
request :list_instance_group_instances
|
53
|
+
request :list_subnetworks
|
54
|
+
request :list_aggregated_subnetworks
|
49
55
|
|
50
56
|
request :get_server
|
51
57
|
request :get_address
|
@@ -72,8 +78,11 @@ module Fog
|
|
72
78
|
request :get_url_map
|
73
79
|
request :get_global_forwarding_rule
|
74
80
|
request :get_target_http_proxy
|
81
|
+
request :get_zone_view
|
82
|
+
request :get_region_view
|
75
83
|
request :get_target_instance
|
76
84
|
request :get_instance_group
|
85
|
+
request :get_subnetwork
|
77
86
|
|
78
87
|
request :delete_address
|
79
88
|
request :delete_disk
|
@@ -93,8 +102,11 @@ module Fog
|
|
93
102
|
request :delete_url_map
|
94
103
|
request :delete_target_http_proxy
|
95
104
|
request :delete_global_forwarding_rule
|
105
|
+
request :delete_zone_view
|
106
|
+
request :delete_region_view
|
96
107
|
request :delete_target_instance
|
97
108
|
request :delete_instance_group
|
109
|
+
request :delete_subnetwork
|
98
110
|
|
99
111
|
request :insert_address
|
100
112
|
request :insert_disk
|
@@ -111,8 +123,11 @@ module Fog
|
|
111
123
|
request :insert_url_map
|
112
124
|
request :insert_target_http_proxy
|
113
125
|
request :insert_global_forwarding_rule
|
126
|
+
request :insert_zone_view
|
127
|
+
request :insert_region_view
|
114
128
|
request :insert_target_instance
|
115
129
|
request :insert_instance_group
|
130
|
+
request :insert_subnetwork
|
116
131
|
|
117
132
|
request :set_metadata
|
118
133
|
request :set_tags
|
@@ -125,6 +140,8 @@ module Fog
|
|
125
140
|
request :add_backend_service_backends
|
126
141
|
request :add_url_map_host_rules
|
127
142
|
request :add_url_map_path_matchers
|
143
|
+
request :add_zone_view_resources
|
144
|
+
request :add_region_view_resources
|
128
145
|
request :add_instance_group_instance
|
129
146
|
|
130
147
|
request :remove_target_pool_instances
|
@@ -145,7 +162,7 @@ module Fog
|
|
145
162
|
request :start_server
|
146
163
|
request :stop_server
|
147
164
|
|
148
|
-
model_path
|
165
|
+
model_path "fog/compute/google/models"
|
149
166
|
model :server
|
150
167
|
collection :servers
|
151
168
|
|
@@ -218,6 +235,9 @@ module Fog
|
|
218
235
|
model :instance_group
|
219
236
|
collection :instance_groups
|
220
237
|
|
238
|
+
model :subnetwork
|
239
|
+
collection :subnetworks
|
240
|
+
|
221
241
|
class Mock
|
222
242
|
include Fog::Google::Shared
|
223
243
|
attr_reader :extra_global_projects
|
@@ -230,7 +250,7 @@ module Fog
|
|
230
250
|
def self.data(api_version)
|
231
251
|
@data ||= Hash.new do |hash, key|
|
232
252
|
case key
|
233
|
-
when
|
253
|
+
when "debian-cloud"
|
234
254
|
hash[key] = {
|
235
255
|
:images => {
|
236
256
|
"debian-6-squeeze-v20130816" => {
|
@@ -292,7 +312,7 @@ module Fog
|
|
292
312
|
}
|
293
313
|
}
|
294
314
|
}
|
295
|
-
when
|
315
|
+
when "centos-cloud"
|
296
316
|
hash[key] = {
|
297
317
|
:images => {
|
298
318
|
"centos-6-v20130813" => {
|
@@ -317,9 +337,9 @@ module Fog
|
|
317
337
|
"test-target-http-proxy" => {
|
318
338
|
"kind" => "compute#targetHttpProxy",
|
319
339
|
"id" => "1361932147851415729",
|
320
|
-
"creationTimestamp" =>
|
340
|
+
"creationTimestamp" => "2014-08-23T10:06:13.951-07:00",
|
321
341
|
"name" => "test-target-http-proxy",
|
322
|
-
"description" =>
|
342
|
+
"description" => "",
|
323
343
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/targetHttpProxies/test-target-http-proxy",
|
324
344
|
"urlMap" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/urlMaps/test-url-map"
|
325
345
|
}
|
@@ -328,9 +348,9 @@ module Fog
|
|
328
348
|
"test-url-map" => {
|
329
349
|
"kind" => "compute#urlMap",
|
330
350
|
"id" => "1361932147851415729",
|
331
|
-
"creationTimestamp" =>
|
332
|
-
"name" =>
|
333
|
-
"description" =>
|
351
|
+
"creationTimestamp" => "2014-08-23T10:06:13.951-07:00",
|
352
|
+
"name" => "test-url-map",
|
353
|
+
"description" => "",
|
334
354
|
"hostRules" => [],
|
335
355
|
"pathMatchers" => [],
|
336
356
|
"tests" => [],
|
@@ -340,27 +360,27 @@ module Fog
|
|
340
360
|
},
|
341
361
|
:target_pools => {
|
342
362
|
"test-target-pool" => {
|
343
|
-
|
363
|
+
"kind" => "compute#targetPool",
|
344
364
|
"id" => "1361932147851415729",
|
345
365
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/us-central1/targetPools/test-target-pool",
|
346
|
-
"creationTimestamp" =>
|
347
|
-
|
366
|
+
"creationTimestamp" => "2014-08-23T10:06:13.951-07:00",
|
367
|
+
"name" => "test-target-pool",
|
348
368
|
"region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/us-central1",
|
349
369
|
"healthChecks" => ["https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/httpHealthChecks/test-check"],
|
350
|
-
"instances" => ["https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/us-central1-a/instances/test-instance"]
|
370
|
+
"instances" => ["https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/us-central1-a/instances/test-instance"]
|
351
371
|
}
|
352
372
|
},
|
353
373
|
|
354
374
|
:http_health_checks => {
|
355
375
|
"test-http-health-check" => {
|
356
376
|
"checkIntervalSec" => 5,
|
357
|
-
"creationTimestamp" =>
|
377
|
+
"creationTimestamp" => "2014-08-23T10:06:13.951-07:00",
|
358
378
|
"healthyThreshold" => 2,
|
359
379
|
"id" => "1361932147851415729",
|
360
380
|
"kind" => "compute#httphealthCheck",
|
361
381
|
"name" => "test-http-health-check",
|
362
382
|
"port" => 80,
|
363
|
-
"requestPath" =>
|
383
|
+
"requestPath" => "/",
|
364
384
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/httpHealthChecks/test-http-health-check",
|
365
385
|
"timeoutSec" => 5,
|
366
386
|
"unhealthyThreshold" => 2
|
@@ -370,11 +390,11 @@ module Fog
|
|
370
390
|
"test-global-forwarding-rule" => {
|
371
391
|
"kind" => "compute#forwardingRule",
|
372
392
|
"id" => "1361932147851415729",
|
373
|
-
"creationTimestamp" =>
|
374
|
-
"name" =>
|
375
|
-
"IPAddress" =>
|
376
|
-
"IPProtocol" =>
|
377
|
-
"portRange" =>
|
393
|
+
"creationTimestamp" => "2014-08-23T10:06:13.951-07:00",
|
394
|
+
"name" => "test-global-forwarding-rule",
|
395
|
+
"IPAddress" => "107.178.255.155",
|
396
|
+
"IPProtocol" => "TCP",
|
397
|
+
"portRange" => "80-80",
|
378
398
|
"target" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/targetHttpProxies/proxy",
|
379
399
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/forwardngRules/test-global-forwarding-rule"
|
380
400
|
}
|
@@ -383,11 +403,11 @@ module Fog
|
|
383
403
|
"test-forwarding-rule" => {
|
384
404
|
"kind" => "compute#forwardingRule",
|
385
405
|
"id" => "1361932147851415729",
|
386
|
-
"creationTimestamp" =>
|
387
|
-
"name" =>
|
388
|
-
"IPAddress" =>
|
389
|
-
"IPProtocol" =>
|
390
|
-
"portRange" =>
|
406
|
+
"creationTimestamp" => "2014-08-23T10:06:13.951-07:00",
|
407
|
+
"name" => "test-forwarding-rule",
|
408
|
+
"IPAddress" => "107.178.255.155",
|
409
|
+
"IPProtocol" => "TCP",
|
410
|
+
"portRange" => "80-80",
|
391
411
|
"target" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/us-central1/targetPools/target_pool",
|
392
412
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/us-central1/forwardngRules/test-forwarding-rule",
|
393
413
|
"region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/us-central1"
|
@@ -402,25 +422,25 @@ module Fog
|
|
402
422
|
"instance" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/us-central1-a/instances/test-instance",
|
403
423
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/us-central1-a/targetInstances/test-target-instance",
|
404
424
|
"id" => "1361932147851415729",
|
405
|
-
"creationTimestamp" =>
|
425
|
+
"creationTimestamp" => "2014-08-23T10:06:13.951-07:00"
|
406
426
|
|
407
427
|
}
|
408
428
|
},
|
409
|
-
:backend_services =>{
|
429
|
+
:backend_services => {
|
410
430
|
"test-backend-service" => {
|
411
431
|
"kind" => "compute#backend_service",
|
412
432
|
"id" => "1361932147851415729",
|
413
|
-
"creationTimestamp" =>
|
433
|
+
"creationTimestamp" => "2014-08-23T10:06:13.951-07:00",
|
414
434
|
"name" => "test-backend-service",
|
415
|
-
"description" =>
|
435
|
+
"description" => "",
|
416
436
|
"backends" => [
|
417
|
-
|
418
|
-
|
419
|
-
|
420
|
-
|
421
|
-
|
422
|
-
|
423
|
-
|
437
|
+
{
|
438
|
+
"description" => "",
|
439
|
+
"group" => "https://www.googleapis.com/resourceviews/v1beta1/projects#{@project}/zones/us-central1-a/zoneViews/name",
|
440
|
+
"balancingMode" => "RATE",
|
441
|
+
"capacityScaler" => 1.1,
|
442
|
+
"maxRate" => 0.5
|
443
|
+
}],
|
424
444
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/backendServices/test-backend-service"
|
425
445
|
}
|
426
446
|
},
|
@@ -492,10 +512,10 @@ module Fog
|
|
492
512
|
}
|
493
513
|
],
|
494
514
|
"quotas" => [
|
495
|
-
{"metric" => "INSTANCES", "limit" => 16.0, "usage" => 0.0},
|
496
|
-
{"metric" => "CPUS", "limit" => 24.0, "usage" => 0.0},
|
497
|
-
{"metric" => "DISKS", "limit" => 16.0, "usage" => 0.0},
|
498
|
-
{"metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0}
|
515
|
+
{ "metric" => "INSTANCES", "limit" => 16.0, "usage" => 0.0 },
|
516
|
+
{ "metric" => "CPUS", "limit" => 24.0, "usage" => 0.0 },
|
517
|
+
{ "metric" => "DISKS", "limit" => 16.0, "usage" => 0.0 },
|
518
|
+
{ "metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0 }
|
499
519
|
],
|
500
520
|
"region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/europe-west1"
|
501
521
|
},
|
@@ -509,10 +529,10 @@ module Fog
|
|
509
529
|
"status" => "UP",
|
510
530
|
"maintenanceWindows" => nil,
|
511
531
|
"quotas" => [
|
512
|
-
{"metric" => "INSTANCES", "limit" => 16.0, "usage" => 1.0},
|
513
|
-
{"metric" => "CPUS", "limit" => 24.0, "usage" => 1.0},
|
514
|
-
{"metric" => "DISKS", "limit" => 16.0, "usage" => 0.0},
|
515
|
-
{"metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0}
|
532
|
+
{ "metric" => "INSTANCES", "limit" => 16.0, "usage" => 1.0 },
|
533
|
+
{ "metric" => "CPUS", "limit" => 24.0, "usage" => 1.0 },
|
534
|
+
{ "metric" => "DISKS", "limit" => 16.0, "usage" => 0.0 },
|
535
|
+
{ "metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0 }
|
516
536
|
],
|
517
537
|
"region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/us-central1"
|
518
538
|
},
|
@@ -524,15 +544,15 @@ module Fog
|
|
524
544
|
"name" => "us-central1-b",
|
525
545
|
"description" => "us-central1-b",
|
526
546
|
"status" => "UP",
|
527
|
-
"maintenanceWindows" => [{"name" => "2013-10-26-planned-outage",
|
528
|
-
|
529
|
-
|
530
|
-
|
547
|
+
"maintenanceWindows" => [{ "name" => "2013-10-26-planned-outage",
|
548
|
+
"description" => "maintenance zone",
|
549
|
+
"beginTime" => "2013-10-26T12:00:00.000-07:00",
|
550
|
+
"endTime" => "2013-11-10T12:00:00.000-08:00" }],
|
531
551
|
"quotas" => [
|
532
|
-
{"metric" => "INSTANCES", "limit" => 16.0, "usage" => 0.0},
|
533
|
-
{"metric" => "CPUS", "limit" => 24.0, "usage" => 0.0},
|
534
|
-
{"metric" => "DISKS", "limit" => 16.0, "usage" => 0.0},
|
535
|
-
{"metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0}
|
552
|
+
{ "metric" => "INSTANCES", "limit" => 16.0, "usage" => 0.0 },
|
553
|
+
{ "metric" => "CPUS", "limit" => 24.0, "usage" => 0.0 },
|
554
|
+
{ "metric" => "DISKS", "limit" => 16.0, "usage" => 0.0 },
|
555
|
+
{ "metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0 }
|
536
556
|
],
|
537
557
|
"region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/us-central1"
|
538
558
|
},
|
@@ -553,75 +573,75 @@ module Fog
|
|
553
573
|
}
|
554
574
|
],
|
555
575
|
"quotas" => [
|
556
|
-
{"metric" => "INSTANCES", "limit" => 16.0, "usage" => 0.0},
|
557
|
-
{"metric" => "CPUS", "limit" => 24.0, "usage" => 0.0},
|
558
|
-
{"metric" => "DISKS", "limit" => 16.0, "usage" => 0.0},
|
559
|
-
{"metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0}
|
576
|
+
{ "metric" => "INSTANCES", "limit" => 16.0, "usage" => 0.0 },
|
577
|
+
{ "metric" => "CPUS", "limit" => 24.0, "usage" => 0.0 },
|
578
|
+
{ "metric" => "DISKS", "limit" => 16.0, "usage" => 0.0 },
|
579
|
+
{ "metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0 }
|
560
580
|
],
|
561
581
|
"region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/us-central2"
|
562
582
|
}
|
563
583
|
},
|
564
584
|
:regions => {
|
565
585
|
"us-central1" => {
|
566
|
-
"creationTimestamp" =>
|
567
|
-
"description" =>
|
568
|
-
"id" =>
|
586
|
+
"creationTimestamp" => "2014-01-21T10:30:54.895-08:00",
|
587
|
+
"description" => "us-central1",
|
588
|
+
"id" => "18201118976141502843",
|
569
589
|
"kind" => "compute#region",
|
570
|
-
"name" =>"us-central1",
|
590
|
+
"name" => "us-central1",
|
571
591
|
"quotas" => [
|
572
|
-
{"metric" =>"CPUS", "limit" => 1050.0, "usage" => 28.0},
|
573
|
-
{"metric" =>"DISKS_TOTAL_GB", "limit" =>
|
574
|
-
{"metric" =>"STATIC_ADDRESSES", "limit" => 10.0, "usage" => 0.0},
|
575
|
-
{"metric" =>"IN_USE_ADDRESSES", "limit" => 1050.0, "usage" => 30.0},
|
576
|
-
{"metric" =>"SSD_TOTAL_GB", "limit" => 1024.0, "usage" => 0.0}
|
592
|
+
{ "metric" => "CPUS", "limit" => 1050.0, "usage" => 28.0 },
|
593
|
+
{ "metric" => "DISKS_TOTAL_GB", "limit" => 10_000.0, "usage" => 292.0 },
|
594
|
+
{ "metric" => "STATIC_ADDRESSES", "limit" => 10.0, "usage" => 0.0 },
|
595
|
+
{ "metric" => "IN_USE_ADDRESSES", "limit" => 1050.0, "usage" => 30.0 },
|
596
|
+
{ "metric" => "SSD_TOTAL_GB", "limit" => 1024.0, "usage" => 0.0 }
|
577
597
|
],
|
578
598
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/us-central1",
|
579
599
|
"status" => "UP",
|
580
|
-
"zones" => [
|
600
|
+
"zones" => [
|
581
601
|
"https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a",
|
582
602
|
"https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-b",
|
583
|
-
"https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-f"
|
603
|
+
"https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-f"
|
584
604
|
]
|
585
605
|
},
|
586
606
|
"europe-west1" => {
|
587
|
-
"creationTimestamp" =>
|
588
|
-
"description" =>
|
589
|
-
"id" =>
|
607
|
+
"creationTimestamp" => "2014-01-21T10:30:54.891-08:00",
|
608
|
+
"description" => "europe-west1",
|
609
|
+
"id" => "18201118976141502843",
|
590
610
|
"kind" => "compute#region",
|
591
|
-
"name" =>"europe-west1",
|
611
|
+
"name" => "europe-west1",
|
592
612
|
"quotas" => [
|
593
|
-
{"metric" =>"CPUS", "limit" => 24.0, "usage" => 0.0},
|
594
|
-
{"metric" =>"DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0},
|
595
|
-
{"metric" =>"STATIC_ADDRESSES", "limit" => 7.0, "usage" => 0.0},
|
596
|
-
{"metric" =>"IN_USE_ADDRESSES", "limit" => 23.0, "usage" => 0.0},
|
597
|
-
{"metric" =>"SSD_TOTAL_GB", "limit" => 1024.0, "usage" => 0.0}
|
613
|
+
{ "metric" => "CPUS", "limit" => 24.0, "usage" => 0.0 },
|
614
|
+
{ "metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0 },
|
615
|
+
{ "metric" => "STATIC_ADDRESSES", "limit" => 7.0, "usage" => 0.0 },
|
616
|
+
{ "metric" => "IN_USE_ADDRESSES", "limit" => 23.0, "usage" => 0.0 },
|
617
|
+
{ "metric" => "SSD_TOTAL_GB", "limit" => 1024.0, "usage" => 0.0 }
|
598
618
|
],
|
599
619
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/erope-west1",
|
600
620
|
"status" => "UP",
|
601
|
-
"zones" => [
|
621
|
+
"zones" => [
|
602
622
|
"https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/europe-west1-a",
|
603
|
-
"https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/europe-west1-b"
|
623
|
+
"https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/europe-west1-b"
|
604
624
|
]
|
605
625
|
},
|
606
626
|
"asia-east1" => {
|
607
|
-
"creationTimestamp" =>
|
608
|
-
"description" =>
|
609
|
-
"id" =>
|
627
|
+
"creationTimestamp" => "2014-01-21T10:30:54.895-08:00",
|
628
|
+
"description" => "asia-east1",
|
629
|
+
"id" => "18201118976141502843",
|
610
630
|
"kind" => "compute#region",
|
611
|
-
"name" =>"asia-east1",
|
631
|
+
"name" => "asia-east1",
|
612
632
|
"quotas" => [
|
613
|
-
{"metric" =>"CPUS", "limit" => 1050.0, "usage" => 28.0},
|
614
|
-
{"metric" =>"DISKS_TOTAL_GB", "limit" =>
|
615
|
-
{"metric" =>"STATIC_ADDRESSES", "limit" => 10.0, "usage" => 0.0},
|
616
|
-
{"metric" =>"IN_USE_ADDRESSES", "limit" => 1050.0, "usage" => 30.0},
|
617
|
-
{"metric" =>"SSD_TOTAL_GB", "limit" => 1024.0, "usage" => 0.0}
|
633
|
+
{ "metric" => "CPUS", "limit" => 1050.0, "usage" => 28.0 },
|
634
|
+
{ "metric" => "DISKS_TOTAL_GB", "limit" => 10_000.0, "usage" => 292.0 },
|
635
|
+
{ "metric" => "STATIC_ADDRESSES", "limit" => 10.0, "usage" => 0.0 },
|
636
|
+
{ "metric" => "IN_USE_ADDRESSES", "limit" => 1050.0, "usage" => 30.0 },
|
637
|
+
{ "metric" => "SSD_TOTAL_GB", "limit" => 1024.0, "usage" => 0.0 }
|
618
638
|
],
|
619
639
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/asia-east1",
|
620
640
|
"status" => "UP",
|
621
|
-
"zones" => [
|
641
|
+
"zones" => [
|
622
642
|
"https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/asia-east1-a",
|
623
643
|
"https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/asia-east1-b",
|
624
|
-
"https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/asia-east1-c"
|
644
|
+
"https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/asia-east1-c"
|
625
645
|
]
|
626
646
|
}
|
627
647
|
},
|
@@ -680,9 +700,9 @@ module Fog
|
|
680
700
|
"memoryMb" => 1843,
|
681
701
|
"imageSpaceGb" => 10,
|
682
702
|
"scratchDisks" => [
|
683
|
-
|
684
|
-
|
685
|
-
|
703
|
+
{
|
704
|
+
"diskGb" => 870
|
705
|
+
}
|
686
706
|
],
|
687
707
|
"maximumPersistentDisks" => 16,
|
688
708
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -713,9 +733,9 @@ module Fog
|
|
713
733
|
"memoryMb" => 3686,
|
714
734
|
"imageSpaceGb" => 10,
|
715
735
|
"scratchDisks" => [
|
716
|
-
|
717
|
-
|
718
|
-
|
736
|
+
{
|
737
|
+
"diskGb" => 1770
|
738
|
+
}
|
719
739
|
],
|
720
740
|
"maximumPersistentDisks" => 16,
|
721
741
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -746,12 +766,12 @@ module Fog
|
|
746
766
|
"memoryMb" => 7373,
|
747
767
|
"imageSpaceGb" => 10,
|
748
768
|
"scratchDisks" => [
|
749
|
-
|
750
|
-
|
751
|
-
|
752
|
-
|
753
|
-
|
754
|
-
|
769
|
+
{
|
770
|
+
"diskGb" => 1770
|
771
|
+
},
|
772
|
+
{
|
773
|
+
"diskGb" => 1770
|
774
|
+
}
|
755
775
|
],
|
756
776
|
"maximumPersistentDisks" => 16,
|
757
777
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -765,7 +785,7 @@ module Fog
|
|
765
785
|
"name" => "n1-highmem-2",
|
766
786
|
"description" => "2 vCPUs, 13 GB RAM",
|
767
787
|
"guestCpus" => 2,
|
768
|
-
"memoryMb" =>
|
788
|
+
"memoryMb" => 13_312,
|
769
789
|
"imageSpaceGb" => 10,
|
770
790
|
"maximumPersistentDisks" => 16,
|
771
791
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -779,12 +799,12 @@ module Fog
|
|
779
799
|
"name" => "n1-highmem-2-d",
|
780
800
|
"description" => "2 vCPUs, 13 GB RAM, 1 scratch disk (870 GB)",
|
781
801
|
"guestCpus" => 2,
|
782
|
-
"memoryMb" =>
|
802
|
+
"memoryMb" => 13_312,
|
783
803
|
"imageSpaceGb" => 10,
|
784
804
|
"scratchDisks" => [
|
785
|
-
|
786
|
-
|
787
|
-
|
805
|
+
{
|
806
|
+
"diskGb" => 870
|
807
|
+
}
|
788
808
|
],
|
789
809
|
"maximumPersistentDisks" => 16,
|
790
810
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -798,7 +818,7 @@ module Fog
|
|
798
818
|
"name" => "n1-highmem-4",
|
799
819
|
"description" => "4 vCPUs, 26 GB RAM",
|
800
820
|
"guestCpus" => 4,
|
801
|
-
"memoryMb" =>
|
821
|
+
"memoryMb" => 26_624,
|
802
822
|
"imageSpaceGb" => 10,
|
803
823
|
"maximumPersistentDisks" => 16,
|
804
824
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -812,12 +832,12 @@ module Fog
|
|
812
832
|
"name" => "n1-highmem-4-d",
|
813
833
|
"description" => "4 vCPUs, 26 GB RAM, 1 scratch disk (1770 GB)",
|
814
834
|
"guestCpus" => 4,
|
815
|
-
"memoryMb" =>
|
835
|
+
"memoryMb" => 26_624,
|
816
836
|
"imageSpaceGb" => 10,
|
817
837
|
"scratchDisks" => [
|
818
|
-
|
819
|
-
|
820
|
-
|
838
|
+
{
|
839
|
+
"diskGb" => 1770
|
840
|
+
}
|
821
841
|
],
|
822
842
|
"maximumPersistentDisks" => 16,
|
823
843
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -831,7 +851,7 @@ module Fog
|
|
831
851
|
"name" => "n1-highmem-8",
|
832
852
|
"description" => "8 vCPUs, 52 GB RAM",
|
833
853
|
"guestCpus" => 8,
|
834
|
-
"memoryMb" =>
|
854
|
+
"memoryMb" => 53_248,
|
835
855
|
"imageSpaceGb" => 10,
|
836
856
|
"maximumPersistentDisks" => 16,
|
837
857
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -845,15 +865,15 @@ module Fog
|
|
845
865
|
"name" => "n1-highmem-8-d",
|
846
866
|
"description" => "8 vCPUs, 52 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
|
847
867
|
"guestCpus" => 8,
|
848
|
-
"memoryMb" =>
|
868
|
+
"memoryMb" => 53_248,
|
849
869
|
"imageSpaceGb" => 10,
|
850
870
|
"scratchDisks" => [
|
851
|
-
|
852
|
-
|
853
|
-
|
854
|
-
|
855
|
-
|
856
|
-
|
871
|
+
{
|
872
|
+
"diskGb" => 1770
|
873
|
+
},
|
874
|
+
{
|
875
|
+
"diskGb" => 1770
|
876
|
+
}
|
857
877
|
],
|
858
878
|
"maximumPersistentDisks" => 16,
|
859
879
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -884,9 +904,9 @@ module Fog
|
|
884
904
|
"memoryMb" => 3840,
|
885
905
|
"imageSpaceGb" => 10,
|
886
906
|
"scratchDisks" => [
|
887
|
-
|
888
|
-
|
889
|
-
|
907
|
+
{
|
908
|
+
"diskGb" => 420
|
909
|
+
}
|
890
910
|
],
|
891
911
|
"maximumPersistentDisks" => 16,
|
892
912
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -917,9 +937,9 @@ module Fog
|
|
917
937
|
"memoryMb" => 7680,
|
918
938
|
"imageSpaceGb" => 10,
|
919
939
|
"scratchDisks" => [
|
920
|
-
|
921
|
-
|
922
|
-
|
940
|
+
{
|
941
|
+
"diskGb" => 870
|
942
|
+
}
|
923
943
|
],
|
924
944
|
"maximumPersistentDisks" => 16,
|
925
945
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -933,7 +953,7 @@ module Fog
|
|
933
953
|
"name" => "n1-standard-4",
|
934
954
|
"description" => "4 vCPUs, 15 GB RAM",
|
935
955
|
"guestCpus" => 4,
|
936
|
-
"memoryMb" =>
|
956
|
+
"memoryMb" => 15_360,
|
937
957
|
"imageSpaceGb" => 10,
|
938
958
|
"maximumPersistentDisks" => 16,
|
939
959
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -947,12 +967,12 @@ module Fog
|
|
947
967
|
"name" => "n1-standard-4-d",
|
948
968
|
"description" => "4 vCPUs, 15 GB RAM, 1 scratch disk (1770 GB)",
|
949
969
|
"guestCpus" => 4,
|
950
|
-
"memoryMb" =>
|
970
|
+
"memoryMb" => 15_360,
|
951
971
|
"imageSpaceGb" => 10,
|
952
972
|
"scratchDisks" => [
|
953
|
-
|
954
|
-
|
955
|
-
|
973
|
+
{
|
974
|
+
"diskGb" => 1770
|
975
|
+
}
|
956
976
|
],
|
957
977
|
"maximumPersistentDisks" => 16,
|
958
978
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -966,7 +986,7 @@ module Fog
|
|
966
986
|
"name" => "n1-standard-8",
|
967
987
|
"description" => "8 vCPUs, 30 GB RAM",
|
968
988
|
"guestCpus" => 8,
|
969
|
-
"memoryMb" =>
|
989
|
+
"memoryMb" => 30_720,
|
970
990
|
"imageSpaceGb" => 10,
|
971
991
|
"maximumPersistentDisks" => 16,
|
972
992
|
"maximumPersistentDisksSizeGb" => "10240",
|
@@ -980,21 +1000,21 @@ module Fog
|
|
980
1000
|
"name" => "n1-standard-8-d",
|
981
1001
|
"description" => "8 vCPUs, 30 GB RAM, 2 scratch disks (1770 GB, 1770 GB)",
|
982
1002
|
"guestCpus" => 8,
|
983
|
-
"memoryMb" =>
|
1003
|
+
"memoryMb" => 30_720,
|
984
1004
|
"imageSpaceGb" => 10,
|
985
1005
|
"scratchDisks" => [
|
986
|
-
|
987
|
-
|
988
|
-
|
989
|
-
|
990
|
-
|
991
|
-
|
1006
|
+
{
|
1007
|
+
"diskGb" => 1770
|
1008
|
+
},
|
1009
|
+
{
|
1010
|
+
"diskGb" => 1770
|
1011
|
+
}
|
992
1012
|
],
|
993
1013
|
"maximumPersistentDisks" => 16,
|
994
1014
|
"maximumPersistentDisksSizeGb" => "10240",
|
995
1015
|
"zone" => zone,
|
996
1016
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-8-d"
|
997
|
-
|
1017
|
+
}
|
998
1018
|
}
|
999
1019
|
end,
|
1000
1020
|
:images => {},
|
@@ -1010,7 +1030,7 @@ module Fog
|
|
1010
1030
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/disks/fog-1",
|
1011
1031
|
"sourceImage" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-7-wheezy-v20131120",
|
1012
1032
|
"sourceImageId" => "17312518942796567788",
|
1013
|
-
"type" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/diskTypes/pd-standard"
|
1033
|
+
"type" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/diskTypes/pd-standard"
|
1014
1034
|
},
|
1015
1035
|
"fog-2" => {
|
1016
1036
|
"kind" => "compute#disk",
|
@@ -1021,9 +1041,44 @@ module Fog
|
|
1021
1041
|
"name" => "fog-2",
|
1022
1042
|
"sizeGb" => "10",
|
1023
1043
|
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/disks/fog-1",
|
1024
|
-
"type" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/diskTypes/pd-ssd"
|
1044
|
+
"type" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/diskTypes/pd-ssd"
|
1025
1045
|
}
|
1026
1046
|
},
|
1047
|
+
:subnetworks => {
|
1048
|
+
"fog-1" => {
|
1049
|
+
"kind" => "compute#subnetwork",
|
1050
|
+
"id" => "6680781458098159920",
|
1051
|
+
"creationTimestamp" => "2016-03-19T19:13:51.613-07:00",
|
1052
|
+
"gatewayAddress" => "10.1.0.1",
|
1053
|
+
"name" => "fog-1",
|
1054
|
+
"network" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/global/networks/fog-example",
|
1055
|
+
"ipCidrRange" => "10.1.0.0/20",
|
1056
|
+
"region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/us-central1",
|
1057
|
+
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/us-central1/subnetworks/fog-1"
|
1058
|
+
},
|
1059
|
+
"fog-2" => {
|
1060
|
+
"kind" => "compute#subnetwork",
|
1061
|
+
"id" => "6680781458098159921",
|
1062
|
+
"creationTimestamp" => "2016-03-19T19:13:51.613-07:00",
|
1063
|
+
"gatewayAddress" => "10.1.16.1",
|
1064
|
+
"name" => "fog-2",
|
1065
|
+
"network" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/global/networks/fog-example",
|
1066
|
+
"ipCidrRange" => "10.1.16.0/20",
|
1067
|
+
"region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/europe-west1",
|
1068
|
+
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/europe-west1/subnetworks/fog-2"
|
1069
|
+
},
|
1070
|
+
"fog-3" => {
|
1071
|
+
"kind" => "compute#subnetwork",
|
1072
|
+
"id" => "6680781458098159923",
|
1073
|
+
"creationTimestamp" => "2016-03-19T19:13:51.613-07:00",
|
1074
|
+
"gatewayAddress" => "192.168.20.1",
|
1075
|
+
"name" => "fog-3",
|
1076
|
+
"network" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/global/networks/fog-elsewhere-example",
|
1077
|
+
"ipCidrRange" => "192.168.20.0/20",
|
1078
|
+
"region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/us-central1",
|
1079
|
+
"selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/us-central1/subnetworks/fog-3"
|
1080
|
+
},
|
1081
|
+
},
|
1027
1082
|
:operations => {}
|
1028
1083
|
}
|
1029
1084
|
end
|
@@ -1034,7 +1089,7 @@ module Fog
|
|
1034
1089
|
@data = nil
|
1035
1090
|
end
|
1036
1091
|
|
1037
|
-
def data(project
|
1092
|
+
def data(project = @project)
|
1038
1093
|
self.class.data(api_version)[project]
|
1039
1094
|
end
|
1040
1095
|
|
@@ -1056,15 +1111,16 @@ module Fog
|
|
1056
1111
|
|
1057
1112
|
def initialize(options)
|
1058
1113
|
shared_initialize(options[:google_project], GOOGLE_COMPUTE_API_VERSION, GOOGLE_COMPUTE_BASE_URL)
|
1059
|
-
options.merge!(:google_api_scope_url => GOOGLE_COMPUTE_API_SCOPE_URLS.join(
|
1114
|
+
options.merge!(:google_api_scope_url => GOOGLE_COMPUTE_API_SCOPE_URLS.join(" "))
|
1060
1115
|
|
1061
1116
|
@client = initialize_google_client(options)
|
1062
|
-
@compute = @client.discovered_api(
|
1117
|
+
@compute = @client.discovered_api("compute", api_version)
|
1118
|
+
@resourceviews = @client.discovered_api("resourceviews", "v1beta1")
|
1063
1119
|
@extra_global_projects = options[:google_extra_global_projects] || []
|
1064
1120
|
end
|
1065
1121
|
end
|
1066
1122
|
|
1067
|
-
RUNNING =
|
1123
|
+
RUNNING = "RUNNING"
|
1068
1124
|
end
|
1069
1125
|
end
|
1070
1126
|
end
|