fog 1.18.0 → 1.19.0

data/lib/fog/core/hmac.rb

@@ -18,7 +18,7 @@ module Fog
     private
 
     def setup_sha1
-      @digest = OpenSSL::Digest::Digest.new('sha1')
+      @digest = OpenSSL::Digest.new('sha1')
       @signer = lambda do |data|
         OpenSSL::HMAC.digest(@digest, @key, data)
       end
@@ -26,7 +26,7 @@ module Fog
 
     def setup_sha256
       begin
-        @digest = OpenSSL::Digest::Digest.new('sha256')
+        @digest = OpenSSL::Digest.new('sha256')
         @signer = lambda do |data|
           OpenSSL::HMAC.digest(@digest, @key, data)
         end
@@ -45,4 +45,4 @@ module Fog
     end
 
   end
-end
+end

data/lib/fog/core/mock.rb

@@ -30,8 +30,8 @@ module Fog
       @delay = new_delay
     end
 
-    def self.not_implemented
-      raise Fog::Errors::MockNotImplemented.new("Contributions welcome!")
+    def self.not_implemented(message = 'Contributions welcome!')
+      raise Fog::Errors::MockNotImplemented.new(message)
     end
 
     def self.random_ip(opts = {:version => :v4})
@@ -74,6 +74,13 @@ module Fog
       rand(max).to_s
     end
 
+    def self.random_letters_and_numbers(length)
+      random_selection(
+        'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
+        length
+      )
+    end
+
     def self.random_selection(characters, length)
       selection = ''
       length.times do

data/lib/fog/core/scp.rb

@@ -78,7 +78,7 @@ module Fog
         end
       end
 
-      def download(remote_path, local_path, download_options = {})
+      def download(remote_path, local_path, download_options = {}, &block)
         begin
           Net::SCP.start(@address, @username, @options) do |scp|
             scp.download!(remote_path, local_path, download_options) do |ch, name, sent, total|

data/lib/fog/core/wait_for.rb

@@ -1,5 +1,5 @@
 module Fog
-  def self.wait_for(timeout=Fog.timeout, interval=1, &block)
+  def self.wait_for(timeout=Fog.timeout, interval=Fog.interval, &block)
     duration = 0
     start = Time.now
     until yield || duration > timeout

data/lib/fog/core/{timeout.rb → wait_for_defaults.rb}

@@ -1,4 +1,14 @@
 module Fog
+  @interval = 1
+  def self.interval
+    @interval
+  end
+
+  def self.interval=(interval)
+    raise ArgumentError, "interval must be non-negative" unless interval >= 0
+    @interval = interval
+  end
+  
   @timeout = 600
   def self.timeout
     @timeout

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

@@ -17,6 +17,7 @@ module Fog
         # Not documented in their API, but
         # available nevertheless
         attribute :public_ip_address, :aliases => 'ip_address'
+        attribute :private_ip_address
         attribute :backups_active
 
         attr_writer :ssh_keys
@@ -124,6 +125,9 @@ module Fog
           elsif @ssh_keys
             options[:ssh_key_ids] = @ssh_keys.map(&:id)
           end
+
+          options[:private_networking] = !!attributes[:private_networking]
+
           data = service.create_server name,
                                        flavor_id,
                                        image_id,

data/lib/fog/digitalocean/requests/compute/create_server.rb

@@ -24,6 +24,8 @@ module Fog
             query_hash[:ssh_key_ids] = options[:ssh_key_ids]
           end
 
+          query_hash[:private_networking] = !!options[:private_networking]
+
           request(
             :expects  => [200],
             :method   => 'GET',

data/lib/fog/dnsimple/dns.rb

@@ -85,7 +85,7 @@ module Fog
                                     "Accept" => "application/json",
                                     "Content-Type" => "application/json" })
 
-          response = @connection.request(params.merge!({:host => @host}))
+          response = @connection.request(params)
 
           unless response.body.empty?
             response.body = Fog::JSON.decode(response.body)

data/lib/fog/dreamhost/dns.rb

@@ -47,8 +47,6 @@ module Fog
       class Real
 
         def initialize(options={})
-          require 'multi_json'
-
           @dreamhost_api_key  = options[:dreamhost_api_key]
           if options[:dreamhost_url]
             uri = URI.parse(options[:dreamhost_url])
@@ -68,12 +66,12 @@ module Fog
         end
 
         def request(params)
-          params[:query].merge!( { :key => @dreamhost_api_key, 
+          params[:query].merge!( { :key => @dreamhost_api_key,
                                    :format => 'json' } )
           response = @connection.request(params)
 
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           if response.body['result'] != 'success'
             raise response.body['data']

data/lib/fog/ecloud/compute.rb

@@ -291,7 +291,7 @@ module Fog
           @connection_options      = options[:connection_options] || {}
           @host                    = options[:ecloud_host] || API_URL
           @persistent              = options[:persistent] || false
-          @version                 = options[:ecloud_version] || "2012-03-01"
+          @version                 = options[:ecloud_version] || "2013-06-01"
           @authentication_method   = options[:ecloud_authentication_method] || :cloud_api_auth
           @access_key              = options[:ecloud_access_key]
           @private_key             = options[:ecloud_private_key]

data/lib/fog/ecloud/models/compute/environments.rb

@@ -15,10 +15,12 @@ module Fog
         def all
           data = []
           service.get_organization(href).body[:Locations][:Location].each do |d|
-            if d[:Environments][:Environment].is_a?(Array)
-              d[:Environments][:Environment].each { |e| data << e }
+            environments = d[:Environments]
+            next unless environments
+            if environments[:Environment].is_a?(Array)
+              environments[:Environment].each { |e| data << e }
             else
-              data << d[:Environments][:Environment]
+              data << environments[:Environment]
             end
           end
           load(data)

data/lib/fog/google/compute.rb

@@ -29,13 +29,16 @@ module Fog
       request :get_network
       request :get_zone
       request :get_snapshot
+      request :get_global_operation
+      request :get_zone_operation
 
       request :delete_disk
       request :delete_firewall
       request :delete_image
       request :delete_network
-      request :delete_operation
       request :delete_server
+      request :delete_global_operation
+      request :delete_zone_operation
 
       request :insert_disk
       request :insert_firewall
@@ -59,6 +62,9 @@ module Fog
       model :disk
       collection :disks
 
+      model :operation
+      collection :operations
+
       model :snapshot
       collection :snapshots
 
@@ -66,31 +72,41 @@ module Fog
       collection :zones
 
       module Shared
-        attr_reader :project
+        attr_reader :project, :api_version
 
-        def build_excon_response(body)
+        def shared_initialize(options = {})
+          @project = options[:google_project]
+          @api_version = 'v1beta16'
+        end
+
+        def build_excon_response(body, status=200)
           response = Excon::Response.new
           response.body = body
-          if response.body["error"]
+          if response.body and response.body["error"]
             response.status = response.body["error"]["code"]
-
-            response.body["error"]["errors"].each do |error|
-              raise Fog::Errors::Error.new(error["message"])
+            msg = response.body["error"]["errors"].map{|error| error["message"]}.join(", ")
+            case response.status
+            when 404
+              raise Fog::Errors::NotFound.new(msg)
+            else
+              raise Fog::Errors::Error.new(msg)
             end
           else
-            response.status = 200
+            response.status = status
           end
           response
         end
 
         def backoff_if_unfound(&block)
           retries_remaining = 10
+          sleep_time = 0.1
           begin
             result = block.call
           rescue Exception => msg
             if msg.to_s.include? 'was not found' and retries_remaining > 0
               retries_remaining -= 1
-              sleep 0.1
+              sleep sleep_time
+              sleep_time *= 1.6
               retry
             else
               raise msg
@@ -98,6 +114,7 @@ module Fog
           end
           result
         end
+
       end
 
       class Mock
@@ -105,7 +122,7 @@ module Fog
         include Shared
 
         def initialize(options={})
-          @project = options[:google_project]
+          shared_initialize(options)
         end
 
         def build_response(params={})
@@ -113,7 +130,7 @@ module Fog
           build_excon_response(body)
         end
 
-        def self.data
+        def self.data(api_version)
           @data ||= Hash.new do |hash, key|
             case key
             when 'google'
@@ -121,51 +138,51 @@ module Fog
                 :images => {
                   "centos-6-2-v20120621" => {
                     "kind" => "compute#image",
-                    "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-2-v20120621",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-2-v20120621",
                     "id" => "12920641029336858796",
                     "creationTimestamp" => "2012-06-21T22:59:56.392-07:00",
                     "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/v1beta15/projects/google/global/kernels/gce-20120621",
+                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-20120621",
                     "rawDisk" => {
                       "containerType" => "TAR",
                       "source" => ""
                     },
                     "deprecated" => {
                       "state" => "DELETED",
-                      "replacement" => "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-v20130104"
+                      "replacement" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-v20130104"
                     },
                     "status" => "READY"
                   },
                   "centos-6-v20120912" => {
                     "kind" => "compute#image",
-                    "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-v20120912",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-v20120912",
                     "id" => "12994279803511049620",
                     "creationTimestamp" => "2012-09-18T08:52:47.584-07:00",
                     "name" => "centos-6-v20120912",
                     "description" => "CentOS 6; Created Wed, 12 Sep 2012 00:00:00 +0000",
                     "sourceType" => "RAW",
-                    "preferredKernel" => "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20120912",
+                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20120912",
                     "rawDisk" => {
                       "containerType" => "TAR",
                       "source" => ""
                     },
                     "deprecated" => {
                       "state" => "DEPRECATED",
-                      "replacement" => "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-v20130104"
+                      "replacement" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-v20130104"
                     },
                     "status" => "READY"
                   },
                   "centos-6-v20121106" => {
                     "kind" => "compute#image",
-                    "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/google/global/images/centos-6-v20121106",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/images/centos-6-v20121106",
                     "id" => "13037720516378381209",
                     "creationTimestamp" => "2012-11-09T11:40:41.079-08:00",
                     "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/v1beta15/projects/google/global/kernels/gce-v20121106",
+                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20121106",
                     "rawDisk" => {
                       "containerType" => "TAR",
                       "source" => ""
@@ -179,13 +196,13 @@ module Fog
                 :images => {
                   "debian-6-squeeze-v20130816" => {
                     "kind" => "compute#image",
-                    "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-6-squeeze-v20130816",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-6-squeeze-v20130816",
                     "id" => "14841592146580482051",
                     "creationTimestamp" => "2013-09-04T13:21:53.292-07:00",
                     "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/v1beta15/projects/google/global/kernels/gce-v20130813",
+                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20130813",
                     "rawDisk" => {
                       "containerType" => "TAR",
                       "source" => ""
@@ -194,13 +211,28 @@ module Fog
                   },
                   "debian-7-wheezy-v20130816" => {
                     "kind" => "compute#image",
-                    "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/debian-cloud/global/images/debian-7-wheezy-v20130816",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-7-wheezy-v20130816",
                     "id" => "4213305957435180899",
                     "creationTimestamp" => "2013-09-04T13:24:30.479-07:00",
                     "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/v1beta15/projects/google/global/kernels/gce-v20130813",
+                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20130813",
+                    "rawDisk" => {
+                      "containerType" => "TAR",
+                      "source" => ""
+                    },
+                    "status" => "READY"
+                  },
+                  "debian-7-wheezy-v20131014" => {
+                    "kind" => "compute#image",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
+                    "id" => "4213305957435180899",
+                    "creationTimestamp" => "2013-09-04T13:24:30.479-07:00",
+                    "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" => ""
@@ -214,13 +246,13 @@ module Fog
                 :images => {
                   "centos-6-v20130813" => {
                     "kind" => "compute#image",
-                    "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/centos-cloud/global/images/centos-6-v20130813",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/centos-cloud/global/images/centos-6-v20130813",
                     "id" => "4670523370938782739",
                     "creationTimestamp" => "2013-08-19T11:56:47.004-07:00",
                     "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/v1beta15/projects/google/global/kernels/gce-v20130813",
+                    "preferredKernel" => "https://www.googleapis.com/compute/#{api_version}/projects/google/global/kernels/gce-v20130813",
                     "rawDisk" => {
                       "containerType" => "TAR",
                       "source" => ""
@@ -236,17 +268,17 @@ module Fog
                     "kind" => "compute#instance",
                     "id" => "1361932147851415727",
                     "creationTimestamp" => "2013-09-26T04:55:43.881-07:00",
-                    "zone" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/us-central1-a",
+                    "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a",
                     "status" => "RUNNING",
                     "name" => "fog-1380196541",
                     "tags" => { "fingerprint" => "42WmSpB8rSM=" },
-                    "machineType" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/us-central1-a/machineTypes/n1-standard-1",
-                    "image" => "https://www.googleapis.com/compute/v1beta15/projects/centos-cloud/global/images/centos-6-v20130813",
-                    "kernel" => "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130813",
+                    "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" => [
                       {
-                        "network" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/global/networks/default",
+                        "network" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/global/networks/default",
                         "networkIP" => "10.240.121.54",
                         "name" => "nic0",
                         "accessConfigs" => [
@@ -277,13 +309,13 @@ module Fog
                         }
                       ]
                     },
-                    "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/us-central1-a/instances/fog-1380196541"
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/instances/fog-1380196541"
                   }
                 },
                 :zones => {
                   "europe-west1-a" => {
                     "kind" => "compute#zone",
-                    "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/europe-west1-a",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/europe-west1-a",
                     "id" => "10419676573632995924",
                     "creationTimestamp" => "2013-09-26T02:56:13.115-07:00",
                     "name" => "europe-west1-a",
@@ -303,27 +335,28 @@ module Fog
                       {"metric" => "DISKS", "limit" => 16.0, "usage" => 0.0},
                       {"metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0}
                     ],
-                    "region" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/regions/europe-west1"
+                    "region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/europe-west1"
                   },
                   "us-central1-a" => {
                     "kind" => "compute#zone",
-                    "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/us-central1-a",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a",
                     "id" => "6562457277909136262",
                     "creationTimestamp" => "2013-09-26T02:56:13.116-07:00",
                     "name" => "us-central1-a",
                     "description" => "us-central1-a",
                     "status" => "UP",
+                    "maintenanceWindows" => nil,
                     "quotas" => [
                       {"metric" => "INSTANCES", "limit" => 16.0, "usage" => 1.0},
                       {"metric" => "CPUS", "limit" => 24.0, "usage" => 1.0},
                       {"metric" => "DISKS", "limit" => 16.0, "usage" => 0.0},
                       {"metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0}
                     ],
-                    "region" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/regions/us-central1"
+                    "region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/us-central1"
                   },
                   "us-central1-b" => {
                     "kind" => "compute#zone",
-                    "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/us-central1-b",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-b",
                     "id" => "8701502109626061015",
                     "creationTimestamp" => "2013-09-26T02:56:13.124-07:00",
                     "name" => "us-central1-b",
@@ -339,11 +372,11 @@ module Fog
                       {"metric" => "DISKS", "limit" => 16.0, "usage" => 0.0},
                       {"metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0}
                     ],
-                    "region" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/regions/us-central1"
+                    "region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/us-central1"
                   },
                   "us-central2-a" => {
                     "kind" => "compute#zone",
-                    "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/us-central2-a",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central2-a",
                     "id" => "13611654493253680292",
                     "creationTimestamp" => "2013-09-26T02:56:13.125-07:00",
                     "name" => "us-central2-a",
@@ -363,7 +396,7 @@ module Fog
                       {"metric" => "DISKS", "limit" => 16.0, "usage" => 0.0},
                       {"metric" => "DISKS_TOTAL_GB", "limit" => 2048.0, "usage" => 0.0}
                     ],
-                    "region" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/regions/us-central2"
+                    "region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/regions/us-central2"
                   }
                 },
                 :machine_types => Hash.new do |machine_types_hash, zone|
@@ -380,7 +413,7 @@ module Fog
                       "maximumPersistentDisks" => 4,
                       "maximumPersistentDisksSizeGb" => "3072",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/f1-micro"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/f1-micro"
                     },
                     "g1-small" => {
                       "kind" => "compute#machineType",
@@ -394,7 +427,7 @@ module Fog
                       "maximumPersistentDisks" => 4,
                       "maximumPersistentDisksSizeGb" => "3072",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/g1-small"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/g1-small"
                     },
                     "n1-highcpu-2" => {
                       "kind" => "compute#machineType",
@@ -408,7 +441,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-highcpu-2"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-highcpu-2"
                     },
                     "n1-highcpu-2-d" => {
                       "kind" => "compute#machineType",
@@ -427,7 +460,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-highcpu-2-d"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-highcpu-2-d"
                     },
                     "n1-highcpu-4" => {
                       "kind" => "compute#machineType",
@@ -441,7 +474,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-highcpu-4"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-highcpu-4"
                     },
                     "n1-highcpu-4-d" => {
                       "kind" => "compute#machineType",
@@ -460,7 +493,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-highcpu-4-d"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-highcpu-4-d"
                     },
                     "n1-highcpu-8" => {
                       "kind" => "compute#machineType",
@@ -474,7 +507,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-highcpu-8"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-highcpu-8"
                     },
                     "n1-highcpu-8-d" => {
                       "kind" => "compute#machineType",
@@ -496,7 +529,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-highcpu-8-d"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-highcpu-8-d"
                     },
                     "n1-highmem-2" => {
                       "kind" => "compute#machineType",
@@ -510,7 +543,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-highmem-2"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-highmem-2"
                     },
                     "n1-highmem-2-d" => {
                       "kind" => "compute#machineType",
@@ -529,7 +562,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-highmem-2-d"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-highmem-2-d"
                     },
                     "n1-highmem-4" => {
                       "kind" => "compute#machineType",
@@ -543,7 +576,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-highmem-4"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-highmem-4"
                     },
                     "n1-highmem-4-d" => {
                       "kind" => "compute#machineType",
@@ -562,7 +595,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-highmem-4-d"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-highmem-4-d"
                     },
                     "n1-highmem-8" => {
                       "kind" => "compute#machineType",
@@ -576,7 +609,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-highmem-8"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-highmem-8"
                     },
                     "n1-highmem-8-d" => {
                       "kind" => "compute#machineType",
@@ -598,7 +631,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-highmem-8-d"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-highmem-8-d"
                     },
                     "n1-standard-1" => {
                       "kind" => "compute#machineType",
@@ -612,7 +645,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-1"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-1"
                     },
                     "n1-standard-1-d" => {
                       "kind" => "compute#machineType",
@@ -631,7 +664,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-1-d"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-1-d"
                     },
                     "n1-standard-2" => {
                       "kind" => "compute#machineType",
@@ -645,7 +678,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-2"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-2"
                     },
                     "n1-standard-2-d" => {
                       "kind" => "compute#machineType",
@@ -664,7 +697,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-2-d"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-2-d"
                     },
                     "n1-standard-4" => {
                       "kind" => "compute#machineType",
@@ -678,7 +711,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-4"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-4"
                     },
                     "n1-standard-4-d" => {
                       "kind" => "compute#machineType",
@@ -697,7 +730,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-4-d"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-4-d"
                     },
                     "n1-standard-8" => {
                       "kind" => "compute#machineType",
@@ -711,7 +744,7 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-8"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-8"
                     },
                     "n1-standard-8-d" => {
                       "kind" => "compute#machineType",
@@ -733,11 +766,13 @@ module Fog
                       "maximumPersistentDisks" => 16,
                       "maximumPersistentDisksSizeGb" => "10240",
                       "zone" => zone,
-                      "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-8-d"
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/#{zone}/machineTypes/n1-standard-8-d"
                      }
                   }
                 end,
-                :images => {}
+                :images => {},
+                :disks => {},
+                :operations => {}
               }
             end
           end
@@ -747,15 +782,18 @@ module Fog
           @data = nil
         end
 
-        def data
-          self.class.data[@project]
+        def data(project = @project)
+          self.class.data(api_version)[project]
         end
 
         def reset_data
           # not particularly useful because it deletes zones
-          self.class.data.delete(@project)
+          self.class.data(api_version).delete(@project)
         end
 
+        def random_operation
+          "operation-#{Fog::Mock.random_numbers(13)}-#{Fog::Mock.random_hex(13)}-#{Fog::Mock.random_hex(8)}"
+        end
       end
 
       class Real
@@ -764,10 +802,9 @@ module Fog
 
         def initialize(options)
           base_url = 'https://www.googleapis.com/compute/'
-          api_version = 'v1beta16'
           api_scope_url = 'https://www.googleapis.com/auth/compute'
+          shared_initialize(options)
 
-          @project = options[:google_project]
           google_client_email = options[:google_client_email]
           @api_url = base_url + api_version + '/projects/'
 
@@ -817,7 +854,7 @@ module Fog
         # result = Google::APIClient::Result
         # returns Excon::Response
         def build_response(result)
-          build_excon_response(Fog::JSON.decode(result.body))
+          build_excon_response(result.body.nil? ? nil : Fog::JSON.decode(result.body), result.status)
         end
 
       end