fog-openstack 0.1.5 → 0.1.6

data/lib/fog/openstack/requests/volume/action.rb

@@ -0,0 +1,16 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def action(id, data)
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [200, 202],
+            :method  => 'POST',
+            :path    => "volumes/#{id}/action"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        private
+
+        def _create_snapshot(data)
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [200, 202],
+            :method  => 'POST',
+            :path    => "snapshots"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def delete_metadata(volume_id, key_name)
+          request(
+            :expects => [200],
+            :method  => 'DELETE',
+            :path    => "volumes/#{volume_id}/metadata/#{key_name}"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -4,17 +4,17 @@ module Fog
       module Real
         def delete_snapshot(snapshot_id)
           request(
-            :expects  => 202,
-            :method   => 'DELETE',
-            :path     => "snapshots/#{snapshot_id}"
+            :expects => 202,
+            :method  => 'DELETE',
+            :path    => "snapshots/#{snapshot_id}"
           )
         end
       end
 
       module Mock
-        def delete_snapshot(snapshot_id)
+        def delete_snapshot(_snapshot_id)
           response = Excon::Response.new
-          response.status = 204
+          response.status = 202
           response
         end
       end

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

@@ -0,0 +1,15 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def delete_snapshot_metadata(snapshot_id, key_name)
+          request(
+            :expects => [200],
+            :method  => 'DELETE',
+            :path    => "snapshots/#{snapshot_id}/metadata/#{key_name}"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def replace_metadata(volume_id, metadata = {})
+          data = {
+            'metadata' => metadata
+          }
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [200],
+            :method  => 'PUT',
+            :path    => "volumes/#{volume_id}/metadata"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def update_metadata(volume_id, metadata = {})
+          data = {
+            'metadata' => metadata
+          }
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [200],
+            :method  => 'POST',
+            :path    => "volumes/#{volume_id}/metadata"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def update_snapshot(snapshot_id, data = {})
+          request(
+            :body    => Fog::JSON.encode('snapshot' => data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "snapshots/#{snapshot_id}"
+          )
+        end
+      end
+
+      module Mock
+        def update_snapshot(snapshot_id, options = {})
+          unless snapshot_id
+            raise ArgumentError, 'snapshot_id is required'
+          end
+          response = Excon::Response.new
+          if snapshot = data[:snapshots][snapshot_id]
+            response.status                 = 200
+            snapshot['display_name']        = options['display_name'] if options['display_name']
+            snapshot['display_description'] = options['display_description'] if options['display_description']
+            snapshot['name']                = options['name'] if options['name']
+            snapshot['description']         = options['description'] if options['description']
+            snapshot['metadata']            = options['metadata'] if options['metadata']
+            response.body                   = {'snapshot' => snapshot}
+            response
+          else
+            raise Fog::HP::BlockStorageV2::NotFound
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def update_snapshot_metadata(snapshot_id, metadata = {})
+          data = {
+            'metadata' => metadata
+          }
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [200],
+            :method  => 'POST',
+            :path    => "snapshots/#{snapshot_id}/metadata"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Fog
+  module Volume
+    class OpenStack
+      module Real
+        def update_volume(volume_id, data = {})
+          request(
+            :body    => Fog::JSON.encode('volume' => data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "volumes/#{volume_id}"
+          )
+        end
+      end
+
+      module Mock
+        def update_volume(volume_id, data = {})
+          response        = Excon::Response.new
+          response.status = 200
+          response.body   = {'volume' => data.merge('id' => volume_id)}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/action'
+require 'fog/openstack/requests/volume_v1/real'

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

@@ -0,0 +1,45 @@
+require 'fog/openstack/requests/volume/create_snapshot'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Real
+          include Fog::Volume::OpenStack::Real
+
+          def create_snapshot(volume_id, name, description, force = false)
+            data = {
+              'snapshot' => {
+                'volume_id'           => volume_id,
+                'display_name'        => name,
+                'display_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",
+                "display_name"        => name,
+                "created_at"          => Time.now,
+                "display_description" => description,
+                "volume_id"           => volume_id,
+                "id"                  => "5",
+                "size"                => 1
+              }
+            }
+            response
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,2 @@
+require 'fog/openstack/requests/volume/update_volume'
+require 'fog/openstack/requests/volume_v1/real'

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

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

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

@@ -0,0 +1,45 @@
+require 'fog/openstack/requests/volume/create_snapshot'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Real
+          include Fog::Volume::OpenStack::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/requests/volume_v2/delete_metadata.rb

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

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

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

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

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

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

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

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

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

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

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

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

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

data/lib/fog/openstack/storage.rb

@@ -10,7 +10,7 @@ module Fog
                  :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                  :current_user, :current_tenant, :openstack_region,
                  :openstack_endpoint_type, :openstack_auth_omit_default_port,
-                 :openstack_project_name, :openstack_project_id,
+                 :openstack_project_name, :openstack_project_id, :openstack_cache_ttl,
                  :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                  :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
                  :openstack_identity_prefix, :openstack_temp_url_key

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Openstack
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/lib/fog/openstack/volume.rb

@@ -8,7 +8,7 @@ module Fog
                            :openstack_tenant, :openstack_tenant_id,
                            :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                            :current_user, :current_tenant, :openstack_region,
-                           :openstack_endpoint_type,
+                           :openstack_endpoint_type, :openstack_cache_ttl,
                            :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,

data/lib/fog/openstack/volume_v1.rb

@@ -1,4 +1,4 @@
-
+require 'fog/openstack/core'
 require 'fog/openstack/common'
 require 'fog/openstack/volume'
 
@@ -23,6 +23,9 @@ module Fog
         model :volume_type
         collection :volume_types
 
+        model :snapshot
+        collection :snapshots
+
         model :transfer
         collection :transfers
 
@@ -32,6 +35,7 @@ module Fog
         request :list_volumes
         request :list_volumes_detailed
         request :create_volume
+        request :update_volume
         request :get_volume_details
         request :extend_volume
         request :delete_volume
@@ -43,11 +47,14 @@ module Fog
         request :delete_volume_type
         request :get_volume_type_details
 
-        request :create_volume_snapshot
+        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
@@ -59,22 +66,26 @@ module Fog
         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
 
         class Mock
           def self.data
             @data ||= Hash.new do |hash, key|
               hash[key] = {
-                  :users   => {},
-                  :tenants => {},
-                  :quota   => {
-                      'gigabytes' => 1000,
-                      'volumes'   => 10,
-                      'snapshots' => 10
-                  }
+                :users   => {},
+                :tenants => {},
+                :quota   => {
+                  'gigabytes' => 1000,
+                  'volumes'   => 10,
+                  'snapshots' => 10
+                }
               }
             end
           end
@@ -83,7 +94,7 @@ module Fog
             @data = nil
           end
 
-          def initialize(options={})
+          def initialize(options = {})
             @openstack_username = options[:openstack_username]
             @openstack_tenant   = options[:openstack_tenant]
             @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
@@ -100,11 +111,11 @@ module Fog
             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
+                'id'       => id,
+                'name'     => options[:openstack_username],
+                'email'    => "#{options[:openstack_username]}@mock.com",
+                'tenantId' => Fog::Mock.random_numbers(6).to_s,
+                'enabled'  => true
               }
             end
           end
@@ -132,7 +143,7 @@ module Fog
           end
           include Fog::OpenStack::Common
 
-          def initialize(options={})
+          def initialize(options = {})
             initialize_identity options
 
             @openstack_service_type  = options[:openstack_service_type] || ['volume']
@@ -153,11 +164,8 @@ module Fog
             @persistent = options[:persistent] || false
             @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
           end
-
-          private
-
         end
       end
     end
   end
-end
+end