fog 1.35.0 → 1.36.0

data/lib/fog/linode/requests/compute/avail_linodeplans.rb

@@ -56,8 +56,10 @@ module Fog
             "DISK" => 20,
             "CORES" => 1,
             "AVAIL" => {
-              "3"=>48, "2"=>207, "7"=>161, "6"=>143, "4"=>108, "8"=>60
-            }
+              "2" => 500, "3" => 500, "4" => 500, "6" => 500, "7" => 500,
+              "8" => 500, "9" => 500, "10" => 500
+            },
+            "HOURLY" => 0.03
           }
         end
       end

data/lib/fog/linode/requests/compute/avail_nodebalancers.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Compute
+    class Linode
+      class Real
+        # Get NodeBalancer pricing information.
+        #
+        # ==== Parameters
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        #       * 'MONTHLY'<~Float>        - Monthly price
+        #       * 'HOURLY'<~Float>:        - Hourly price
+        #       * 'CONNECTIONS'<~Integer>: - Maximum concurrent connections
+        def avail_nodebalancers
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => { :api_action => 'avail.nodebalancers' }
+          )
+        end
+      end
+
+      class Mock
+        def avail_nodebalancers
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "ERRORARRAY" => [],
+            "ACTION" => "avail.nodebalancers",
+            "DATA" => [{
+              "MONTHLY" => 20.0,
+              "HOURLY" => 0.03,
+              "CONNECTIONS" => 10000
+            }]
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/linode/requests/compute/avail_stackscripts.rb

@@ -14,7 +14,7 @@ module Fog
       end
 
       class Mock
-        def avail_stackscripts(stackscript_id=nil)
+        def avail_stackscripts(options={})
           response = Excon::Response.new
           response.status = 200
 
@@ -22,17 +22,12 @@ module Fog
             "ERRORARRAY" => [],
             "ACTION" => "avail.stackscripts"
           }
-          if stackscript_id
-            mock_stackscript = create_mock_stackscript(stackscript_id)
-            response.body = body.merge("DATA" => [mock_stackscript])
-          else
-            mock_stackscripts = []
-            10.times do
-              stackscript_id = rand(1..200)
-              mock_stackscripts << create_mock_stackscript(stackscript_id)
-            end
-            response.body = body.merge("DATA" => mock_stackscripts)
+          mock_stackscripts = []
+          10.times do
+            stackscript_id = rand(1..200)
+            mock_stackscripts << create_mock_stackscript(stackscript_id)
           end
+          response.body = body.merge("DATA" => mock_stackscripts)
           response
         end
 

data/lib/fog/openstack/core.rb

@@ -154,17 +154,16 @@ module Fog
         @port   = @openstack_management_uri.port
         @scheme = @openstack_management_uri.scheme
 
-        # Not all implementations have identity service in the catalog
-        if @openstack_identity_public_endpoint || @openstack_management_url
-          @identity_connection = Fog::Core::Connection.new(
-            @openstack_identity_public_endpoint || @openstack_management_url,
-            false, @connection_options)
-        end
-
         true
       end
     end
 
+    @@token_cache = {}
+
+    def self.clear_token_cache
+      @@token_cache.clear
+    end
+
     def self.authenticate(options, connection_options = {})
       case options[:openstack_auth_uri].path
       when /v1(\.\d+)?/
@@ -261,9 +260,9 @@ module Fog
         raise Fog::Errors::NotFound, message
       end
 
-      if service['endpoints'].count > 1
-        regions = service["endpoints"].map{ |e| e['region'] }.uniq.join(',')
-        raise Fog::Errors::NotFound.new("Multiple regions available choose one of these '#{regions}'")
+      regions = service["endpoints"].map{ |e| e['region'] }.uniq
+      if regions.count > 1
+        raise Fog::Errors::NotFound.new("Multiple regions available choose one of these '#{regions.join(',')}'")
       end
 
       identity_service = get_service(body, identity_service_type) if identity_service_type
@@ -410,7 +409,7 @@ module Fog
       auth_token  = options[:openstack_auth_token] || options[:unscoped_token]
       uri         = options[:openstack_auth_uri]
 
-      connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
+      @identity_connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
       request_body = {:auth => Hash.new}
 
       if auth_token
@@ -425,7 +424,7 @@ module Fog
       end
       request_body[:auth][:tenantName] = tenant_name if tenant_name
 
-      response = connection.request({
+      response = @identity_connection.request({
         :expects  => [200, 204],
         :headers  => {'Content-Type' => 'application/json'},
         :body     => Fog::JSON.encode(request_body),
@@ -504,17 +503,19 @@ module Fog
       end
       request_body[:auth][:scope] = scope unless scope.empty?
 
-      puts "request_body: #{request_body}" if user_domain=='Default2'
+      path     = (uri.path and not uri.path.empty?) ? uri.path : 'v3'
 
-      response = connection.request({
-                                        :expects => [201],
-                                        :headers => {'Content-Type' => 'application/json'},
-                                        :body => Fog::JSON.encode(request_body),
-                                        :method => 'POST',
-                                        :path => (uri.path and not uri.path.empty?) ? uri.path : 'v2.0'
-                                    })
+      response, expires = @@token_cache[{body: request_body, path: path}]
 
-      puts "response.body: #{response.body}" if user_domain=='Default2'
+      unless response && expires > Time.now
+        response = connection.request({   :expects => [201],
+                                          :headers => {'Content-Type' => 'application/json'},
+                                          :body    => Fog::JSON.encode(request_body),
+                                          :method  => 'POST',
+                                          :path    => path
+                                      })
+        @@token_cache[{body: request_body, path: path}] = response, Time.now + 30 # 30-second TTL, enough for most requests
+      end
 
       [response.headers["X-Subject-Token"], Fog::JSON.decode(response.body)]
     end

data/lib/fog/openstack/models/baremetal/nodes.rb

@@ -27,7 +27,7 @@ module Fog
         alias_method :get, :find_by_uuid
 
         def destroy(uuid)
-          node = self.find_by_id(uuid)
+          node = self.find_by_uuid(uuid)
           node.destroy
         end
 

data/lib/fog/openstack/models/identity_v3/domain.rb

@@ -17,12 +17,14 @@ module Fog
           end
 
           def destroy
+            @@cache.clear if @@cache
             requires :id
             service.delete_domain(self.id)
             true
           end
 
           def update(attr = nil)
+            @@cache.clear if @@cache
             requires :id, :name
             merge_attributes(
                 service.update_domain(self.id, attr || attributes).body['domain'])
@@ -30,12 +32,16 @@ module Fog
           end
 
           def create
+            @@cache.clear if @@cache
             requires :name
             merge_attributes(
                 service.create_domain(attributes).body['domain'])
             self
           end
 
+          def self.use_cache(cache)
+            @@cache = cache
+          end
         end
       end
     end

data/lib/fog/openstack/models/identity_v3/domains.rb

@@ -8,8 +8,20 @@ module Fog
         class Domains < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V3::Domain
 
+          @@cache = {}
+          Fog::Identity::OpenStack::V3::Domain.use_cache(@@cache)
+
           def all(options = {})
-            load_response(service.list_domains(options), 'domains')
+            cached_domain, expires = @@cache[{token: service.auth_token, options: options}]
+            return cached_domain if cached_domain && expires > Time.now
+            domain_to_cache = load_response(service.list_domains(options), 'domains')
+            @@cache[{token: service.auth_token, options: options}] = domain_to_cache, Time.now + 30 # 30-second TTL
+            return domain_to_cache
+          end
+
+          def create(attributes)
+            @@cache.clear if @@cache
+            super(attributes)
           end
 
           def auth_domains(options = {})
@@ -17,14 +29,17 @@ module Fog
           end
 
           def find_by_id(id)
-            cached_domain = self.find { |domain| domain.id == id }
-            return cached_domain if cached_domain
+            cached_domain, expires = @@cache[{token: service.auth_token, id: id}]
+            return cached_domain if cached_domain && expires > Time.now
             domain_hash = service.get_domain(id).body['domain']
-            Fog::Identity::OpenStack::V3::Domain.new(
+            domain_to_cache = Fog::Identity::OpenStack::V3::Domain.new(
                 domain_hash.merge(:service => service))
+            @@cache[{token: service.auth_token, id: id}] = domain_to_cache, Time.now + 30 # 30-second TTL
+            return domain_to_cache
           end
 
           def destroy(id)
+            @@cache.clear if @@cache
             domain = self.find_by_id(id)
             domain.destroy
           end

data/lib/fog/openstack/models/identity_v3/project.rb

@@ -21,12 +21,14 @@ module Fog
           end
 
           def destroy
+            @@cache.clear if @@cache
             requires :id
             service.delete_project(self.id)
             true
           end
 
           def update(attr = nil)
+            @@cache.clear if @@cache
             requires :id
             merge_attributes(
                 service.update_project(self.id, attr || attributes).body['project'])
@@ -34,6 +36,7 @@ module Fog
           end
 
           def create
+            @@cache.clear if @@cache
             merge_attributes(
                 service.create_project(attributes).body['project'])
             self
@@ -45,6 +48,7 @@ module Fog
           end
 
           def grant_role_to_user(role_id, user_id)
+            @@cache.clear if @@cache
             requires :id
             service.grant_project_user_role(self.id, user_id, role_id)
           end
@@ -60,6 +64,7 @@ module Fog
           end
 
           def revoke_role_from_user(role_id, user_id)
+            @@cache.clear if @@cache
             requires :id
             service.revoke_project_user_role(self.id, user_id, role_id)
           end
@@ -70,6 +75,7 @@ module Fog
           end
 
           def grant_role_to_group(role_id, group_id)
+            @@cache.clear if @@cache
             requires :id
             service.grant_project_group_role(self.id, group_id, role_id)
           end
@@ -85,10 +91,14 @@ module Fog
           end
 
           def revoke_role_from_group(role_id, group_id)
+            @@cache.clear if @@cache
             requires :id
             service.revoke_project_group_role(self.id, group_id, role_id)
           end
 
+          def self.use_cache(cache)
+            @@cache = cache
+          end
         end
       end
     end

data/lib/fog/openstack/models/identity_v3/projects.rb

@@ -8,8 +8,20 @@ module Fog
         class Projects < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V3::Project
 
+          @@cache = {}
+          Fog::Identity::OpenStack::V3::Project.use_cache(@@cache)
+
           def all(options = {})
-            load_response(service.list_projects(options), 'projects')
+            cached_project, expires = @@cache[{token: service.auth_token, options: options}]
+            return cached_project if cached_project && expires > Time.now
+            project_to_cache = load_response(service.list_projects(options), 'projects')
+            @@cache[{token: service.auth_token, options: options}] = project_to_cache, Time.now + 30 # 30-second TTL
+            return project_to_cache
+          end
+
+          def create(attributes)
+            @@cache.clear if @@cache
+            super(attributes)
           end
 
           def auth_projects(options = {})
@@ -20,8 +32,8 @@ module Fog
             if options.is_a? Symbol # Deal with a single option being passed on its own
               options = [options]
             end
-            cached_project = self.find { |project| project.id == id } if options.empty?
-            return cached_project if cached_project
+            cached_project, expires = @@cache[{token: service.auth_token, id: id, options: options}]
+            return cached_project if cached_project && expires > Time.now
             project_hash = service.get_project(id, options).body['project']
             top_project = project_from_hash(project_hash, service)
             if options.include? :subtree_as_list
@@ -30,6 +42,7 @@ module Fog
             if options.include? :parents_as_list
               top_project.parents.map! {|proj_hash| project_from_hash(proj_hash['project'], service)}
             end
+            @@cache[{token: service.auth_token, id: id, options: options}] = top_project, Time.now + 30 # 30-second TTL
             return top_project
           end
 

data/lib/fog/openstack/models/identity_v3/tokens.rb

@@ -10,6 +10,7 @@ module Fog
 
 
           def authenticate(auth)
+            @@cache ||= {}
             response = service.token_authenticate(auth)
             token_hash = response.body['token']
             Fog::Identity::OpenStack::V3::Token.new(

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

@@ -26,6 +26,13 @@ module Fog
         # @see http://docs.openstack.org/developer/swift/overview_expiring_objects.html
         attribute :delete_after, :aliases => ['X-Delete-After']
 
+        # @!attribute [rw] content_encoding
+        # When you create an object or update its metadata, you can optionally set the Content-Encoding metadata. 
+        # This metadata enables you to indicate that the object content is compressed without losing the identity of the 
+        # underlying media type (Content-Type) of the file, such as a video.
+        # @see http://docs.openstack.org/developer/swift/api/use_content-encoding_metadata.html#use-content-encoding-metadata
+        attribute :content_encoding, :aliases => 'Content-Encoding'
+
         def body
           attributes[:body] ||= if last_modified
             collection.get(identity).body
@@ -47,6 +54,7 @@ module Fog
           options['Content-Type'] ||= content_type if content_type
           options['Access-Control-Allow-Origin'] ||= access_control_allow_origin if access_control_allow_origin
           options['Origin'] ||= origin if origin
+          options['Content-Encoding'] ||= content_encoding if content_encoding          
           service.copy_object(directory.key, key, target_directory_key, target_file_key, options)
           target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.get(target_file_key)
@@ -101,6 +109,7 @@ module Fog
           options['Origin'] = origin if origin
           options['X-Delete-At'] = delete_at if delete_at
           options['X-Delete-After'] = delete_after if delete_after
+          options['Content-Encoding'] = content_encoding if content_encoding          
           options.merge!(metadata_to_headers)
 
           data = service.put_object(directory.key, key, body, options)

data/lib/fog/openstack/requests/baremetal/delete_node.rb

@@ -3,7 +3,7 @@ module Fog
     class OpenStack
       class Real
         def delete_node(node_uuid)
-          data = { :node_uuid => node_uuid }
+          data = { :node_ident => node_uuid }
           request(
               :body => Fog::JSON.encode(data),
               :expects  => [200, 204],

data/lib/fog/rackspace/requests/load_balancers/create_node.rb

@@ -15,7 +15,7 @@ module Fog
             data['nodes'][0]['weight'] = options[:weight]
           end
           if options.key? :type
-            data['node']['type'] = options[:type]
+            data['nodes'][0]['type'] = options[:type]
           end
           request(
             :body     => Fog::JSON.encode(data),

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.35.0'
+  VERSION = '1.36.0'
 end

data/lib/fog/vsphere/compute.rb

@@ -22,6 +22,8 @@ module Fog
       collection :interfacetypes
       model :volume
       collection :volumes
+      model :snapshot
+      collection :snapshots
       model :template
       collection :templates
       model :cluster
@@ -39,6 +41,7 @@ module Fog
       model :customfield
       collection :customfields
       model :scsicontroller
+      model :process
 
       request_path 'fog/vsphere/requests/compute'
       request :current_time
@@ -86,6 +89,11 @@ module Fog
       request :list_customfields
       request :get_vm_first_scsi_controller
       request :set_vm_customvalue
+      request :vm_take_snapshot
+      request :list_vm_snapshots
+      request :list_child_snapshots
+      request :revert_to_snapshot
+      request :list_processes
 
       module Shared
         attr_reader :vsphere_is_vcenter