fog 1.36.0 → 1.37.0

data/lib/fog/openstack/docs/compute.md

@@ -297,7 +297,7 @@ This returns a collection of `Fog::Compute::OpenStack::Flavor` models:
 
 To retrieve individual flavor:
 
-	service.flavor.get 1
+	service.flavors.get 1
 
 This returns a `Fog::Compute::OpenStack::Flavor` instance:
 

data/lib/fog/openstack/identity.rb

@@ -22,43 +22,6 @@ module Fog
         @openstack_auth_uri && @openstack_auth_uri.path =~ /\/v3/
       end
 
-      module Common
-        attr_reader :unscoped_token
-
-        include Fog::OpenStack::Core
-
-        def request(params)
-          retried = false
-          begin
-            response = @connection.request(params.merge({
-              :headers => params.fetch(:headers,{}).merge({
-                'Content-Type' => 'application/json',
-                'Accept' => 'application/json',
-                'X-Auth-Token' => @auth_token
-              }),
-              :path => "#{@path}/#{params[:path]}"
-            }))
-          rescue Excon::Errors::Unauthorized => error
-            raise if retried
-            retried = true
-
-            @openstack_must_reauthenticate = true
-            authenticate
-            retry
-          rescue Excon::Errors::HTTPStatusError => error
-            raise case error
-                    when Excon::Errors::NotFound
-                      Fog::Identity::OpenStack::NotFound.slurp(error)
-                    else
-                      error
-                  end
-          end
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
-        end
-      end
     end
   end
 end

data/lib/fog/openstack/identity_v2.rb

@@ -1,4 +1,5 @@
 require 'fog/openstack/core'
+require 'fog/openstack/common'
 require 'fog/openstack/identity'
 
 module Fog
@@ -15,7 +16,8 @@ module Fog
                    :openstack_endpoint_type,
                    :openstack_project_name, :openstack_project_id,
                    :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
-                   :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id
+                   :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
+                   :openstack_identity_prefix
 
         model_path 'fog/openstack/models/identity_v2'
         model :tenant
@@ -170,13 +172,17 @@ module Fog
         end
 
         class Real
-          include Fog::Identity::OpenStack::Common
+          def self.not_found_class
+            Fog::Identity::OpenStack::NotFound
+          end
+          include Fog::OpenStack::Common
 
           def initialize(options={})
             initialize_identity options
 
             @openstack_service_type   = options[:openstack_service_type] || ['identity']
             @openstack_service_name   = options[:openstack_service_name]
+            @identity_prefix          = options[:openstack_identity_prefix] ? "/#{options[:openstack_identity_prefix]}" : nil
 
             @connection_options       = options[:connection_options] || {}
 
@@ -185,7 +191,7 @@ module Fog
             authenticate
 
             @persistent = options[:persistent] || false
-            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}#{@identity_prefix}", @persistent, @connection_options)
           end
         end
       end

data/lib/fog/openstack/identity_v3.rb

@@ -1,4 +1,5 @@
 require 'fog/openstack/core'
+require 'fog/openstack/common'
 require 'fog/openstack/identity'
 
 module Fog
@@ -14,7 +15,7 @@ module Fog
                    :openstack_user_domain_id, :openstack_project_domain_id,
                    :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username,
                    :current_user, :current_user_id, :current_tenant,
-                   :provider
+                   :provider, :openstack_identity_prefix
 
         model_path 'fog/openstack/models/identity_v3'
         model :domain
@@ -148,13 +149,17 @@ module Fog
         end
 
         class Real
-          include Fog::Identity::OpenStack::Common
+          def self.not_found_class
+            Fog::Identity::OpenStack::NotFound
+          end
+          include Fog::OpenStack::Common
 
           def initialize(options={})
             initialize_identity options
 
             @openstack_service_type   = options[:openstack_service_type] || ['identity_v3','identityv3','identity']
             @openstack_service_name   = options[:openstack_service_name]
+            @identity_prefix          = options[:openstack_identity_prefix] ? "/#{options[:openstack_identity_prefix]}" : nil
 
             @connection_options       = options[:connection_options] || {}
 
@@ -164,7 +169,7 @@ module Fog
             authenticate
 
             @persistent = options[:persistent] || false
-            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}#{@identity_prefix}", @persistent, @connection_options)
           end
         end
       end

data/lib/fog/openstack/image.rb

@@ -4,7 +4,7 @@ module Fog
   module Image
     class OpenStack < Fog::Service
 
-      # Fog::Image::OpenStack.new() will return a Fog::Image::OpenStack::V2 or a Fog::Image::OpenStack::V3,
+      # Fog::Image::OpenStack.new() will return a Fog::Image::OpenStack::V2 or a Fog::Image::OpenStack::V1,
       #  choosing the latest available
       def self.new(args = {})
         @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url]
@@ -17,46 +17,6 @@ module Fog
         service
       end
 
-      module Common
-        attr_reader :unscoped_token
-
-        include Fog::OpenStack::Core
-
-        def request(params)
-          retried = false
-          begin
-            std_headers = {
-                'Content-Type' => 'application/json',
-                'Accept' => 'application/json',
-                'X-Auth-Token' => @auth_token
-            }
-            param_headers = params.fetch(:headers,{})
-
-            response = @connection.request(params.merge({
-              :headers => std_headers.merge(param_headers),
-              :path => "#{@path}/#{params[:path]}"
-            }))
-          rescue Excon::Errors::Unauthorized => error
-            raise if retried
-            retried = true
-
-            @openstack_must_reauthenticate = true
-            authenticate
-            retry
-          rescue Excon::Errors::HTTPStatusError => error
-            raise case error
-                    when Excon::Errors::NotFound
-                      Fog::Image::OpenStack::NotFound.slurp(error)
-                    else
-                      error
-                  end
-          end
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body) unless params[:raw_body]
-          end
-          response
-        end
-      end
     end
   end
 end

data/lib/fog/openstack/image_v1.rb

@@ -1,3 +1,4 @@
+require 'fog/openstack/common'
 require 'fog/openstack/core'
 require 'fog/openstack/image'
 
@@ -17,7 +18,8 @@ module Fog
                    :openstack_endpoint_type,
                    :openstack_project_name, :openstack_project_id,
                    :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
-                   :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id
+                   :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
+                   :openstack_identity_prefix
 
         model_path 'fog/openstack/models/image_v1'
 
@@ -98,8 +100,12 @@ module Fog
 
         class Real
           include Fog::OpenStack::Core
-          include Fog::Image::OpenStack::Common
-          
+
+          def self.not_found_class
+            Fog::Image::OpenStack::NotFound
+          end
+          include Fog::OpenStack::Common
+
           def initialize(options={})
             initialize_identity options
 

data/lib/fog/openstack/image_v2.rb

@@ -1,3 +1,4 @@
+require 'fog/openstack/common'
 require 'fog/openstack/core'
 require 'fog/openstack/image'
 
@@ -17,7 +18,8 @@ module Fog
                    :openstack_endpoint_type,
                    :openstack_project_name, :openstack_project_id,
                    :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
-                   :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id
+                   :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
+                   :openstack_identity_prefix
 
         model_path 'fog/openstack/models/image_v2'
 
@@ -104,7 +106,10 @@ module Fog
 
         class Real
           include Fog::OpenStack::Core
-          include Fog::Image::OpenStack::Common
+          def self.not_found_class
+            Fog::Image::OpenStack::NotFound
+          end
+          include Fog::OpenStack::Common
 
           def initialize(options={})
             initialize_identity options

data/lib/fog/openstack/metering.rb

@@ -12,7 +12,8 @@ module Fog
                  :openstack_endpoint_type,
                  :openstack_project_name, :openstack_project_id,
                  :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
-                 :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id
+                 :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
+                 :openstack_identity_prefix
 
       model_path 'fog/openstack/models/metering'
 

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

@@ -292,6 +292,11 @@ module Fog
           service.live_migrate_server(id, host, block_migration, disk_over_commit)
         end
 
+        def evacuate(host, on_shared_storage, admin_password = nil)
+          requires :id
+          service.evacuate_server(id, host, on_shared_storage, admin_password)
+        end
+
         def associate_address(floating_ip)
           requires :id
           service.associate_address id, floating_ip

data/lib/fog/openstack/models/identity_v2/user.rb

@@ -22,7 +22,7 @@ module Fog
 
           def save
             raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
-            requires :name, :tenant_id, :password
+            requires :name
             enabled = true if enabled.nil?
             data = service.create_user(name, password, email, tenant_id, enabled)
             merge_attributes(data.body['user'])
@@ -56,7 +56,11 @@ module Fog
           end
 
           def roles(tenant_id = self.tenant_id)
-            service.list_roles_for_user_on_tenant(tenant_id, self.id).body['roles']
+            if tenant_id
+              service.list_roles_for_user_on_tenant(tenant_id, self.id).body['roles']
+            else
+              []
+            end
           end
         end # class User
       end # class V2

data/lib/fog/openstack/models/volume/availability_zone.rb

@@ -4,10 +4,7 @@ module Fog
   module Volume
     class OpenStack
       class AvailabilityZone < Fog::OpenStack::Model
-        identity :zoneName
-
-        attribute :zoneState
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/volume/availability_zones.rb

@@ -1,12 +1,9 @@
 require 'fog/openstack/models/collection'
-require 'fog/openstack/models/volume/availability_zone'
 
 module Fog
   module Volume
     class OpenStack
-      class AvailabilityZones < Fog::OpenStack::Collection
-        model Fog::Volume::OpenStack::AvailabilityZone
-
+      module AvailabilityZones
         def all(options = {})
           data = service.list_zones(options)
           load_response(data, 'availabilityZoneInfo')

data/lib/fog/openstack/models/volume/transfer.rb

@@ -4,13 +4,6 @@ module Fog
   module Volume
     class OpenStack
       class Transfer < Fog::OpenStack::Model
-        identity :id
-
-        attribute :auth_key,    :aliases => 'authKey'
-        attribute :created_at,  :aliases => 'createdAt'
-        attribute :name
-        attribute :volume_id,   :aliases => 'volumeId'
-
         def save
           requires :name, :volume_id
           data = service.create_transfer(volume_id, :name => name)
@@ -29,8 +22,7 @@ module Fog
           prepare_service_value(attributes)
           super
         end
-
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/volume/transfers.rb

@@ -1,11 +1,9 @@
 require 'fog/openstack/models/collection'
-require 'fog/openstack/models/volume/transfer'
 
 module Fog
   module Volume
     class OpenStack
-      class Transfers < Fog::OpenStack::Collection
-        model Fog::Volume::OpenStack::Transfer
+      module Transfers
 
         def all(options = {})
           load_response(service.list_transfers_detailed(options), 'transfers')
@@ -31,7 +29,6 @@ module Fog
             new(transfer)
           end
         end
-
       end
     end
   end

data/lib/fog/openstack/models/volume/volume.rb

@@ -4,28 +4,16 @@ module Fog
   module Volume
     class OpenStack
       class Volume < Fog::OpenStack::Model
-        identity :id
-
-        attribute :display_name,        :aliases => 'displayName'
-        attribute :display_description, :aliases => 'displayDescription'
         attribute :metadata
         attribute :status
         attribute :size
-        attribute :volume_type,         :aliases => ['volumeType', 'type']
-        attribute :snapshot_id,         :aliases => 'snapshotId'
-        attribute :imageRef,            :aliases => 'image_id'
-        attribute :availability_zone,   :aliases => 'availabilityZone'
-        attribute :created_at,          :aliases => 'createdAt'
+        attribute :volume_type, :aliases => ['volumeType', 'type']
+        attribute :snapshot_id, :aliases => 'snapshotId'
+        attribute :imageRef, :aliases => 'image_id'
+        attribute :availability_zone, :aliases => 'availabilityZone'
+        attribute :created_at, :aliases => 'createdAt'
         attribute :attachments
         attribute :source_volid
-        attribute :tenant_id,           :aliases => 'os-vol-tenant-attr:tenant_id'
-
-        def save
-          requires :display_name, :size
-          data = service.create_volume(display_name, display_description, size, attributes)
-          merge_attributes(data.body['volume'])
-          true
-        end
 
         def destroy
           requires :id
@@ -45,4 +33,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/volume/volume_type.rb

@@ -4,10 +4,7 @@ module Fog
   module Volume
     class OpenStack
       class VolumeType < Fog::OpenStack::Model
-        identity :id
 
-        attribute :name
-        attribute :volume_backend_name
         attribute :extra_specs
 
         def create

data/lib/fog/openstack/models/volume/volume_types.rb

@@ -1,12 +1,9 @@
 require 'fog/openstack/models/collection'
-require 'fog/openstack/models/volume/volume_type'
 
 module Fog
   module Volume
     class OpenStack
-      class VolumeTypes < Fog::OpenStack::Collection
-        model Fog::Volume::OpenStack::VolumeType
-
+      module VolumeTypes
         def all(options = {})
           response = service.list_volume_types(options)
           load_response(response, 'volume_types')

data/lib/fog/openstack/models/volume/volumes.rb

@@ -1,12 +1,9 @@
 require 'fog/openstack/models/collection'
-require 'fog/openstack/models/volume/volume'
 
 module Fog
   module Volume
     class OpenStack
-      class Volumes < Fog::OpenStack::Collection
-        model Fog::Volume::OpenStack::Volume
-
+      module Volumes
         def all(options = {})
           # the parameter has been "detailed = true" before. Make sure we are
           # backwards compatible