fog-google 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b27707eb484f217aad6c9cc51dcbfeb831ed9fcd
-  data.tar.gz: af62778fe526e0d2b52e78b77cc7551e1a7357cf
+  metadata.gz: 8a4aac1948c7ed0d3f7248b351c6140f9a08b3de
+  data.tar.gz: 4db3c146ba5402041ce46aac9b72504977b9a361
 SHA512:
-  metadata.gz: 4efa40522165a909fe905fdf7c3a3026e07744b4b006c2ac7d07e7c32eec32f3b3db2fd86c621a15ac814ec5d3656e8e3ea70fbb391a2bf371c6c5e81dc0a1e4
-  data.tar.gz: 8eab5d7ca82a571d9622ec7ff24821bb1c6bb4e5fd8d5dcb6fb44c6540afad9a400ddf8c50ca522bc7fc89b03c186077d8aa6f3db3af60de5b4c3de25d28fecc
+  metadata.gz: 079ccb37684b05947be1e6c8637d2955484202744e2ad43d72890e1edeec3e70e386238271cfc003bd000b829f0ff42d03e4fdf74380fb7ff21a79361c685b40
+  data.tar.gz: f41c1a0bbcee5788678ff0610f1dc886af968a7508c9a76cf48cbbcfb01d9e6cf15c413becebec2d4e1c022b5eb06f2b88ec64b7a0d0e25021c827ecde0a71e3

data/examples/get_list_snapshots.rb

@@ -16,7 +16,7 @@ def test
   puts snapshots.inspect
 
   puts "Fetching a single snapshot..."
-  puts "------------------------------------------------"
+  puts "---------------------------------"
   snap = snapshots.first
   unless snap.nil?
     snap = connection.snapshots.get(snap)

data/examples/load-balance.rb

@@ -1,21 +1,30 @@
+# All examples presume that you have a ~/.fog credentials file set up.
+# More info on it can be found here: http://fog.io/about/getting_started.html
+
+require "bundler"
+Bundler.require(:default, :development)
+# Uncomment this if you want to make real requests to GCE (you _will_ be billed!)
+# WebMock.disable!
 
 def test
   # Config
   name = "fog-lb-test-#{Time.now.to_i}"
-  zone = "us-central1-b"
-  region = "us-central1"
+  zone = "europe-west1-d"
+  region = "europe-west1"
 
   # Setup
   gce = Fog::Compute.new :provider => "Google"
   servers = []
 
+  puts "Creating instances..."
+  puts "--------------------------------"
   (1..3).each do |i|
     begin
       disk = gce.disks.create(
         :name => "#{name}-#{i}",
         :size_gb => 10,
         :zone_name => zone,
-        :source_image => "debian-7-wheezy-v20131120"
+        :source_image => "debian-8-jessie-v20160718"
       )
       disk.wait_for { disk.ready? }
     rescue
@@ -35,6 +44,8 @@ def test
     end
   end
 
+  puts "Creating health checks..."
+  puts "--------------------------------"
   begin
     health = gce.http_health_checks.new(:name => name)
     health.save
@@ -42,11 +53,13 @@ def test
     puts "Failed to create health check #{name}"
   end
 
+  puts "Creating a target pool..."
+  puts "--------------------------------"
   begin
     pool = gce.target_pools.new(
       :name => name,
       :region => region,
-      :health_checks => health.self_link,
+      :health_checks => [health.self_link],
       :instances => servers.map(&:self_link)
     )
     pool.save
@@ -54,6 +67,8 @@ def test
     puts "Failed to create target pool #{name}"
   end
 
+  puts "Creating forwarding rules..."
+  puts "--------------------------------"
   begin
     rule = gce.forwarding_rules.new(
       :name => name,
@@ -71,6 +86,8 @@ def test
   #                actual requests through the load balancer.
 
   # Cleanup
+  puts "Cleaning up..."
+  puts "--------------------------------"
   begin
     rule.destroy
   rescue
@@ -95,3 +112,5 @@ def test
     puts "Failed to clean up instances."
   end
 end
+
+test

data/fog-google.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fog-xml"
 
   # TODO: Upgrade to 0.9, which is not compatible.
-  spec.add_development_dependency "google-api-client", "~> 0.8.6"
+  spec.add_development_dependency "google-api-client", "~> 0.8.7"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "shindo"
   spec.add_development_dependency "minitest"

data/lib/fog/compute/google.rb

@@ -18,153 +18,154 @@ module Fog
       RUNNING = "RUNNING".freeze
 
       request_path "fog/compute/google/requests"
-      request :list_servers
-      request :list_aggregated_servers
-      request :list_addresses
-      request :list_aggregated_addresses
-      request :list_disks
-      request :list_aggregated_disks
-      request :list_disk_types
-      request :list_aggregated_disk_types
-      request :list_firewalls
-      request :list_images
-      request :list_machine_types
-      request :list_aggregated_machine_types
-      request :list_networks
-      request :list_zones
-      request :list_regions
-      request :list_global_operations
-      request :list_region_operations
-      request :list_zone_operations
-      request :list_snapshots
-      request :list_http_health_checks
-      request :list_target_pools
-      request :list_forwarding_rules
-      request :list_routes
-      request :list_backend_services
-      request :list_global_forwarding_rules
-      request :list_url_maps
-      request :list_target_http_proxies
-      request :list_zone_views
-      request :list_region_views
-      request :list_region_view_resources
-      request :list_zone_view_resources
-      request :list_target_instances
-      request :list_aggregated_target_instances
-      request :list_instance_groups
-      request :list_aggregated_instance_groups
-      request :list_instance_group_instances
-      request :list_subnetworks
-      request :list_aggregated_subnetworks
+      request :add_backend_service_backends
+      request :add_instance_group_instances
+      request :add_region_view_resources
+      request :add_server_access_config
+      request :add_target_pool_health_checks
+      request :add_target_pool_instances
+      request :add_url_map_host_rules
+      request :add_url_map_path_matchers
+      request :add_zone_view_resources
+
+      request :delete_address
+      request :delete_backend_service
+      request :delete_disk
+      request :delete_firewall
+      request :delete_forwarding_rule
+      request :delete_global_forwarding_rule
+      request :delete_global_operation
+      request :delete_http_health_check
+      request :delete_image
+      request :delete_instance_group
+      request :delete_network
+      request :delete_region_operation
+      request :delete_region_view
+      request :delete_route
+      request :delete_server
+      request :delete_server_access_config
+      request :delete_snapshot
+      request :delete_subnetwork
+      request :delete_target_http_proxy
+      request :delete_target_instance
+      request :delete_target_pool
+      request :delete_url_map
+      request :delete_zone_operation
+      request :delete_zone_view
 
-      request :get_server
       request :get_address
+      request :get_backend_service
+      request :get_backend_service_health
       request :get_disk
       request :get_disk_type
       request :get_firewall
+      request :get_forwarding_rule
+      request :get_global_forwarding_rule
+      request :get_global_operation
+      request :get_http_health_check
       request :get_image
+      request :get_image_from_family
+      request :get_instance_group
       request :get_machine_type
       request :get_network
-      request :get_zone
+      request :get_project
       request :get_region
-      request :get_snapshot
-      request :get_global_operation
       request :get_region_operation
-      request :get_zone_operation
-      request :get_http_health_check
+      request :get_region_view
+      request :get_route
+      request :get_server
+      request :get_server_serial_port_output
+      request :get_snapshot
+      request :get_subnetwork
+      request :get_target_http_proxy
+      request :get_target_instance
       request :get_target_pool
       request :get_target_pool_health
-      request :get_forwarding_rule
-      request :get_project
-      request :get_route
-      request :get_backend_service
-      request :get_backend_service_health
       request :get_url_map
-      request :get_global_forwarding_rule
-      request :get_target_http_proxy
+      request :get_zone
+      request :get_zone_operation
       request :get_zone_view
-      request :get_region_view
-      request :get_target_instance
-      request :get_instance_group
-      request :get_subnetwork
-
-      request :delete_address
-      request :delete_disk
-      request :delete_snapshot
-      request :delete_firewall
-      request :delete_image
-      request :delete_network
-      request :delete_server
-      request :delete_global_operation
-      request :delete_region_operation
-      request :delete_zone_operation
-      request :delete_http_health_check
-      request :delete_target_pool
-      request :delete_forwarding_rule
-      request :delete_route
-      request :delete_backend_service
-      request :delete_url_map
-      request :delete_target_http_proxy
-      request :delete_global_forwarding_rule
-      request :delete_zone_view
-      request :delete_region_view
-      request :delete_target_instance
-      request :delete_instance_group
-      request :delete_subnetwork
 
       request :insert_address
+      request :insert_backend_service
       request :insert_disk
       request :insert_firewall
+      request :insert_forwarding_rule
+      request :insert_global_forwarding_rule
+      request :insert_http_health_check
       request :insert_image
+      request :insert_instance_group
       request :insert_network
+      request :insert_region_view
+      request :insert_route
       request :insert_server
       request :insert_snapshot
-      request :insert_http_health_check
+      request :insert_subnetwork
+      request :insert_target_http_proxy
+      request :insert_target_instance
       request :insert_target_pool
-      request :insert_forwarding_rule
-      request :insert_route
-      request :insert_backend_service
       request :insert_url_map
-      request :insert_target_http_proxy
-      request :insert_global_forwarding_rule
       request :insert_zone_view
-      request :insert_region_view
-      request :insert_target_instance
-      request :insert_instance_group
-      request :insert_subnetwork
 
-      request :set_metadata
-      request :set_tags
-      request :set_forwarding_rule_target
-      request :set_global_forwarding_rule_target
-      request :set_target_http_proxy_url_map
-
-      request :add_target_pool_instances
-      request :add_target_pool_health_checks
-      request :add_backend_service_backends
-      request :add_url_map_host_rules
-      request :add_url_map_path_matchers
-      request :add_zone_view_resources
-      request :add_region_view_resources
-      request :add_instance_group_instance
+      request :list_addresses
+      request :list_aggregated_addresses
+      request :list_aggregated_disk_types
+      request :list_aggregated_disks
+      request :list_aggregated_instance_groups
+      request :list_aggregated_machine_types
+      request :list_aggregated_servers
+      request :list_aggregated_subnetworks
+      request :list_aggregated_target_instances
+      request :list_backend_services
+      request :list_disk_types
+      request :list_disks
+      request :list_firewalls
+      request :list_forwarding_rules
+      request :list_global_forwarding_rules
+      request :list_global_operations
+      request :list_http_health_checks
+      request :list_images
+      request :list_instance_group_instances
+      request :list_instance_groups
+      request :list_machine_types
+      request :list_networks
+      request :list_region_operations
+      request :list_region_view_resources
+      request :list_region_views
+      request :list_regions
+      request :list_routes
+      request :list_servers
+      request :list_snapshots
+      request :list_subnetworks
+      request :list_target_http_proxies
+      request :list_target_instances
+      request :list_target_pools
+      request :list_url_maps
+      request :list_zone_operations
+      request :list_zone_view_resources
+      request :list_zone_views
+      request :list_zones
 
-      request :remove_target_pool_instances
+      request :remove_instance_group_instances
       request :remove_target_pool_health_checks
+      request :remove_target_pool_instances
+
       request :set_common_instance_metadata
-      request :remove_instance_group_instance
+      request :set_forwarding_rule_target
+      request :set_global_forwarding_rule_target
+      request :set_metadata
+      request :set_server_disk_auto_delete
+      request :set_server_scheduling
+      request :set_tags
+      request :set_target_http_proxy_url_map
 
       request :attach_disk
       request :detach_disk
-      request :get_server_serial_port_output
       request :reset_server
-      request :set_server_disk_auto_delete
-      request :set_server_scheduling
-      request :add_server_access_config
-      request :delete_server_access_config
-      request :update_url_map
-      request :validate_url_map
       request :start_server
       request :stop_server
+      request :update_url_map
+      request :validate_url_map
 
       model_path "fog/compute/google/models"
       model :server

data/lib/fog/compute/google/models/images.rb

@@ -22,7 +22,6 @@ module Fog
 
         def all
           data = []
-          all_projects = [service.project] + global_projects
 
           all_projects.each do |project|
             begin
@@ -50,10 +49,8 @@ module Fog
         end
 
         def get(identity)
-          # Search own project before global projects
-          all_projects = [service.project] + global_projects
-
           data = nil
+
           all_projects.each do |project|
             begin
               data = service.get_image(identity, project).body
@@ -68,10 +65,28 @@ module Fog
           new(data)
         end
 
+        def get_from_family(family)
+          data = nil
+          
+          all_projects.each do |project|
+            begin
+              data = service.get_image_from_family(family, project).body
+              data[:project] = project
+            rescue Fog::Errors::NotFound
+              next
+            else
+              break
+            end
+          end
+          return nil if data.nil?
+          new(data)
+        end
+
         private
 
-        def global_projects
-          GLOBAL_PROJECTS + service.extra_global_projects
+        def all_projects
+          # Search own project before global projects
+          [service.project] + GLOBAL_PROJECTS + service.extra_global_projects
         end
       end
     end

data/lib/fog/compute/google/models/instance_group.rb

@@ -18,18 +18,54 @@ module Fog
         def save
           requires :name, :zone
 
-          data = service.insert_instance_group(name, zone)
+          service.insert_instance_group(name, zone)
         end
 
         def destroy(_async = true)
           requires :name, :zone
 
-          data = service.delete_instance_group(name, zone_name)
+          service.delete_instance_group(name, zone_name)
+        end
+
+        def add_instances(instances)
+          requires :identity, :zone
+
+          service.add_instance_group_instances(
+            identity, zone_name, format_instance_list(instances)
+          )
+        end
+
+        def remove_instances(instances)
+          requires :identity, :zone
+
+          service.remove_instance_group_instances(
+            identity, zone_name, format_instance_list(instances)
+          )
+        end
+
+        def list_instances
+          requires :identity, :zone
+
+          instance_list = []
+          data = service.list_instance_group_instances(identity, zone_name).body
+          if data["items"]
+            data["items"].each do |instance|
+              instance_list << service.servers.get(instance["instance"].split("/")[-1], zone_name)
+            end
+          end
+          instance_list
         end
 
         def zone_name
           zone.nil? ? nil : zone.split("/")[-1]
         end
+
+        private
+
+        def format_instance_list(instance_list)
+          instance_list = Array(instance_list)
+          instance_list.map { |i| i.class == String ? i : i.self_link }
+        end
       end
     end
   end