fog 1.36.0 → 1.37.0

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def list_volumes_detailed(options = {})
           request(
             :expects  => 200,
@@ -11,39 +11,6 @@ module Fog
           )
         end
       end
-
-      class Mock
-        def list_volumes_detailed(options = {})
-          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

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

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

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def set_tenant(tenant)
           @openstack_must_reauthenticate = true
           @openstack_tenant = tenant.to_s
@@ -9,7 +9,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def set_tenant(tenant)
           true
         end

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

@@ -1,7 +1,7 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
+      module Real
         def update_quota(tenant_id, options = {})
           options['tenant_id'] = tenant_id
           request(
@@ -13,7 +13,7 @@ module Fog
         end
       end
 
-      class Mock
+      module Mock
         def update_quota(tenant_id, options = {})
           self.data[:quota_updated] = self.data[:quota].merge options
 

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

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

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

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

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

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

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

@@ -0,0 +1,49 @@
+require 'fog/openstack/requests/volume/create_volume'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Real
+          def create_volume(name, description, size, options={})
+            data = {
+                'volume' => {
+                    'display_name'        => name,
+                    'display_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),
+                    'display_name'        => name,
+                    'display_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_v1/create_volume_snapshot.rb

@@ -0,0 +1,44 @@
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Real
+          def create_volume_snapshot(volume_id, name, description, force=false)
+            data = {
+                'snapshot' => {
+                    'volume_id'           => volume_id,
+                    'display_name'        => name,
+                    'display_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",
+                    "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/create_volume_type.rb

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,32 @@
+require 'fog/openstack/requests/volume/get_snapshot_details'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        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',
+                    'display_name'        => 'Snapshot1',
+                    'display_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_v1/get_transfer_details.rb

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

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

@@ -0,0 +1,35 @@
+require 'fog/openstack/requests/volume/get_volume_details'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        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',
+                    '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
+end

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,46 @@
+require 'fog/openstack/requests/volume/list_volumes'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        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",
+                 "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
+end

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

@@ -0,0 +1,46 @@
+require 'fog/openstack/requests/volume/list_volumes_detailed'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        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",
+                 "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
+end