fog-maestrodev 1.18.0.20131209091424 → 1.18.0.20131218202447

data/.gitignore

@@ -3,6 +3,7 @@
 *.rbc
 *.sw?
 .rvmrc
+.ruby-version
 .bundle
 .DS_Store
 .idea

data/CONTRIBUTING.md

@@ -0,0 +1,22 @@
+## Getting Involved
+
+New contributors are always welcome, when it doubt please ask questions. We strive to be an open and welcoming community. Please be nice to one another.
+
+### Coding
+
+* Pick a task:
+  * Offer feedback on open [pull requests](https://github.com/fog/fog/pulls).
+  * Review open [issues](https://github.com/fog/fog/issues) for things to help on.
+  * [Create an issue](https://github.com/fog/fog/issues/new) to start a discussion on additions or features.
+* Fork the project, add your changes and tests to cover them in a topic branch.
+* Commit your changes and rebase against `fog/fog` to ensure everything is up to date.
+* [Submit a pull request](https://github.com/fog/fog/compare/)
+
+### Non-Coding
+
+* Offer feedback on open [issues](https://github.com/fog/fog/issues).
+* Write and help edit [documentation](https://github.com/fog/fog.github.com).
+* Translate [documentation](https://github.com/fog/fog.github.com) in to other languages.
+* Organize or volunteer at events.
+* [Donate](https://www.gittip.com/geemus/)
+* Discuss other ideas for contribution with [geemus](mailto:geemus+fog@gmail.com).

data/LICENSE.md

@@ -0,0 +1,20 @@
+Copyright (c) 2013 [geemus (Wesley Beary)](http://github.com/geemus)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -169,45 +169,32 @@ spec.add_dependency 'fog', '~> 1.16'
 [semver]: http://semver.org/
 [pvc]: http://guides.rubygems.org/patterns/
 
-## Contributing
-
-* Find something you would like to work on.
-  * Look for anything you can help with in the [issue tracker](https://github.com/fog/fog/issues).
-  * Look at the [code quality metrics](https://codeclimate.com/github/fog/fog) for anything you can help clean up.
-  * Or anything else!
-* Fork the project and do your work in a topic branch.
-  * Make sure your changes will work on both Ruby 1.8.7 and Ruby 1.9
-* Add a config at `tests/.fog` for the component you want to test.
-* Add shindo tests to prove your code works and run all the tests using `bundle exec rake`.
-* Rebase your branch against `fog/fog` to make sure everything is up to date.
-* Commit your changes and send a pull request.
-
-## Additional Resources
-
-* [fog.io](http://fog.io)
-* [Provider Documentation](http://fog.io/about/provider_documentation.html)
-
-## Copyright
-
-(The MIT License)
-
-Copyright (c) 2013 [geemus (Wesley Beary)](http://github.com/geemus)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+## Getting Help
+
+* [General Documentation](http://fog.io).
+* [Provider Specific Documentation](http://fog.io/about/provider_documentation.html).
+* Ask specific questions on [Stack Overflow](http://stackoverflow.com/questions/tagged/fog)
+* Report bugs and discuss potential features in [Github issues](https://github.com/fog/fog/issues).
+
+## Getting Involved
+
+New contributors are always welcome, when it doubt please ask questions. We strive to be an open and welcoming community. Please be nice to one another.
+
+### Coding
+
+* Pick a task:
+  * Offer feedback on open [pull requests](https://github.com/fog/fog/pulls).
+  * Review open [issues](https://github.com/fog/fog/issues) for things to help on.
+  * [Create an issue](https://github.com/fog/fog/issues/new) to start a discussion on additions or features.
+* Fork the project, add your changes and tests to cover them in a topic branch.
+* Commit your changes and rebase against `fog/fog` to ensure everything is up to date.
+* [Submit a pull request](https://github.com/fog/fog/compare/)
+
+### Non-Coding
+
+* Offer feedback on open [issues](https://github.com/fog/fog/issues).
+* Write and help edit [documentation](https://github.com/fog/fog.github.com).
+* Translate [documentation](https://github.com/fog/fog.github.com) in to other languages.
+* Organize or volunteer at events.
+* [Donate](https://www.gittip.com/geemus/)
+* Discuss other ideas for contribution with [geemus](mailto:geemus+fog@gmail.com).

data/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog-maestrodev'
-  s.version           = '1.18.0.20131209091424'
-  s.date              = '2013-12-09'
+  s.version           = '1.18.0.20131218202447'
+  s.date              = '2013-12-18'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '~>0.30.0')
+  s.add_dependency('excon', '~>0.31.0')
   s.add_dependency('formatador', '~>0.2.0')
   s.add_dependency('multi_json', '~>1.0')
   s.add_dependency('mime-types')

data/lib/fog/aws/compute.rb

@@ -47,6 +47,7 @@ module Fog
 
       request_path 'fog/aws/requests/compute'
       request :allocate_address
+      request :assign_private_ip_addresses
       request :associate_address
       request :associate_dhcp_options
       request :attach_network_interface

data/lib/fog/aws/models/compute/subnet.rb

@@ -14,6 +14,10 @@ module Fog
         attribute :availability_zone,           :aliases => 'availabilityZone'
         attribute :tag_set,                     :aliases => 'tagSet'
 
+        def ready?
+          requires :state
+          state == 'available'
+        end
 
         # Removes an existing subnet
         #

data/lib/fog/aws/models/compute/vpc.rb

@@ -20,6 +20,11 @@ module Fog
           super
         end
 
+        def ready?
+          requires :state
+          state == 'available'
+        end
+
         # Removes an existing vpc
         #
         # vpc.destroy

data/lib/fog/aws/models/rds/server.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :engine_version, :aliases => 'EngineVersion'
         attribute :state, :aliases => 'DBInstanceStatus'
         attribute :allocated_storage, :aliases => 'AllocatedStorage', :type => :integer
+        attribute :iops, :aliases => 'Iops'
         attribute :availability_zone , :aliases => 'AvailabilityZone'
         attribute :flavor_id, :aliases => 'DBInstanceClass'
         attribute :endpoint, :aliases => 'Endpoint'
@@ -116,6 +117,7 @@ module Fog
             'Port'                          => port || attributes['Port'],
             'Engine'                        => engine,
             'EngineVersion'                 => engine_version,
+            'Iops'                          => iops,
             'MasterUsername'                => master_username,
             'MasterUserPassword'            => password || attributes['MasterUserPassword'],
             'PreferredMaintenanceWindow'    => preferred_maintenance_window,

data/lib/fog/aws/models/storage/file.rb

@@ -33,13 +33,13 @@ module Fog
 
         # Set file's access control list (ACL).
         # 
-        #     valid acls: private, public-read, public-read-write, authenticated-read
+        #     valid acls: private, public-read, public-read-write, authenticated-read, bucket-owner-read, bucket-owner-full-control
         # 
         # @param [String] new_acl one of valid options
         # @return [String] @acl
         # 
         def acl=(new_acl)
-          valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
+          valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read', 'bucket-owner-read', 'bucket-owner-full-control']
           unless valid_acls.include?(new_acl)
             raise ArgumentError.new("acl must be one of [#{valid_acls.join(', ')}]")
           end

data/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class AssignPrivateIpAddresses < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'requestId'
+              @response[name] = value
+            when 'return'
+              if value == 'true'
+                @response[name] = true
+              else
+                @response[name] = false
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb

@@ -0,0 +1,60 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/assign_private_ip_addresses'
+
+        # Assigns one or more secondary private IP addresses to the specified network interface.
+        #
+        # ==== Parameters
+        # * NetworkInterfaceId<~String> - The ID of the network interface
+        # * PrivateIpAddresses<~Array> - One or more IP addresses to be assigned as a secondary private IP address (conditional)
+        # * SecondaryPrivateIpAddressCount<~String> - The number of secondary IP addresses to assign (conditional)
+        # * AllowReassignment<~Boolean> - Whether to reassign an IP address
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - The ID of the request.
+        #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AssignPrivateIpAddresses.html]
+        def assign_private_ip_addresses(network_interface_id, options={})
+
+          if options['PrivateIpAddresses'] && options['SecondaryPrivateIpAddressCount']
+            raise Fog::Compute::AWS::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.")
+          end
+          
+          if private_ip_addresses = options.delete('PrivateIpAddresses')
+            options.merge!(Fog::AWS.indexed_param('PrivateIpAddress.%d', [*private_ip_addresses]))
+          end
+          
+          request({
+            'Action'  => 'AssignPrivateIpAddresses',
+            'NetworkInterfaceId' => network_interface_id,
+            :parser   => Fog::Parsers::Compute::AWS::AssignPrivateIpAddresses.new
+          }.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def assign_private_ip_addresses(network_interface_id, options={})
+          if options['PrivateIpAddresses'] && options['SecondaryPrivateIpAddressCount']
+            raise Fog::Compute::AWS::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.")
+          end
+          
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id,
+            'return' => true
+          }
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/compute/describe_subnets.rb

@@ -46,6 +46,14 @@ module Fog
         def describe_subnets(filters = {})
           subnets = self.data[:subnets]
 
+          # Transition from pending to available
+          subnets.each do |subnet|
+            case subnet['state']
+              when 'pending'
+                subnet['state'] = 'available'
+            end
+          end
+
           if filters['subnet-id']
             subnets = subnets.reject {|subnet| subnet['subnetId'] != filters['subnet-id']}
           end

data/lib/fog/aws/requests/compute/describe_vpcs.rb

@@ -43,6 +43,14 @@ module Fog
         def describe_vpcs(filters = {})
           vpcs = self.data[:vpcs]
 
+          # Transition from pending to available
+          vpcs.each do |vpc|
+            case vpc['state']
+              when 'pending'
+                vpc['state'] = 'available'
+            end
+          end
+
           if filters['vpc-id']
             vpcs = vpcs.reject {|vpc| vpc['vpcId'] != filters['vpc-id']}
           end

data/lib/fog/cloudstack.rb

@@ -8,7 +8,7 @@ module Fog
 
     service(:compute, 'cloudstack/compute','Compute')
 
-    @@digest  = OpenSSL::Digest::Digest.new('sha1')
+    @@digest  = OpenSSL::Digest.new('sha1')
 
     def self.escape(string)
       string = CGI::escape(string)

data/lib/fog/core/connection.rb

@@ -30,8 +30,8 @@ module Fog
         end
         params[:headers] ||= {}
         params[:headers]['User-Agent'] ||= "fog/#{Fog::VERSION}"
+        params.merge!(:persistent => params.fetch(:persistent, persistent))
         @excon = Excon.new(url, params)
-        @persistent = persistent
       end
 
       # Makes a request using the connection using Excon
@@ -53,7 +53,6 @@ module Fog
       # @raise [Excon::Errors::SocketError]
       #
       def request(params, &block)
-        reset unless @persistent
         @excon.request(params, &block)
       end
 

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})

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/core.rb

@@ -28,8 +28,8 @@ require 'fog/core/service'
 require 'fog/core/ssh'
 require 'fog/core/scp'
 require 'fog/core/time'
-require 'fog/core/timeout'
 require 'fog/core/wait_for'
+require 'fog/core/wait_for_defaults'
 require 'fog/core/class_from_string'
 require 'fog/core/uuid'
 

data/lib/fog/google/compute.rb

@@ -76,7 +76,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)
@@ -99,12 +99,14 @@ module Fog
 
         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
@@ -142,7 +144,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" => ""
@@ -161,7 +162,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" => ""
@@ -180,7 +180,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" => ""
@@ -200,7 +199,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" => ""
@@ -215,7 +213,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" => ""
@@ -230,12 +227,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"
                   }
                 }
               }
@@ -250,7 +261,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" => ""
@@ -271,8 +281,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" => [
                       {

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"),