fog 1.16.0 → 1.17.0

data/lib/fog/core/service.rb

@@ -211,7 +211,7 @@ module Fog
         unless recognizes.empty?
           unrecognized = options.keys - requirements - recognized
           unless unrecognized.empty?
-            raise ArgumentError, "Unrecognized arguments: #{unrecognized.join(', ')}"
+            Fog::Logger.warning("Unrecognized arguments: #{unrecognized.join(', ')}")
           end
         end
       end

data/lib/fog/google/README.md

@@ -8,7 +8,7 @@ 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 [v1beta15](https://developers.google.com/compute/docs/reference/v1beta15/) of the GCE API.
+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.
 
 Our implementation of the API currently supports 
 
@@ -23,6 +23,6 @@ Features we are looking forward to implementing in the future:
  * Global Metadata support
  * Image creation
 
-v1beta15 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.
+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.
 
 Thanks!

data/lib/fog/google/compute.rb

@@ -42,6 +42,7 @@ module Fog
       request :insert_image
       request :insert_network
       request :insert_server
+      request :insert_snapshot
 
       request :set_metadata
 
@@ -763,7 +764,7 @@ module Fog
 
         def initialize(options)
           base_url = 'https://www.googleapis.com/compute/'
-          api_version = 'v1beta15'
+          api_version = 'v1beta16'
           api_scope_url = 'https://www.googleapis.com/auth/compute'
 
           @project = options[:google_project]

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

@@ -5,5 +5,5 @@ def test
   server.wait_for { sshable? }
 
   raise "Could not bootstrap sshable server." unless server.ssh("whoami")
-  raise "Cloud note delete server." unless server.destroy
+  raise "Could not delete server." unless server.destroy
 end

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

@@ -19,9 +19,8 @@ def test
   if custom_img_name
     # puts 'Fetching a single image from the custom project'
     # puts '----------------------------------------------'
-    img = connection.images.get(custom_img_name)
+    img = connection.images.get(custom_img_name.name)
     raise 'Could not GET the (custom) image' unless img
     # puts img.inspect
   end
-
 end

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

@@ -18,4 +18,6 @@ def test
 
   # The network won't have any firewall rules, so we won't be able to ssh in.
   server.wait_for { ready? }
+
+  raise "Could not delete server." unless server.destroy
 end

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

@@ -84,6 +84,29 @@ module Fog
           self
         end
 
+        def create_snapshot(snap_name, snap_desc)
+          requires :name
+          requires :zone_name
+
+          if snap_name.nil? or snap_name.empty?
+            raise ArgumentError, 'Invalid snapshot name'
+          end
+
+          options = {
+            'name'        => snap_name,
+            'description' => snap_desc,
+          }
+
+          service.insert_snapshot(name, self.zone, service.project, options)
+          data = service.backoff_if_unfound {
+            service.get_snapshot(snap_name, service.project).body
+          }
+          service.snapshots.merge_attributes(data)
+
+          # Try to return the representation of the snapshot we created
+          service.snapshots.get(snap_name)
+        end
+
         RUNNING_STATE = "READY"
 
       end

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

@@ -15,6 +15,7 @@ module Fog
         attribute :source_disk       , :aliases => 'sourceDisk'
         attribute :source_disk_id    , :aliases => 'sourceDiskId'
         attribute :description
+        attribute :status
 
         def reload
           requires :name

data/lib/fog/google/requests/compute/insert_server.rb

@@ -125,7 +125,7 @@ module Fog
           if ! network.nil?
             networkInterface = { 'network' => @api_url + @project + "/global/networks/#{network}" }
             if external_ip
-              networkInterface['accessConfigs'] = [{'type' => 'ONE_TO_ONE_NAT', 'name' => 'External NAT'}]
+              networkInterface['accessConfigs'] = [{'type' => 'ONE_TO_ONE_NAT', 'name' => 'External NAT', 'natIP' => external_ip}]
             end
             networkInterfaces <<  networkInterface
           end

data/lib/fog/google/requests/compute/insert_snapshot.rb

@@ -0,0 +1,49 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def insert_snapshot(snap_name)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def insert_snapshot(disk_name, zone_name, project=@project, opts={})
+
+          # This is unfortunate, since we might be called from 2 contexts
+          # 1. disk.snapshot <-- here validation of disk_name is not needed
+          # 2. snapshot.create <-- here we must validate the disk_name
+          #
+          # Validation would involve 'get'ing the disk by that name. This is
+          # redundant (and expensive) for case (1) which is likely the common
+          # codepath. So we won't do it.
+
+          api_method = @compute.disks.create_snapshot
+
+          parameters = {
+            'disk'    => disk_name,
+            'zone'    => zone_name,
+            'project' => @project,
+          }
+
+          snap_name = opts.delete('name')
+          raise ArgumentError.new('Must specify snapshot name') unless snap_name
+          body_object = { 'name' => snap_name }
+
+          # Merge in any remaining options (description)
+          body_object.merge(opts)
+
+          result = self.build_result(api_method, parameters,
+                                     body_object)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/storage.rb

@@ -61,6 +61,39 @@ module Fog
           "#{params[:host]}/#{params[:path]}?#{query.join('&')}"
         end
 
+        def request_params(params)
+          subdomain = params[:host].split(".#{@host}").first
+          unless subdomain =~ /^(?!goog)(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+            if subdomain =~ /_/
+              # https://github.com/fog/fog/pull/1258#issuecomment-10248620.
+              Fog::Logger.warning("fog: the specified google storage bucket name (#{subdomain}) is not DNS compliant (only characters a through z, digits 0 through 9, and the hyphen).")
+            else
+              # - Bucket names must contain only lowercase letters, numbers, dashes (-), underscores (_), and dots (.). Names containing dots require verification.
+              # - Bucket names must start and end with a number or letter.
+              # - Bucket names must contain 3 to 63 characters. Names containing dots can contain up to 222 characters, but each dot-separated component can be no longer than 63 characters.
+              # - Bucket names cannot be represented as an IP address in dotted-decimal notation (for example, 192.168.5.4).
+              # - Bucket names cannot begin with the "goog" prefix.
+              # - Also, for DNS compliance, you should not have a period adjacent to another period or dash. For example, ".." or "-." or ".-" are not acceptable.
+              Fog::Logger.warning("fog: the specified google storage bucket name (#{subdomain}) is not a valid dns name.  See: https://developers.google.com/storage/docs/bucketnaming")
+            end
+            params[:host] = params[:host].split("#{subdomain}.")[-1]
+            if params[:path]
+              params[:path] = "#{subdomain}/#{params[:path]}"
+            else
+              params[:path] = "#{subdomain}"
+            end
+            subdomain = nil
+          end
+
+          if subdomain && subdomain != @host
+            params[:subdomain] = subdomain
+          end
+
+          params[:scheme] ||= @scheme
+          params[:port]   ||= @port
+          params
+        end
+
       end
 
       class Mock
@@ -193,11 +226,10 @@ module Fog
           @persistent = options.fetch(:persistent, true)
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def reload
-          @connection.reset
+          @connection.reset if @connection
         end
 
         def signature(params)
@@ -222,31 +254,8 @@ DATA
           end
           string_to_sign << "#{canonical_google_headers}"
 
-          subdomain = params[:host].split(".#{@host}").first
-          unless subdomain =~ /^(?!goog)(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
-            if subdomain =~ /_/
-              # https://github.com/fog/fog/pull/1258#issuecomment-10248620.
-              Fog::Logger.warning("fog: the specified google storage bucket name (#{subdomain}) is not DNS compliant (only characters a through z, digits 0 through 9, and the hyphen).")
-            else
-              # - Bucket names must contain only lowercase letters, numbers, dashes (-), underscores (_), and dots (.). Names containing dots require verification.
-              # - Bucket names must start and end with a number or letter.
-              # - Bucket names must contain 3 to 63 characters. Names containing dots can contain up to 222 characters, but each dot-separated component can be no longer than 63 characters.
-              # - Bucket names cannot be represented as an IP address in dotted-decimal notation (for example, 192.168.5.4).
-              # - Bucket names cannot begin with the "goog" prefix.
-              # - Also, for DNS compliance, you should not have a period adjacent to another period or dash. For example, ".." or "-." or ".-" are not acceptable.
-              Fog::Logger.warning("fog: the specified google storage bucket name (#{subdomain}) is not a valid dns name.  See: https://developers.google.com/storage/docs/bucketnaming")
-            end
-            params[:host] = params[:host].split("#{subdomain}.")[-1]
-            if params[:path]
-              params[:path] = "#{subdomain}/#{params[:path]}"
-            else
-              params[:path] = "#{subdomain}"
-            end
-            subdomain = nil
-          end
-
           canonical_resource  = "/"
-          unless subdomain.nil? || subdomain == @host
+          if subdomain = params.delete(:subdomain)
             canonical_resource << "#{CGI.escape(subdomain).downcase}/"
           end
           canonical_resource << "#{params[:path]}"
@@ -263,16 +272,32 @@ DATA
           Base64.encode64(signed_string).chomp!
         end
 
+        def connection(scheme, host, port)
+          uri = "#{scheme}://#{host}:#{port}"
+          if @persistent
+            unless uri == @connection_uri
+              @connection_uri = uri
+              reload
+              @connection = nil
+            end
+          else
+            @connection = nil
+          end
+          @connection ||= Fog::Connection.new(uri, @persistent, @connection_options)
+        end
 
         private
 
         def request(params, &block)
+          params = request_params(params)
+          scheme = params.delete(:scheme)
+          host   = params.delete(:host)
+          port   = params.delete(:port)
+
           params[:headers]['Date'] = Fog::Time.now.to_date_header
           params[:headers]['Authorization'] = "GOOG1 #{@google_storage_access_key_id}:#{signature(params)}"
 
-          response = @connection.request(params, &block)
-
-          response
+          connection(scheme, host, port).request(params, &block)
         end
       end
     end

data/lib/fog/hp.rb

@@ -85,8 +85,6 @@ module Fog
           'X-Auth-Key'  => @hp_secret_key,
           'X-Auth-User' => @hp_access_key
         },
-        :host     => @host,
-        :port     => @port,
         :method   => 'GET',
         :path     => @auth_path
       })
@@ -162,8 +160,6 @@ module Fog
           :headers => {
               'Content-Type' => 'application/json'
           },
-          :host => @host,
-          :port => @port,
           :method => 'POST',
           :body => Fog::JSON.encode(request_body),
           :path => @auth_path

data/lib/fog/hp/block_storage.rb

@@ -5,7 +5,7 @@ module Fog
     class BlockStorage < Fog::Service
 
       requires    :hp_secret_key, :hp_tenant_id, :hp_avl_zone
-      recognizes  :hp_auth_uri
+      recognizes  :hp_auth_uri, :hp_service_type
       recognizes  :persistent, :connection_options
       recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
       recognizes  :hp_access_key, :hp_account_id  # :hp_account_id is deprecated use hp_access_key instead
@@ -109,7 +109,7 @@ module Fog
           auth_version = auth_version.to_s.downcase.to_sym
 
           ### Pass the service name for object storage to the authentication call
-          options[:hp_service_type] = "Block Storage"
+          options[:hp_service_type] ||= "Block Storage"
           @hp_tenant_id = options[:hp_tenant_id]
           @hp_avl_zone  = options[:hp_avl_zone]
 

data/lib/fog/hp/cdn.rb

@@ -6,7 +6,7 @@ module Fog
     class HP < Fog::Service
 
       requires    :hp_secret_key, :hp_tenant_id, :hp_avl_zone
-      recognizes  :hp_auth_uri, :hp_cdn_uri
+      recognizes  :hp_auth_uri, :hp_cdn_uri, :hp_service_type
       recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
       recognizes  :persistent, :connection_options
       recognizes  :hp_access_key, :hp_account_id  # :hp_account_id is deprecated use hp_access_key instead
@@ -84,7 +84,7 @@ module Fog
           auth_version = auth_version.to_s.downcase.to_sym
 
           ### Pass the service name for object storage to the authentication call
-          options[:hp_service_type] = "CDN"
+          options[:hp_service_type] ||= "CDN"
           @hp_tenant_id = options[:hp_tenant_id]
 
           ### Make the authentication call

data/lib/fog/hp/compute.rb

@@ -6,7 +6,7 @@ module Fog
     class HP < Fog::Service
 
       requires    :hp_secret_key, :hp_tenant_id, :hp_avl_zone
-      recognizes  :hp_auth_uri
+      recognizes  :hp_auth_uri, :hp_service_type
       recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
       recognizes  :persistent, :connection_options
       recognizes  :hp_access_key, :hp_account_id  # :hp_account_id is deprecated use hp_access_key instead
@@ -193,7 +193,7 @@ module Fog
           auth_version = auth_version.to_s.downcase.to_sym
           
           ### Pass the service name for compute via the options hash
-          options[:hp_service_type] = "Compute"
+          options[:hp_service_type] ||= "Compute"
           @hp_tenant_id = options[:hp_tenant_id]
 
           ### Make the authentication call

data/lib/fog/hp/storage.rb

@@ -6,11 +6,11 @@ module Fog
     class HP < Fog::Service
 
       requires    :hp_secret_key, :hp_tenant_id, :hp_avl_zone
-      recognizes  :hp_auth_uri, :hp_cdn_ssl, :hp_cdn_uri
+      recognizes  :hp_auth_uri, :hp_cdn_ssl, :hp_cdn_uri, :hp_service_type
       recognizes  :persistent, :connection_options
       recognizes  :hp_use_upass_auth_style, :hp_auth_version, :user_agent
       recognizes  :hp_access_key, :hp_account_id  # :hp_account_id is deprecated use hp_access_key instead
-      
+
       # :os_account_meta_temp_url_key is an OpenStack specific setting used to generate temporary urls.
       recognizes  :os_account_meta_temp_url_key
 
@@ -321,7 +321,7 @@ module Fog
           auth_version = auth_version.to_s.downcase.to_sym
           
           ### Pass the service name for object storage to the authentication call
-          options[:hp_service_type] = "Object Storage"
+          options[:hp_service_type] ||= "Object Storage"
           @hp_tenant_id = options[:hp_tenant_id]
           @hp_avl_zone  = options[:hp_avl_zone]
           @os_account_meta_temp_url_key = options[:os_account_meta_temp_url_key]

data/lib/fog/linode/compute.rb

@@ -95,7 +95,7 @@ module Fog
           params[:query] ||= {}
           params[:query].merge!(:api_key => @linode_api_key)
 
-          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/linode/dns.rb

@@ -70,7 +70,7 @@ module Fog
           params[:query] ||= {}
           params[:query].merge!(:api_key => @linode_api_key)
 
-          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/rackspace/block_storage.rb

@@ -26,8 +26,6 @@ module Fog
 
       model :volume_type
       collection :volume_types
-      model :snapshot
-      collection :snapshots
 
       model :snapshot
       collection :snapshots

data/lib/fog/vcloud_director/compute.rb

@@ -187,7 +187,7 @@ module Fog
       request :get_vm_pending_question
       request :get_vms
       request :get_vms_by_metadata
-      request :get_vms_disks_attached_to
+      request :get_vms_disk_attached_to
       request :get_vms_in_lease_from_query
       request :instantiate_vapp_template # to be deprecated
       request :post_acquire_ticket
@@ -231,6 +231,7 @@ module Fog
       request :post_update_vapp_metadata
       request :post_update_vapp_template_metadata
       request :post_upgrade_hw_version
+      request :post_upload_disk
       request :post_upload_media
       request :post_upload_vapp_template
       request :put_catalog_item_metadata_item_metadata
@@ -482,11 +483,27 @@ module Fog
                   :name => 'vAppTemplate 1'
                 }
               },
+              :disks => {},
               :edge_gateways => {
                 uuid => {
                   :name => 'MockEdgeGateway',
                   :networks => [uplink_network_uuid, default_network_uuid],
-                  :vdc => vdc_uuid
+                  :vdc => vdc_uuid,
+                  :Configuration => {
+                    :GatewayBackingConfig => "compact",
+                    :GatewayInterfaces => {
+                      :GatewayInterface => []},
+                    :EdgeGatewayServiceConfiguration => {
+                      :FirewallService => {
+                        :IsEnabled => "true",
+                        :DefaultAction => "drop",
+                        :LogDefaultAction => "false",
+                        :FirewallRule => []
+                      },
+                      :NatService => {:IsEnabled => "true"}},
+                    :HaEnabled => "false",
+                    :UseDefaultRouteForDnsRelay => "false"
+                  }
                 }
               },
               :medias => {},
@@ -612,6 +629,63 @@ module Fog
           [8,4,4,4,12].map {|i| Fog::Mock.random_hex(i)}.join('-')
         end
 
+        # Create a task.
+        #
+        # @param [String] operation A message describing the operation that is
+        #   tracked by this task.
+        # @param [String] operation_name The short name of the operation that
+        #   is tracked by this task.
+        # @param [Hash] owner Reference to the owner of the task. This is
+        #   typically the object that the task is creating or updating.
+        #   * :href<~String> - Contains the URI to the entity.
+        #   * :type<~String> - Contains the MIME type of the entity.
+        # @return [String] Object identifier of the task.
+        def enqueue_task(operation, operation_name, owner, options={})
+          task_id = uuid
+          now = DateTime.now
+
+          data[:tasks][task_id] = {
+            :cancel_requested => false,
+            :details => '',
+            :expiry_time => now + 86400, # in 24 hours
+            :name => 'task',
+            :progress => 1,
+            :service_namespace => 'com.vmware.vcloud',
+            :start_time => now,
+            :status => 'running',
+          }.merge(options).merge(
+            :operation => operation,
+            :operation_name => operation_name,
+            :owner => owner
+          )
+
+          task_id
+        end
+
+        # @note As far as this method is concerned, the only possible task
+        #   states are 'running' and 'success'.
+        #
+        # @param [Hash] response_body
+        # @return [Boolean]
+        def process_task(response_body)
+          task_id = response_body[:href].split('/').last
+          task = data[:tasks][task_id]
+
+          if task[:status] == 'running'
+            task[:end_time] = DateTime.now
+            task[:progress] = 100
+            task[:status] = 'success'
+
+            if task[:on_success]
+              task[:on_success].call
+              task.delete(:on_success)
+            end
+          end
+
+          return true if task[:status] == 'success'
+          raise TaskError.new "status: #{task[:status]}, error: #{task[:Error]}"
+        end
+
         def add_id_from_href!(data={})
           data[:id] = data[:href].split('/').last
         end