fog-openstack 1.0.11 → 1.1.0.pre

data/lib/fog/openstack/volume/v3/requests/create_snapshot.rb

@@ -0,0 +1,45 @@
+require 'fog/openstack/volume/requests/create_snapshot'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Real
+          include Fog::OpenStack::Volume::Real
+
+          def create_snapshot(volume_id, name, description, force = false)
+            data = {
+              'snapshot' => {
+                'volume_id'   => volume_id,
+                'name'        => name,
+                'description' => description,
+                'force'       => force.nil? ? false : force
+              }
+            }
+
+            _create_snapshot(data)
+          end
+        end
+
+        class Mock
+          def create_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/volume/v3/requests/create_transfer.rb

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

data/lib/fog/openstack/volume/v3/requests/create_volume.rb

@@ -0,0 +1,49 @@
+require 'fog/openstack/volume/requests/create_volume'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Real
+          def create_volume(name, description, size, options = {})
+            data = {
+              'volume' => {
+                'name'        => name,
+                'description' => description,
+                'size'        => size
+              }
+            }
+
+            _create_volume(data, options)
+          end
+
+          include Fog::OpenStack::Volume::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/volume/v3/requests/create_volume_type.rb

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

data/lib/fog/openstack/volume/v3/requests/delete_backup.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/volume/requests/delete_backup'
+require 'fog/openstack/volume/v3/requests/real'

data/lib/fog/openstack/volume/v3/requests/delete_metadata.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/volume/requests/delete_metadata'
+require 'fog/openstack/volume/v3/requests/real'

data/lib/fog/openstack/volume/v3/requests/delete_snapshot.rb

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

data/lib/fog/openstack/volume/v3/requests/delete_snapshot_metadata.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/volume/requests/delete_snapshot_metadata'
+require 'fog/openstack/volume/v3/requests/real'

data/lib/fog/openstack/volume/v3/requests/delete_transfer.rb

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

data/lib/fog/openstack/volume/v3/requests/delete_volume.rb

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

data/lib/fog/openstack/volume/v3/requests/delete_volume_type.rb

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

data/lib/fog/openstack/volume/v3/requests/extend_volume.rb

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

data/lib/fog/openstack/volume/v3/requests/get_backup_details.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/volume/requests/get_backup_details'
+require 'fog/openstack/volume/v3/requests/real'

data/lib/fog/openstack/volume/v3/requests/get_quota.rb

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

data/lib/fog/openstack/volume/v3/requests/get_quota_defaults.rb

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

data/lib/fog/openstack/volume/v3/requests/get_quota_usage.rb

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

data/lib/fog/openstack/volume/v3/requests/get_snapshot_details.rb

@@ -0,0 +1,32 @@
+require 'fog/openstack/volume/requests/get_snapshot_details'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Real
+          include Fog::OpenStack::Volume::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/volume/v3/requests/get_transfer_details.rb

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

data/lib/fog/openstack/volume/v3/requests/get_volume_details.rb

@@ -0,0 +1,35 @@
+require 'fog/openstack/volume/requests/get_volume_details'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Real
+          include Fog::OpenStack::Volume::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/volume/v3/requests/get_volume_type_details.rb

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

data/lib/fog/openstack/volume/v3/requests/list_backups.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/volume/requests/list_backups'
+require 'fog/openstack/volume/v3/requests/real'

data/lib/fog/openstack/volume/v3/requests/list_backups_detailed.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/volume/requests/list_backups_detailed'
+require 'fog/openstack/volume/v3/requests/real'

data/lib/fog/openstack/volume/v3/requests/list_snapshots.rb

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

data/lib/fog/openstack/volume/v3/requests/list_snapshots_detailed.rb

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

data/lib/fog/openstack/volume/v3/requests/list_transfers.rb

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

data/lib/fog/openstack/volume/v3/requests/list_transfers_detailed.rb

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

data/lib/fog/openstack/volume/v3/requests/list_volume_types.rb

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

data/lib/fog/openstack/volume/v3/requests/list_volumes.rb

@@ -0,0 +1,46 @@
+require 'fog/openstack/volume/requests/list_volumes'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Real
+          include Fog::OpenStack::Volume::Real
+        end
+
+        class Mock
+          def list_volumes(_options = true, _options_deprecated = {})
+            response            = Excon::Response.new
+            response.status     = 200
+            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' => data[:volumes]}
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/requests/list_volumes_detailed.rb

@@ -0,0 +1,46 @@
+require 'fog/openstack/volume/requests/list_volumes_detailed'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3
+        class Real
+          include Fog::OpenStack::Volume::Real
+        end
+
+        class Mock
+          def list_volumes_detailed(_options = {})
+            response            = Excon::Response.new
+            response.status     = 200
+            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' => data[:volumes]}
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/requests/list_zones.rb

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

data/lib/fog/openstack/volume/v3/requests/real.rb

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

data/lib/fog/openstack/volume/v3/requests/real_mock.rb

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

data/lib/fog/openstack/volume/v3/requests/replace_metadata.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/volume/requests/replace_metadata'
+require 'fog/openstack/volume/v3/requests/real'

data/lib/fog/openstack/volume/v3/requests/restore_backup.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/volume/requests/restore_backup'
+require 'fog/openstack/volume/v3/requests/real'

data/lib/fog/openstack/volume/v3/requests/set_tenant.rb

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

data/lib/fog/openstack/volume/v3/requests/snapshot_action.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/volume/requests/snapshot_action'
+require 'fog/openstack/volume/v3/requests/real'

data/lib/fog/openstack/volume/v3/requests/update_metadata.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/volume/requests/update_metadata'
+require 'fog/openstack/volume/v3/requests/real'

data/lib/fog/openstack/volume/v3/requests/update_quota.rb

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

data/lib/fog/openstack/volume/v3/requests/update_snapshot.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/volume/requests/update_snapshot'
+require 'fog/openstack/volume/v3/requests/real'

data/lib/fog/openstack/volume/v3/requests/update_snapshot_metadata.rb

@@ -0,0 +1,2 @@
+require 'fog/openstack/volume/requests/update_snapshot_metadata'
+require 'fog/openstack/volume/v3/requests/real'

data/lib/fog/openstack/volume/v3/requests/update_volume.rb

@@ -0,0 +1,20 @@
+require 'fog/openstack/volume/requests/update_volume'
+require 'fog/openstack/volume/v3/requests/real'
+
+module Fog
+  module OpenStack
+    class Volume
+      module Real
+        def update_volume(volume_id, data = {})
+          data = data.select { |key| key == :name || key == :description || key == :metadata }
+          request(
+            :body    => Fog::JSON.encode('volume' => data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "volumes/#{volume_id}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v3/requests/update_volume_type.rb

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

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

@@ -0,0 +1,94 @@
+require 'fog/openstack/core'
+require 'fog/openstack/volume'
+
+module Fog
+  module OpenStack
+    class Volume
+      class V3 < Fog::OpenStack::Volume
+        SUPPORTED_VERSIONS = /v3(\.(0-9))*/
+
+        requires :openstack_auth_url
+
+        recognizes *@@recognizes
+
+        model_path 'fog/openstack/volume/v3/models'
+
+        model :volume
+        collection :volumes
+
+        model :availability_zone
+        collection :availability_zones
+
+        model :volume_type
+        collection :volume_types
+
+        model :snapshot
+        collection :snapshots
+
+        model :transfer
+        collection :transfers
+
+        model :backup
+        collection :backups
+
+        request_path 'fog/openstack/volume/v3/requests'
+
+        # Volume
+        request :list_volumes
+        request :list_volumes_detailed
+        request :create_volume
+        request :update_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_snapshot
+        request :update_snapshot
+        request :list_snapshots
+        request :list_snapshots_detailed
+        request :get_snapshot_details
+        request :delete_snapshot
+        request :update_snapshot_metadata
+        request :delete_snapshot_metadata
+
+        request :list_transfers
+        request :list_transfers_detailed
+        request :create_transfer
+        request :get_transfer_details
+        request :accept_transfer
+        request :delete_transfer
+
+        request :list_backups
+        request :list_backups_detailed
+        request :create_backup
+        request :get_backup_details
+        request :restore_backup
+        request :delete_backup
+
+        request :update_quota
+        request :get_quota
+        request :get_quota_defaults
+        request :get_quota_usage
+
+        request :update_metadata
+        request :replace_metadata
+        request :delete_metadata
+
+        request :set_tenant
+        request :action
+        request :snapshot_action
+
+        autoload :Mock, 'fog/openstack/volume/v3/mock'
+        autoload :Real, 'fog/openstack/volume/v3/real'
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume.rb

@@ -1,10 +1,9 @@
-
-
 module Fog
   module OpenStack
     class Volume < Fog::Service
       autoload :V1, 'fog/openstack/volume/v1'
       autoload :V2, 'fog/openstack/volume/v2'
+      autoload :V3, 'fog/openstack/volume/v3'
 
       @@recognizes = [:openstack_auth_token, :openstack_management_url,
                       :persistent, :openstack_service_type, :openstack_service_name,
@@ -17,16 +16,18 @@ module Fog
                       :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
                       :openstack_identity_api_version]
 
-      # Fog::OpenStack::Image.new() will return a Fog::OpenStack::Volume::V2 or a Fog::OpenStack::Volume::V1,
-      #  choosing the V2 by default, as V1 is deprecated since OpenStack Juno
+      # Fog::OpenStack::Image.new() will return a Fog::OpenStack::Volume::V3 or a Fog::OpenStack::Volume::V2 or a
+      #  Fog::OpenStack::Volume::V1, choosing the V3 by default, as V2 is deprecated since OpenStackWallaby and V1 is
+      #  deprecated since OpenStack Juno
       def self.new(args = {})
         @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url]
-        service = if inspect == 'Fog::OpenStack::Volume'
-                    Fog::OpenStack::Volume::V2.new(args) || Fog::OpenStack::Volume::V1.new(args)
-                  else
-                    super
-                  end
-        service
+        if inspect == 'Fog::OpenStack::Volume'
+          Fog::OpenStack::Volume::V3.new(args) \
+          || Fog::OpenStack::Volume::V2.new(args) \
+          || Fog::OpenStack::Volume::V1.new(args)
+        else
+          super
+        end
       end
     end
   end

data/supported.md

@@ -6,7 +6,7 @@
 |------------------|--------------------|----------------|------------|-------|
 | Barbican         | Key Manager        | v1             | TBD        |       |
 | Ceilometer       | Metering           | v2             | TBD        |       |
-| Cinder           | Volume             | v1, v2         | TBD        |       |
+| Cinder           | Volume             | v1, v2, v3     | TBD        |       |
 | Designate        | DNS                | v1, v2         | TBD        |       |
 | Glance           | Image              | v1, v2         | TBD        |       |
 | Gnocci           | Metric             | v1             | TBD        |       |
@@ -53,4 +53,3 @@ Feel free to submit pull requests to add support for these.
 * solum (Lifecycle)
 * tripleo (Orchestration)
 * zaqar (Messaging)
-