fog 1.36.0 → 1.37.0

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

@@ -1,44 +1,26 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
-        def create_volume_snapshot(volume_id, name, description, force=false)
+      module Real
+        private
+        def _create_volume_snapshot(data)
           data = {
-            'snapshot' => {
-              'volume_id'           => volume_id,
-              'display_name'        => name,
-              'display_description' => description,
-              'force'               => force
-            }
+              'snapshot' => {
+                  'volume_id'           => volume_id,
+                  'display_name'        => name,
+                  'display_description' => description,
+                  'force'               => force
+              }
           }
 
           request(
-            :body     => Fog::JSON.encode(data),
-            :expects  => [200, 202],
-            :method   => 'POST',
-            :path     => "snapshots"
+              :body    => Fog::JSON.encode(data),
+              :expects => [200, 202],
+              :method  => 'POST',
+              :path    => "snapshots"
           )
         end
       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",
-               "display_name"=>name,
-               "created_at"=>Time.now,
-               "display_description"=>description,
-               "volume_id"=>volume_id,
-               "id"=>"5",
-               "size"=>1
-            }
-          }
-          response
-        end
-      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def create_volume_type(options = {})
           data = {
             'volume_type' => {}
@@ -20,7 +20,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def create_volume_type(options = {})
           response = Excon::Response.new
           response.status = 202

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def delete_snapshot(snapshot_id)
           request(
             :expects  => 202,
@@ -11,7 +11,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def delete_snapshot(snapshot_id)
           response = Excon::Response.new
           response.status = 204

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

@@ -1,9 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      # no Mock needed, test coverage in RSpec
-
-      class Real
+      module Real
         def delete_transfer(transfer_id)
           request(
             :expects => 202,

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def delete_volume(volume_id)
           request(
             :expects  => 202,
@@ -11,7 +11,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def delete_volume(volume_id)
           response = Excon::Response.new
           response.status = 204

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def delete_volume_type(volume_type_id)
           request(
             :expects  => 202,
@@ -11,7 +11,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def delete_volume_type(volume_type_id)
           response = Excon::Response.new
           response.status = 204

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def extend_volume(volume_id, size)
           body = { 'os-extend' => { 'new_size' => size } }
           request(
@@ -13,7 +13,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def extend_volume(volume_id, size)
           response = Excon::Response.new
           response.status = 202

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def get_quota(tenant_id)
           request(
             :expects  => 200,
@@ -11,7 +11,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def get_quota(tenant_id)
           response = Excon::Response.new
           response.status = 200

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

@@ -1,26 +1,26 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def get_quota_defaults(tenant_id)
           request(
-            :expects  => 200,
-            :method   => 'GET',
-            :path     => "/os-quota-sets/#{tenant_id}/defaults"
+              :expects  => 200,
+              :method   => 'GET',
+              :path     => "/os-quota-sets/#{tenant_id}/defaults"
           )
         end
       end
 
-      class Mock
+      module Mock
         def get_quota_defaults(tenant_id)
           response = Excon::Response.new
           response.status = 200
           response.body = {
-            'quota_set' => self.data[:quota].merge({'id' => tenant_id})
+              'quota_set' => self.data[:quota].merge({'id' => tenant_id})
           }
           response
         end
       end
     end
   end
-end
+end

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def get_quota_usage(tenant_id)
           request(
             :expects  => 200,
@@ -11,7 +11,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def get_quota_usage(tenant_id)
           response = Excon::Response.new
           response.status = 200

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def get_snapshot_details(snapshot_id)
           request(
             :expects  => 200,
@@ -10,25 +10,6 @@ module Fog
           )
         end
       end
-
-      class Mock
-        def get_snapshot_details(detailed=true)
-          response = Excon::Response.new
-          response.status = 200
-          response.body = {
-            'snapshot' => {
-              'id'                 => '1',
-              'display_name'        => 'Snapshot1',
-              'display_description' => 'Volume1 snapshot',
-              'size'               => 1,
-              'volume_id'           => '1',
-              'status'             => 'available',
-              'created_at'          => Time.now
-            }
-          }
-          response
-        end
-      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Fog
     class OpenStack
       # no Mock needed, test coverage in RSpec
 
-      class Real
+      module Real
         def get_transfer_details(transfer_id)
           request(
             :expects  => 200,

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def get_volume_details(volume_id)
           request(
             :expects  => 200,
@@ -11,27 +11,6 @@ module Fog
         end
       end
 
-      class Mock
-        def get_volume_details(detailed=true)
-          response = Excon::Response.new
-          response.status = 200
-          response.body = {
-            'volume' => {
-              'id'                  => '1',
-              'display_name'        => Fog::Mock.random_letters(rand(8) + 5),
-              'display_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

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def get_volume_type_details(volume_type_id)
           request(
             :expects  => 200,
@@ -11,7 +11,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def get_volume_type_details(volume_type_id)
           response = Excon::Response.new
           response.status = 200

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def list_snapshots(options = true, options_deprecated = {})
           if options.is_a?(Hash)
             path  = 'snapshots'
@@ -26,7 +26,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def list_snapshots(detailed=true, options={})
           response = Excon::Response.new
           response.status = 200

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def list_snapshots_detailed(options = {})
           request(
             :expects  => 200,
@@ -12,7 +12,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def list_snapshots_detailed(options = {})
           response = Excon::Response.new
           response.status = 200

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

@@ -3,7 +3,7 @@ module Fog
     class OpenStack
       # no Mock needed, test coverage in RSpec
 
-      class Real
+      module Real
         def list_transfers(options = {})
           request(
             :expects => 200,

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

@@ -3,7 +3,7 @@ module Fog
     class OpenStack
       # no Mock needed, test coverage in RSpec
 
-      class Real
+      module Real
         def list_transfers_detailed(options = {})
           request(
             :expects  => 200,

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def list_volume_types(options = {})
           request(
             :expects => 200,
@@ -12,7 +12,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def list_volume_types(options = {})
           response = Excon::Response.new
           response.status = 200

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def list_volumes(options = true, options_deprecated = {})
           if options.is_a?(Hash)
             path  = 'volumes'
@@ -25,39 +25,6 @@ module Fog
           )
         end
       end
-
-      class Mock
-        def list_volumes(options = true, options_deprecated = {})
-          response = Excon::Response.new
-          response.status = 200
-          self.data[:volumes] ||= [
-            { "status" => "available",
-              "display_description" => "test 1 desc",
-              "availability_zone" => "nova",
-              "display_name" => "Volume1",
-              "attachments" => [{}],
-              "volume_type" => nil,
-              "snapshot_id" => nil,
-              "size" => 1,
-              "id" => 1,
-              "created_at" => Time.now,
-              "metadata" => {} },
-            { "status" => "available",
-              "display_description" => "test 2 desc",
-              "availability_zone" => "nova",
-              "display_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