fog 1.36.0 → 1.37.0

data/lib/fog/openstack/models/volume_v1/availability_zone.rb

@@ -0,0 +1,15 @@
+require 'fog/openstack/models/volume/availability_zone'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class AvailabilityZone < Fog::Volume::OpenStack::AvailabilityZone
+          identity :zoneName
+
+          attribute :zoneState
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v1/availability_zones.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/volume_v1/availability_zone'
+require 'fog/openstack/models/volume/availability_zones'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class AvailabilityZones < Fog::OpenStack::Collection
+          model Fog::Volume::OpenStack::V1::AvailabilityZone
+          include Fog::Volume::OpenStack::AvailabilityZones
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v1/transfer.rb

@@ -0,0 +1,18 @@
+require 'fog/openstack/models/volume/transfer'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Transfer < Fog::Volume::OpenStack::Transfer
+          identity :id
+
+          attribute :auth_key, :aliases => 'authKey'
+          attribute :created_at, :aliases => 'createdAt'
+          attribute :name
+          attribute :volume_id, :aliases => 'volumeId'
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v1/transfers.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/volume_v1/transfer'
+require 'fog/openstack/models/volume/transfers'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Transfers < Fog::OpenStack::Collection
+          model Fog::Volume::OpenStack::V1::Transfer
+          include Fog::Volume::OpenStack::Transfers
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v1/volume.rb

@@ -0,0 +1,26 @@
+require 'fog/openstack/models/volume/volume'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Volume < Fog::Volume::OpenStack::Volume
+          identity :id
+
+          superclass.attributes.each{|attrib| attribute attrib}
+          attribute :display_name, :aliases => 'displayName'
+          attribute :display_description, :aliases => 'displayDescription'
+          attribute :tenant_id, :aliases => 'os-vol-tenant-attr:tenant_id'
+
+          def save
+            requires :display_name, :size
+            data = service.create_volume(display_name, display_description, size, attributes)
+            merge_attributes(data.body['volume'])
+            true
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v1/volume_type.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/volume/volume_type'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class VolumeType < Fog::Volume::OpenStack::VolumeType
+          identity :id
+
+          attribute :name
+          attribute :volume_backend_name
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v1/volume_types.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/volume_v1/volume_type'
+require 'fog/openstack/models/volume/volume_types'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class VolumeTypes < Fog::OpenStack::Collection
+          model Fog::Volume::OpenStack::V1::VolumeType
+          include Fog::Volume::OpenStack::VolumeTypes
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v1/volumes.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/volume_v1/volume'
+require 'fog/openstack/models/volume/volumes'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Volumes < Fog::OpenStack::Collection
+          model Fog::Volume::OpenStack::V1::Volume
+          include Fog::Volume::OpenStack::Volumes
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v2/availability_zone.rb

@@ -0,0 +1,15 @@
+require 'fog/openstack/models/volume/availability_zone'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class AvailabilityZone < Fog::Volume::OpenStack::AvailabilityZone
+          identity :zoneName
+
+          attribute :zoneState
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v2/availability_zones.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/volume_v2/availability_zone'
+require 'fog/openstack/models/volume/availability_zones'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class AvailabilityZones < Fog::OpenStack::Collection
+          model Fog::Volume::OpenStack::V2::AvailabilityZone
+          include Fog::Volume::OpenStack::AvailabilityZones
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v2/transfer.rb

@@ -0,0 +1,19 @@
+require 'fog/openstack/models/volume/transfer'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Transfer < Fog::Volume::OpenStack::Transfer
+          identity :id
+
+          attribute :auth_key, :aliases => 'authKey'
+          attribute :created_at, :aliases => 'createdAt'
+          attribute :name
+          attribute :volume_id, :aliases => 'volumeId'
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v2/transfers.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/volume_v2/transfer'
+require 'fog/openstack/models/volume/transfers'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Transfers < Fog::OpenStack::Collection
+          model Fog::Volume::OpenStack::V2::Transfer
+          include Fog::Volume::OpenStack::Transfers
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v2/volume.rb

@@ -0,0 +1,27 @@
+require 'fog/openstack/models/volume/volume'
+
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Volume < Fog::Volume::OpenStack::Volume
+          identity :id
+
+          superclass.attributes.each{|attrib| attribute attrib}
+          attribute :name
+          attribute :description
+          attribute :tenant_id, :aliases => 'os-vol-tenant-attr:tenant_id'
+
+          def save
+            requires :name, :size
+            data = service.create_volume(name, description, size, attributes)
+            merge_attributes(data.body['volume'])
+            true
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v2/volume_type.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/volume/volume_type'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class VolumeType < Fog::Volume::OpenStack::VolumeType
+          identity :id
+
+          attribute :name
+          attribute :volume_backend_name
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v2/volume_types.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/volume_v2/volume_type'
+require 'fog/openstack/models/volume/volume_types'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class VolumeTypes < Fog::OpenStack::Collection
+          model Fog::Volume::OpenStack::V2::VolumeType
+          include Fog::Volume::OpenStack::VolumeTypes
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v2/volumes.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/volume_v2/volume'
+require 'fog/openstack/models/volume/volumes'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Volumes < Fog::OpenStack::Collection
+          model Fog::Volume::OpenStack::V2::Volume
+          include Fog::Volume::OpenStack::Volumes
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/network.rb

@@ -14,7 +14,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
 
       ## MODELS
       #

data/lib/fog/openstack/orchestration.rb

@@ -12,7 +12,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
 
       model_path 'fog/openstack/models/orchestration'
       model       :stack

data/lib/fog/openstack/planning.rb

@@ -14,7 +14,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
 
       ## MODELS
       #

data/lib/fog/openstack/requests/compute/evacuate_server.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def evacuate_server(server_id, host, on_shared_storage, admin_password = nil)
+          body = {
+            'evacuate' => {
+              'host'            => host,
+              'onSharedStorage' => on_shared_storage,
+              'admin_password'  => admin_password,
+            }
+          }
+          server_action(server_id, body)
+        end
+      end
+
+      class Mock
+        def evacuate_server(server_id, host, on_shared_storage, admin_password = nil)
+          response = Excon::Response.new
+          response.status = 202
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -1,21 +1,19 @@
 module Fog
   module Volume
     class OpenStack
-      # no Mock needed, test coverage in RSpec
-
-      class Real
+      module Real
         def accept_transfer(transfer_id, auth_key)
           data = {
-            'accept' => {
-              'auth_key' => auth_key
-            }
+              'accept' => {
+                  'auth_key' => auth_key
+              }
           }
 
           request(
-            :body    => Fog::JSON.encode(data),
-            :expects => [200, 202],
-            :method  => 'POST',
-            :path    => "os-volume-transfer/#{transfer_id}/accept"
+              :body    => Fog::JSON.encode(data),
+              :expects => [200, 202],
+              :method  => 'POST',
+              :path    => "os-volume-transfer/#{transfer_id}/accept"
           )
         end
       end

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

@@ -1,24 +1,22 @@
 module Fog
   module Volume
     class OpenStack
-      # no Mock needed, test coverage in RSpec
-
-      class Real
+      module Real
         def create_transfer(volume_id, options={})
           data = {
-            'transfer' => {
-              'volume_id' => volume_id
-            }
+              'transfer' => {
+                  'volume_id' => volume_id
+              }
           }
           if options[:name]
             data['transfer']['name'] = options[:name]
           end
 
           request(
-            :body     => Fog::JSON.encode(data),
-            :expects  => [200, 202],
-            :method   => 'POST',
-            :path     => 'os-volume-transfer'
+              :body    => Fog::JSON.encode(data),
+              :expects => [200, 202],
+              :method  => 'POST',
+              :path    => 'os-volume-transfer'
           )
         end
       end

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

@@ -1,53 +1,22 @@
 module Fog
   module Volume
     class OpenStack
-      class Real
-        def create_volume(name, description, size, options={})
-          data = {
-            'volume' => {
-              'display_name'        => name,
-              'display_description' => description,
-              'size'                => size
-            }
-          }
-
+      module Real
+        private
+        def _create_volume(data, options={})
           vanilla_options = [:snapshot_id, :imageRef, :volume_type,
-            :source_volid, :availability_zone, :metadata]
-          vanilla_options.select{|o| options[o]}.each do |key|
+                             :source_volid, :availability_zone, :metadata]
+          vanilla_options.select { |o| options[o] }.each do |key|
             data['volume'][key] = options[key]
           end
           request(
-            :body     => Fog::JSON.encode(data),
-            :expects  => [200, 202],
-            :method   => 'POST',
-            :path     => "volumes"
+              :body    => Fog::JSON.encode(data),
+              :expects => [200, 202],
+              :method  => 'POST',
+              :path    => "volumes"
           )
         end
       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