fog 1.19.0 → 1.20.0

data/lib/fog/go_grid/core.rb

@@ -0,0 +1,11 @@
+require 'fog/core'
+
+module Fog
+  module GoGrid
+
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+
+  end
+end

data/lib/fog/go_grid/models/compute/server.rb

@@ -71,8 +71,8 @@ module Fog
         end
 
         def setup(credentials = {})
-          requires :identity, :public_ip_address, :public_key, :username
-          Fog::SSH.new(public_ip_address, username, credentials).run([
+          requires :identity, :ssh_ip_address, :public_key, :username
+          Fog::SSH.new(ssh_ip_address, username, credentials).run([
             %{mkdir .ssh},
             %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
             %{passwd -l root},

data/lib/fog/google.rb

@@ -1,24 +1,2 @@
-require 'fog/core'
-
-module Fog
-  module Google
-
-    extend Fog::Provider
-
-    service(:compute, 'google/compute', 'Compute')
-    service(:storage, 'google/storage', 'Storage')
-
-    class Mock
-
-      def self.etag
-        hex(32)
-      end
-
-      def self.hex(length)
-        max = ('f' * length).to_i(16)
-        rand(max).to_s(16)
-      end
-
-    end
-  end
-end
+require 'fog/google/compute'
+require 'fog/google/storage'

data/lib/fog/google/README.md

@@ -8,21 +8,24 @@ Google Cloud Storage originally was very similar to Amazon's S3. Because of this
 
 ## Compute
 
-Google Compute Engine is a Virtual Machine hosting service. Currently it is built on version [v1beta16](https://developers.google.com/compute/docs/reference/v1beta16/) of the GCE API.
+Google Compute Engine is a Virtual Machine hosting service. Currently it is built on version [v1](https://developers.google.com/compute/docs/reference/v1/) of the GCE API.
 
-Our implementation of the API currently supports 
+Our implementation of the API currently supports
 
  * Server creation, deletion and bootstrapping
- * All server "flavors" (micro and normal)
  * Persistent Disk creation and deletion
  * Image lookup
+ * Network and Firewall configuration
+ * Operations
+ * Snapshots
+ * Instance Metadata
 
 Features we are looking forward to implementing in the future:
 
- * Network and Firewall configuration
  * Global Metadata support
  * Image creation
+ * Load balancer configuration
 
-v1beta16 is still in beta, so we can imagine lots of changes to the API. If you are using Fog to interact with GCE, please keep Fog up to date and [file issues](https://github.com/fog/fog/issues?labels=google) for any anomalies you see.
+If you are using Fog to interact with GCE, please keep Fog up to date and [file issues](https://github.com/fog/fog/issues?labels=google) for any anomalies you see or features you would like.
 
 Thanks!

data/lib/fog/google/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/google'
+require 'fog/google/core'
 require 'fog/compute'
 
 module Fog
@@ -11,6 +11,7 @@ module Fog
 
       request_path 'fog/google/requests/compute'
       request :list_servers
+      request :list_addresses
       request :list_disks
       request :list_firewalls
       request :list_images
@@ -22,6 +23,7 @@ module Fog
       request :list_snapshots
 
       request :get_server
+      request :get_address
       request :get_disk
       request :get_firewall
       request :get_image
@@ -32,7 +34,9 @@ module Fog
       request :get_global_operation
       request :get_zone_operation
 
+      request :delete_address
       request :delete_disk
+      request :delete_snapshot
       request :delete_firewall
       request :delete_image
       request :delete_network
@@ -40,6 +44,7 @@ module Fog
       request :delete_global_operation
       request :delete_zone_operation
 
+      request :insert_address
       request :insert_disk
       request :insert_firewall
       request :insert_image
@@ -48,6 +53,7 @@ module Fog
       request :insert_snapshot
 
       request :set_metadata
+      request :set_tags
 
       model_path 'fog/google/models/compute'
       model :server
@@ -76,7 +82,7 @@ module Fog
 
         def shared_initialize(options = {})
           @project = options[:google_project]
-          @api_version = 'v1beta16'
+          @api_version = 'v1'
         end
 
         def build_excon_response(body, status=200)
@@ -84,7 +90,11 @@ module Fog
           response.body = body
           if response.body and response.body["error"]
             response.status = response.body["error"]["code"]
-            msg = response.body["error"]["errors"].map{|error| error["message"]}.join(", ")
+            if response.body["error"]["errors"]
+              msg = response.body["error"]["errors"].map{|error| error["message"]}.join(", ")
+            else
+              msg = "Error [#{response.body["error"]["code"]}]: #{response.body["error"]["message"] || "GCE didn't return an error message"}"
+            end
             case response.status
             when 404
               raise Fog::Errors::NotFound.new(msg)
@@ -114,7 +124,6 @@ module Fog
           end
           result
         end
-
       end
 
       class Mock
@@ -144,7 +153,6 @@ module Fog
                     "name" => "centos-6-2-v20120621",
                     "description" => "CentOS 6.2; Created Thu, 21 Jun 2012 14:22:21 +0000",
                     "sourceType" => "RAW",
-                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-20120621",
                     "rawDisk" => {
                       "containerType" => "TAR",
                       "source" => ""
@@ -163,7 +171,6 @@ module Fog
                     "name" => "centos-6-v20120912",
                     "description" => "CentOS 6; Created Wed, 12 Sep 2012 00:00:00 +0000",
                     "sourceType" => "RAW",
-                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20120912",
                     "rawDisk" => {
                       "containerType" => "TAR",
                       "source" => ""
@@ -182,7 +189,6 @@ module Fog
                     "name" => "centos-6-v20121106",
                     "description" => "SCSI-enabled CentOS 6; Created Tue, 06 Nov 2012 00:00:00 +0000",
                     "sourceType" => "RAW",
-                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20121106",
                     "rawDisk" => {
                       "containerType" => "TAR",
                       "source" => ""
@@ -202,7 +208,6 @@ module Fog
                     "name" => "debian-6-squeeze-v20130816",
                     "description" => "Debian GNU/Linux 6.0.7 (squeeze) built on 2013-08-16",
                     "sourceType" => "RAW",
-                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20130813",
                     "rawDisk" => {
                       "containerType" => "TAR",
                       "source" => ""
@@ -217,7 +222,6 @@ module Fog
                     "name" => "debian-7-wheezy-v20130816",
                     "description" => "Debian GNU/Linux 7.1 (wheezy) built on 2013-08-16",
                     "sourceType" => "RAW",
-                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20130813",
                     "rawDisk" => {
                       "containerType" => "TAR",
                       "source" => ""
@@ -232,12 +236,26 @@ module Fog
                     "name" => "debian-7-wheezy-v20131014",
                     "description" => "Debian GNU/Linux 7.1 (wheezy) built on 2013-10-14",
                     "sourceType" => "RAW",
-                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20130813",
                     "rawDisk" => {
                       "containerType" => "TAR",
                       "source" => ""
                     },
                     "status" => "READY"
+                  },
+                  "debian-7-wheezy-v20131120" => {
+                    "kind" => "compute#image",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-7-wheezy-v20131120",
+                    "id" => "17312518942796567788",
+                    "creationTimestamp" => "2013-11-25T15:17:00.436-08:00",
+                    "name" => "debian-7-wheezy-v20131120",
+                    "description" => "Debian GNU/Linux 7.2 (wheezy) built on 2013-11-20",
+                    "sourceType" => "RAW",
+                    "rawDisk" => {
+                      "containerType" => "TAR",
+                      "source" => ""
+                    },
+                    "status" => "READY",
+                    "archiveSizeBytes" => "341857472"
                   }
                 }
               }
@@ -252,7 +270,6 @@ module Fog
                     "name" => "centos-6-v20130813",
                     "description" => "SCSI-enabled CentOS 6; Created Tue, 13 Aug 2013 00:00:00 +0000",
                     "sourceType" => "RAW",
-                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20130813",
                     "rawDisk" => {
                       "containerType" => "TAR",
                       "source" => ""
@@ -273,8 +290,6 @@ module Fog
                     "name" => "fog-1380196541",
                     "tags" => { "fingerprint" => "42WmSpB8rSM=" },
                     "machineType" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/machineTypes/n1-standard-1",
-                    "image" => "https://www.googleapis.com/compute/#{api_version}/projects/centos-cloud/global/images/centos-6-v20130813",
-                    "kernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20130813",
                     "canIpForward" => false,
                     "networkInterfaces" => [
                       {
@@ -295,8 +310,11 @@ module Fog
                       {
                         "kind" => "compute#attachedDisk",
                         "index" => 0,
-                        "type" => "SCRATCH",
-                        "mode" => "READ_WRITE"
+                        "type" => "PERSISTENT",
+                        "mode" => "READ_WRITE",
+                        "source" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/disks/fog-1",
+                        "deviceName" => "persistent-disk-0",
+                        "boot" => true
                       }
                     ],
                     "metadata" => {
@@ -771,7 +789,30 @@ module Fog
                   }
                 end,
                 :images => {},
-                :disks => {},
+                :disks => {
+                  "fog-1" => {
+                    "kind" => "compute#disk",
+                    "id" => "3338131294770784461",
+                    "creationTimestamp" => "2013-12-18T19:47:10.583-08:00",
+                    "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a",
+                    "status" => "READY",
+                    "name" => "fog-1",
+                    "sizeGb" => "10",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/disks/fog-1",
+                    "sourceImage" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-7-wheezy-v20131120",
+                    "sourceImageId" => "17312518942796567788"
+                  },
+                  "fog-2" => {
+                    "kind" => "compute#disk",
+                    "id" => "3338131294770784462",
+                    "creationTimestamp" => "2013-12-18T19:47:10.583-08:00",
+                    "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a",
+                    "status" => "READY",
+                    "name" => "fog-2",
+                    "sizeGb" => "10",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/disks/fog-1"
+                  }
+                },
                 :operations => {}
               }
             end
@@ -782,7 +823,7 @@ module Fog
           @data = nil
         end
 
-        def data(project = @project)
+        def data(project=@project)
           self.class.data(api_version)[project]
         end
 
@@ -800,6 +841,8 @@ module Fog
         include Collections
         include Shared
 
+        attr_reader :client, :compute, :api_url
+
         def initialize(options)
           base_url = 'https://www.googleapis.com/compute/'
           api_scope_url = 'https://www.googleapis.com/auth/compute'

data/lib/fog/google/core.rb

@@ -0,0 +1,24 @@
+require 'fog/core'
+
+module Fog
+  module Google
+
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+    service(:storage, 'Storage')
+
+    class Mock
+
+      def self.etag
+        hex(32)
+      end
+
+      def self.hex(length)
+        max = ('f' * length).to_i(16)
+        rand(max).to_s(16)
+      end
+
+    end
+  end
+end

data/lib/fog/google/examples/create.rb

@@ -1,9 +1,20 @@
 def test
   connection = Fog::Compute.new({ :provider => "Google" })
 
+  name = "fog-smoke-test-#{Time.now.to_i}"
+
+  disk = connection.disks.create({
+    :name => name,
+    :size_gb => 10,
+    :zone_name => 'us-central1-a',
+    :source_image => 'debian-7-wheezy-v20131120',
+  })
+
+  disk.wait_for { disk.ready? }
+
   server = connection.servers.create(defaults = {
     :name => "fog-smoke-test-#{Time.now.to_i}",
-    :image_name => "debian-7-wheezy-v20130522",
+    :disks => [disk],
     :machine_type => "n1-standard-1",
     :zone_name => "us-central1-a",
     :private_key_path => File.expand_path("~/.ssh/id_rsa"),

data/lib/fog/google/examples/eric-fail.rb

@@ -1,9 +1,20 @@
 def test
   connection = Fog::Compute.new({ :provider => "Google" })
 
+  name = "fog-smoke-test-#{Time.now.to_i}"
+
+  disk = connection.disks.create({
+    :name => name,
+    :size_gb => 10,
+    :zone_name => 'us-central1-a',
+    :source_image => 'debian-7-wheezy-v20131120',
+  })
+
+  disk.wait_for { disk.ready? }
+
   server = connection.servers.create(defaults = {
-    :name => "fog-smoke-test-#{Time.now.to_i}",
-    :image_name => "debian-7-wheezy-v20130617",
+    :name => name,
+    :disks => [disk],
     :machine_type => "n1-standard-1",
     :zone_name => "us-central1-a",
     :private_key_path => File.expand_path("~/.ssh/id_rsa"),

data/lib/fog/google/examples/image_create.rb

@@ -10,7 +10,6 @@ def test
   return if rawdisk[:source].nil?
 
   img = connection.image.create(:name             => 'test-image',
-                                :preferred_kernel => 'gce-v20130603',
                                 :description      => 'Test image (via fog)',
                                 :raw_disk         => rawdisk)
 

data/lib/fog/google/examples/launch_micro_instance.rb

@@ -14,8 +14,7 @@ def test
     :machine_type => "f1-micro",
     :zone_name => "us-central1-a",
     :disks => [ disk.get_as_boot_disk(true) ],
-    :user => ENV['USER'],
-    :kernel => 'gce-v20130522',
+    :user => ENV['USER']
   }
 
   server = connection.servers.bootstrap params

data/lib/fog/google/examples/metadata.rb

@@ -1,8 +1,20 @@
 def test
   connection = Fog::Compute.new({ :provider => "Google" })
+
+  name = "fog-smoke-test-#{Time.now.to_i}"
+
+  disk = connection.disks.create({
+    :name => name,
+    :size_gb => 10,
+    :zone_name => 'us-central1-a',
+    :source_image => 'debian-7-wheezy-v20131120',
+  })
+
+  disk.wait_for { disk.ready? }
+
   server = connection.servers.create(defaults = { 
-    :name => "fog-#{Time.now.to_i}",
-    :image_name => "debian-7-wheezy-v20130522",
+    :name => name,
+    :disks => [disk],
     :machine_type => "n1-standard-1",
     :zone_name => "us-central1-a",
     :private_key_path => File.expand_path("~/.ssh/id_rsa"),

data/lib/fog/google/examples/network.rb

@@ -4,9 +4,20 @@ def test
   # we create a new private network
   connection.insert_network('my-private-network', '10.240.0.0/16')
 
+  name = "fog-smoke-test-#{Time.now.to_i}"
+
+  disk = connection.disks.create({
+    :name => name,
+    :size_gb => 10,
+    :zone_name => 'us-central1-a',
+    :source_image => 'debian-7-wheezy-v20131120',
+  })
+
+  disk.wait_for { disk.ready? }
+
   server = connection.servers.create({
-    :name => "fog-smoke-test-#{Time.now.to_i}",
-    :image_name => "debian-7-wheezy-v20130522",
+    :name => name,
+    :disks => [disk],
     :machine_type => "n1-standard-1",
     :zone_name => "us-central1-a",
     :private_key_path => File.expand_path("~/.ssh/id_rsa"),

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

@@ -25,7 +25,7 @@ module Fog
           requires :zone_name
 
           options = {}
-          if source_image.nil?
+          if source_image.nil? && !source_snapshot.nil?
             options['sourceSnapshot'] = source_snapshot
           end
 
@@ -57,21 +57,22 @@ module Fog
           end
         end
 
-        def get_as_boot_disk(writable=true)
+        def get_object(writable=true, boot=false, device_name=nil)
           mode = writable ? 'READ_WRITE' : 'READ_ONLY'
           return {
-              'name' => name,
-              'type' => 'PERSISTENT',
-              'boot' => true,
-              'source' => self_link,
-              'mode' => mode
-          }
+            'boot' => boot,
+            'source' => self_link,
+            'mode' => mode,
+            'deviceName' => device_name,
+            'type' => 'PERSISTENT'
+          }.select { |k, v| !v.nil? }
+        end
+
+        def get_as_boot_disk(writable=true)
+          get_object(writable, true)
         end
 
         def ready?
-          data = service.get_disk(self.name, self.zone_name).body
-          data['zone_name'] = self.zone_name
-          self.merge_attributes(data)
           self.status == RUNNING_STATE
         end