fog 1.36.0 → 1.37.0

data/lib/fog/openstack/requests/volume_v1/list_zones.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/list_zones'
+require 'fog/openstack/requests/volume_v1/real_mock'

data/lib/fog/openstack/requests/volume_v1/real.rb

@@ -0,0 +1,11 @@
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Real
+          include Fog::Volume::OpenStack::Real
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/volume_v1/real_mock.rb

@@ -0,0 +1,14 @@
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Real
+          include Fog::Volume::OpenStack::Real
+        end
+        class Mock
+          include Fog::Volume::OpenStack::Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/volume_v1/set_tenant.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/set_tenant'
+require 'fog/openstack/requests/volume_v1/real_mock'

data/lib/fog/openstack/requests/volume_v1/update_quota.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/update_quota'
+require 'fog/openstack/requests/volume_v1/real_mock'

data/lib/fog/openstack/requests/volume_v2/accept_transfer.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/accept_transfer'
+require 'fog/openstack/requests/volume_v2/real'

data/lib/fog/openstack/requests/volume_v2/create_transfer.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/create_transfer'
+require 'fog/openstack/requests/volume_v2/real'

data/lib/fog/openstack/requests/volume_v2/create_volume.rb

@@ -0,0 +1,49 @@
+require 'fog/openstack/requests/volume/create_volume'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Real
+          def create_volume(name, description, size, options={})
+            data = {
+                'volume' => {
+                    'name'        => name,
+                    'description' => description,
+                    'size'        => size
+                }
+            }
+
+            _create_volume(data, options)
+          end
+
+          include Fog::Volume::OpenStack::Real
+        end
+
+        class Mock
+          def create_volume(name, description, size, options={})
+            response        = Excon::Response.new
+            response.status = 202
+            response.body   = {
+                'volume' => {
+                    'id'                => Fog::Mock.random_numbers(2),
+                    'name'              => name,
+                    'description'       => description,
+                    'metadata'          => options['metadata'] || {},
+                    'size'              => size,
+                    'status'            => 'creating',
+                    'snapshot_id'       => options[:snapshot_id] || nil,
+                    'image_id'          => options[:imageRef] || nil,
+                    'volume_type'       => nil,
+                    'availability_zone' => 'nova',
+                    'created_at'        => Time.now,
+                    'attachments'       => []
+                }
+            }
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/volume_v2/create_volume_snapshot.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Real
+          def create_volume_snapshot(volume_id, name, description, force=false)
+            data = {
+                'snapshot' => {
+                    'volume_id'   => volume_id,
+                    'name'        => name,
+                    'description' => description,
+                    'force'       => force
+                }
+            }
+
+            _create_volume_snapshot(data)
+          end
+
+          include Fog::Volume::OpenStack::Real
+        end
+
+        class Mock
+          def create_volume_snapshot(volume_id, name, description, force=false)
+            response        = Excon::Response.new
+            response.status = 202
+            response.body   = {
+                "snapshot" => {
+                    "status"      => "creating",
+                    "name"        => name,
+                    "created_at"  => Time.now,
+                    "description" => description,
+                    "volume_id"   => volume_id,
+                    "id"          => "5",
+                    "size"        => 1
+                }
+            }
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/volume_v2/create_volume_type.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/create_volume_type'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/delete_snapshot.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/delete_snapshot'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/delete_transfer.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/delete_transfer'
+require 'fog/openstack/requests/volume_v2/real'

data/lib/fog/openstack/requests/volume_v2/delete_volume.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/delete_volume'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/delete_volume_type.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/delete_volume_type'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/extend_volume.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/extend_volume'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/get_quota.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/get_quota'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/get_quota_defaults.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/get_quota_defaults'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/get_quota_usage.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/get_quota_usage'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/get_snapshot_details.rb

@@ -0,0 +1,32 @@
+require 'fog/openstack/requests/volume/get_snapshot_details'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Real
+          include Fog::Volume::OpenStack::Real
+        end
+
+        class Mock
+          def get_snapshot_details(detailed=true)
+            response        = Excon::Response.new
+            response.status = 200
+            response.body   = {
+                'snapshot' => {
+                    'id'                  => '1',
+                    'name'        => 'Snapshot1',
+                    'description' => 'Volume1 snapshot',
+                    'size'                => 1,
+                    'volume_id'           => '1',
+                    'status'              => 'available',
+                    'created_at'          => Time.now
+                }
+            }
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/volume_v2/get_transfer_details.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/get_transfer_details'
+require 'fog/openstack/requests/volume_v2/real'

data/lib/fog/openstack/requests/volume_v2/get_volume_details.rb

@@ -0,0 +1,35 @@
+require 'fog/openstack/requests/volume/get_volume_details'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Real
+          include Fog::Volume::OpenStack::Real
+        end
+
+        class Mock
+          def get_volume_details(detailed=true)
+            response        = Excon::Response.new
+            response.status = 200
+            response.body   = {
+                'volume' => {
+                    'id'                  => '1',
+                    'name'        => Fog::Mock.random_letters(rand(8) + 5),
+                    'description' => Fog::Mock.random_letters(rand(12) + 10),
+                    'size'                => 3,
+                    'volume_type'         => nil,
+                    'snapshot_id'         => '4',
+                    'status'              => 'online',
+                    'availability_zone'   => 'nova',
+                    'created_at'          => Time.now,
+                    'attachments'         => []
+                }
+            }
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/volume_v2/get_volume_type_details.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/get_volume_type_details'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/list_snapshots.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/list_snapshots'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/list_snapshots_detailed.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/list_snapshots_detailed'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/list_transfers.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/list_transfers'
+require 'fog/openstack/requests/volume_v2/real'

data/lib/fog/openstack/requests/volume_v2/list_transfers_detailed.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/list_transfers_detailed'
+require 'fog/openstack/requests/volume_v2/real'

data/lib/fog/openstack/requests/volume_v2/list_volume_types.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/list_volume_types'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/list_volumes.rb

@@ -0,0 +1,46 @@
+require 'fog/openstack/requests/volume/list_volumes'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Real
+          include Fog::Volume::OpenStack::Real
+        end
+
+        class Mock
+          def list_volumes(options = true, options_deprecated = {})
+            response            = Excon::Response.new
+            response.status     = 200
+            self.data[:volumes] ||= [
+                {"status"            => "available",
+                 "description"       => "test 1 desc",
+                 "availability_zone" => "nova",
+                 "name"              => "Volume1",
+                 "attachments"       => [{}],
+                 "volume_type"       => nil,
+                 "snapshot_id"       => nil,
+                 "size"              => 1,
+                 "id"                => 1,
+                 "created_at"        => Time.now,
+                 "metadata"          => {}},
+                {"status"            => "available",
+                 "description"       => "test 2 desc",
+                 "availability_zone" => "nova",
+                 "name"              => "Volume2",
+                 "attachments"       => [{}],
+                 "volume_type"       => nil,
+                 "snapshot_id"       => nil,
+                 "size"              => 1,
+                 "id"                => 2,
+                 "created_at"        => Time.now,
+                 "metadata"          => {}}
+            ]
+            response.body       = {'volumes' => self.data[:volumes]}
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/volume_v2/list_volumes_detailed.rb

@@ -0,0 +1,46 @@
+require 'fog/openstack/requests/volume/list_volumes_detailed'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Real
+          include Fog::Volume::OpenStack::Real
+        end
+
+        class Mock
+          def list_volumes_detailed(options = {})
+            response            = Excon::Response.new
+            response.status     = 200
+            self.data[:volumes] ||= [
+                {"status"              => "available",
+                 "description" => "test 1 desc",
+                 "availability_zone"   => "nova",
+                 "name"        => "Volume1",
+                 "attachments"         => [{}],
+                 "volume_type"         => nil,
+                 "snapshot_id"         => nil,
+                 "size"                => 1,
+                 "id"                  => 1,
+                 "created_at"          => Time.now,
+                 "metadata"            => {}},
+                {"status"              => "available",
+                 "description" => "test 2 desc",
+                 "availability_zone"   => "nova",
+                 "name"        => "Volume2",
+                 "attachments"         => [{}],
+                 "volume_type"         => nil,
+                 "snapshot_id"         => nil,
+                 "size"                => 1,
+                 "id"                  => 2,
+                 "created_at"          => Time.now,
+                 "metadata"            => {}}
+            ]
+            response.body       = {'volumes' => self.data[:volumes]}
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/volume_v2/list_zones.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/list_zones'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/real.rb

@@ -0,0 +1,11 @@
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Real
+          include Fog::Volume::OpenStack::Real
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/volume_v2/real_mock.rb

@@ -0,0 +1,14 @@
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Real
+          include Fog::Volume::OpenStack::Real
+        end
+        class Mock
+          include Fog::Volume::OpenStack::Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/volume_v2/set_tenant.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/set_tenant'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/requests/volume_v2/update_quota.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/update_quota'
+require 'fog/openstack/requests/volume_v1/real_mock'

data/lib/fog/openstack/requests/volume_v2/update_volume_type.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/update_volume_type'
+require 'fog/openstack/requests/volume_v2/real_mock'

data/lib/fog/openstack/storage.rb

@@ -13,7 +13,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, :openstack_temp_url_key
 
       model_path 'fog/openstack/models/storage'
       model       :directory

data/lib/fog/openstack/volume.rb

@@ -3,184 +3,29 @@ require 'fog/openstack/core'
 module Fog
   module Volume
     class OpenStack < Fog::Service
-      requires :openstack_auth_url
-      recognizes :openstack_auth_token, :openstack_management_url,
-                 :persistent, :openstack_service_type, :openstack_service_name,
-                 :openstack_tenant, :openstack_tenant_id,
-                 :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
-                 :current_user, :current_tenant, :openstack_region,
-                 :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
-
-      model_path 'fog/openstack/models/volume'
-
-      model       :volume
-      collection  :volumes
-
-      model       :availability_zone
-      collection  :availability_zones
-
-      model       :volume_type
-      collection  :volume_types
-
-      model       :transfer
-      collection  :transfers
-
-      request_path 'fog/openstack/requests/volume'
-
-       # Volume
-      request :list_volumes
-      request :list_volumes_detailed
-      request :create_volume
-      request :get_volume_details
-      request :extend_volume
-      request :delete_volume
-
-      request :list_zones
-
-      request :list_volume_types
-      request :create_volume_type
-      request :update_volume_type
-      request :delete_volume_type
-      request :get_volume_type_details
-
-      request :create_volume_snapshot
-      request :list_snapshots
-      request :list_snapshots_detailed
-      request :get_snapshot_details
-      request :delete_snapshot
-
-      request :list_transfers
-      request :list_transfers_detailed
-      request :create_transfer
-      request :get_transfer_details
-      request :accept_transfer
-      request :delete_transfer
-
-      request :update_quota
-      request :get_quota
-      request :get_quota_defaults
-
-      request :get_quota_usage
-
-      request :set_tenant
-
-      class Mock
-        def self.data
-          @data ||= Hash.new do |hash, key|
-            hash[key] = {
-              :users => {},
-              :tenants => {},
-              :quota => {
-                'gigabytes' => 1000,
-                'volumes'   => 10,
-                'snapshots' => 10
-              }
-            }
-          end
-        end
-
-        def self.reset
-          @data = nil
-        end
-
-        def initialize(options={})
-          @openstack_username = options[:openstack_username]
-          @openstack_tenant   = options[:openstack_tenant]
-          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
-
-          @auth_token = Fog::Mock.random_base64(64)
-          @auth_token_expiration = (Time.now.utc + 86400).iso8601
-
-          management_url = URI.parse(options[:openstack_auth_url])
-          management_url.port = 8776
-          management_url.path = '/v1'
-          @openstack_management_url = management_url.to_s
-
-          @data ||= { :users => {} }
-          unless @data[:users].find {|u| u['name'] == options[:openstack_username]}
-            id = Fog::Mock.random_numbers(6).to_s
-            @data[:users][id] = {
-              'id'       => id,
-              'name'     => options[:openstack_username],
-              'email'    => "#{options[:openstack_username]}@mock.com",
-              'tenantId' => Fog::Mock.random_numbers(6).to_s,
-              'enabled'  => true
-            }
-          end
-        end
-
-        def data
-          self.class.data[@openstack_username]
-        end
-
-        def reset_data
-          self.class.data.delete(@openstack_username)
-        end
-
-        def credentials
-          { :provider                 => 'openstack',
-            :openstack_auth_url       => @openstack_auth_uri.to_s,
-            :openstack_auth_token     => @auth_token,
-            :openstack_management_url => @openstack_management_url }
-        end
+      @@recognizes = [:openstack_auth_token, :openstack_management_url,
+                           :persistent, :openstack_service_type, :openstack_service_name,
+                           :openstack_tenant, :openstack_tenant_id,
+                           :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
+                           :current_user, :current_tenant, :openstack_region,
+                           :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_identity_prefix]
+
+      # Fog::Image::OpenStack.new() will return a Fog::Volume::OpenStack::V2 or a Fog::Volume::OpenStack::V1,
+      #  choosing the V2 by default, as V1 is deprecated since OpenStack Juno
+      def self.new(args = {})
+        @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url]
+        if self.inspect == 'Fog::Volume::OpenStack'
+          service = Fog::Volume::OpenStack::V2.new(args) || Fog::Volume::OpenStack::V1.new(args)
+        else
+          service = super
+        end
+        service
       end
 
-      class Real
-        include Fog::OpenStack::Core
-
-        def initialize(options={})
-          initialize_identity options
-
-          @openstack_service_type   = options[:openstack_service_type] || ['volume']
-          @openstack_service_name   = options[:openstack_service_name]
-          @openstack_endpoint_type  = options[:openstack_endpoint_type] || 'adminURL'
-
-          @connection_options       = options[:connection_options] || {}
-
-          authenticate
-
-          @persistent                       = options[:persistent] || false
-          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-        end
-
-        def request(params)
-          begin
-            response = @connection.request(params.merge({
-              :headers  => {
-                'Content-Type' => 'application/json',
-                'Accept' => 'application/json',
-                'X-Auth-Token' => @auth_token
-              }.merge!(params[:headers] || {}),
-              :path     => "#{@path}/#{params[:path]}"#,
-            }))
-          rescue Excon::Errors::Unauthorized => error
-            if error.response.body != 'Bad username or password' # token expiration
-              @openstack_must_reauthenticate = true
-              authenticate
-              retry
-            else # bad credentials
-              raise error
-            end
-          rescue Excon::Errors::HTTPStatusError => error
-            raise case error
-            when Excon::Errors::NotFound
-              Fog::Compute::OpenStack::NotFound.slurp(error)
-            else
-              error
-            end
-          end
-          unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
-          end
-          response
-        end
-
-        private
-
-      end
     end
   end
 end