fog 1.32.0 → 1.33.0

data/lib/fog/openstack/models/planning/role.rb

@@ -1,21 +1,15 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Openstack
     class Planning
-      class Role < Fog::Model
+      class Role < Fog::OpenStack::Model
         identity :uuid
 
         attribute :description
         attribute :name
         attribute :uuid
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
         def add_to_plan(plan_uuid)
           service.add_role_to_plan(plan_uuid, uuid)
         end

data/lib/fog/openstack/models/planning/roles.rb

@@ -1,18 +1,15 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/planning/role'
 
 module Fog
   module Openstack
     class Planning
-      class Roles < Fog::Collection
+      class Roles < Fog::OpenStack::Collection
         model Fog::Openstack::Planning::Role
 
         def all(options = {})
-          load(service.list_roles(options).body)
+          load_response(service.list_roles(options))
         end
-
-        alias_method :summary, :all
-
       end
     end
   end

data/lib/fog/openstack/models/storage/directories.rb

@@ -1,19 +1,17 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/storage/directory'
 
 module Fog
   module Storage
     class OpenStack
-      class Directories < Fog::Collection
+      class Directories < Fog::OpenStack::Collection
         model Fog::Storage::OpenStack::Directory
 
         def all(options = {})
-          data = service.get_containers(options).body
-          load(data)
+          data = service.get_containers(options)
+          load_response(data)
         end
 
-        alias_method :summary, :all
-
         def get(key, options = {})
           data = service.get_container(key, options)
           directory = new(:key => key)

data/lib/fog/openstack/models/storage/directory.rb

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 require 'fog/openstack/models/storage/files'
 
 module Fog
   module Storage
     class OpenStack
-      class Directory < Fog::Model
+      class Directory < Fog::OpenStack::Model
         identity  :key, :aliases => 'name'
 
         attribute :bytes, :aliases => 'X-Container-Bytes-Used'

data/lib/fog/openstack/models/storage/file.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Storage
     class OpenStack
-      class File < Fog::Model
+      class File < Fog::OpenStack::Model
         identity  :key,             :aliases => 'name'
 
         attribute :access_control_allow_origin, :aliases => ['Access-Control-Allow-Origin']
@@ -14,6 +14,17 @@ module Fog
         attribute :last_modified,   :aliases => ['last_modified', 'Last-Modified'], :type => :time
         attribute :metadata
         attribute :origin,          :aliases => ['Origin']
+        # @!attribute [rw] delete_at
+        # A Unix Epoch Timestamp, in integer form, representing the time when this object will be automatically deleted.
+        # @return [Integer] the unix epoch timestamp of when this object will be automatically deleted
+        # @see http://docs.openstack.org/developer/swift/overview_expiring_objects.html
+        attribute :delete_at, :aliases => ['X-Delete-At']
+
+        # @!attribute [rw] delete_after
+        # A number of seconds representing how long from now this object will be automatically deleted.
+        # @return [Integer] the number of seconds until this object will be automatically deleted
+        # @see http://docs.openstack.org/developer/swift/overview_expiring_objects.html
+        attribute :delete_after, :aliases => ['X-Delete-After']
 
         def body
           attributes[:body] ||= if last_modified
@@ -88,6 +99,8 @@ module Fog
           options['Content-Disposition'] = content_disposition if content_disposition
           options['Access-Control-Allow-Origin'] = access_control_allow_origin if access_control_allow_origin
           options['Origin'] = origin if origin
+          options['X-Delete-At'] = delete_at if delete_at
+          options['X-Delete-After'] = delete_after if delete_after
           options.merge!(metadata_to_headers)
 
           data = service.put_object(directory.key, key, body, options)

data/lib/fog/openstack/models/storage/files.rb

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/storage/file'
 
 module Fog
   module Storage
     class OpenStack
-      class Files < Fog::Collection
+      class Files < Fog::OpenStack::Collection
         attribute :directory
         attribute :limit
         attribute :marker
@@ -16,10 +16,10 @@ module Fog
         def all(options = {})
           requires :directory
           options = {
-            'limit'   => limit,
-            'marker'  => marker,
-            'path'    => path,
-            'prefix'  => prefix
+            'limit'  => limit,
+            'marker' => marker,
+            'path'   => path,
+            'prefix' => prefix
           }.merge!(options)
           merge_attributes(options)
           parent = directory.collection.get(
@@ -27,14 +27,13 @@ module Fog
             options
           )
           if parent
+            # TODO change to load_response?
             load(parent.files.map {|file| file.attributes})
           else
             nil
           end
         end
 
-        alias_method :summary, :all
-
         alias_method :each_file_this_page, :each
         def each
           if !block_given?

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

@@ -0,0 +1,13 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Volume
+    class OpenStack
+      class AvailabilityZone < Fog::OpenStack::Model
+        identity :zoneName
+
+        attribute :zoneState
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/volume/availability_zone'
+
+module Fog
+  module Volume
+    class OpenStack
+      class AvailabilityZones < Fog::OpenStack::Collection
+        model Fog::Volume::OpenStack::AvailabilityZone
+
+        def all(options = {})
+          data = service.list_zones(options)
+          load_response(data, 'availabilityZoneInfo')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Volume
+    class OpenStack
+      class Transfer < Fog::OpenStack::Model
+        identity :id
+
+        attribute :auth_key,    :aliases => 'authKey'
+        attribute :created_at,  :aliases => 'createdAt'
+        attribute :name
+        attribute :volume_id,   :aliases => 'volumeId'
+
+        def save
+          requires :name, :volume_id
+          data = service.create_transfer(volume_id, :name => name)
+          merge_attributes(data.body['transfer'])
+          true
+        end
+
+        def destroy
+          requires :id
+          service.delete_transfer(id)
+          true
+        end
+
+        def initialize(attributes)
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
+          super
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/volume/transfer'
+
+module Fog
+  module Volume
+    class OpenStack
+      class Transfers < Fog::OpenStack::Collection
+        model Fog::Volume::OpenStack::Transfer
+
+        def all(options = {})
+          load_response(service.list_transfers_detailed(options), 'transfers')
+        end
+
+        def summary(options = {})
+          load_response(service.list_transfers(options), 'transfers')
+        end
+
+        def get(transfer_id)
+          if transfer = service.get_transfer_details(transfer_id).body['transfer']
+            new(transfer)
+          end
+        rescue Fog::Volume::OpenStack::NotFound
+          nil
+        end
+
+        def accept(transfer_id, auth_key)
+          # NOTE: This is NOT a method on the Transfer object, since the
+          # receiver cannot see the transfer object in the get_transfer_details
+          # or list_transfers(_detailed) requests.
+          if transfer = service.accept_transfer(transfer_id, auth_key).body['transfer']
+            new(transfer)
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Volume
     class OpenStack
-      class Volume < Fog::Model
+      class Volume < Fog::OpenStack::Model
         identity :id
 
         attribute :display_name,        :aliases => 'displayName'
@@ -18,12 +18,7 @@ module Fog
         attribute :created_at,          :aliases => 'createdAt'
         attribute :attachments
         attribute :source_volid
-
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
+        attribute :tenant_id,           :aliases => 'os-vol-tenant-attr:tenant_id'
 
         def save
           requires :display_name, :size
@@ -38,6 +33,12 @@ module Fog
           true
         end
 
+        def extend(size)
+          requires :id
+          service.extend_volume(id, size)
+          true
+        end
+
         def ready?
           status == 'available'
         end

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

@@ -1,19 +1,13 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Volume
     class OpenStack
-      class VolumeType < Fog::Model
+      class VolumeType < Fog::OpenStack::Model
         identity :id
 
         attribute :name
         attribute :volume_backend_name
-
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
       end
     end
   end

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

@@ -1,19 +1,17 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/volume/volume_type'
 
 module Fog
   module Volume
     class OpenStack
-      class VolumeTypes < Fog::Collection
+      class VolumeTypes < Fog::OpenStack::Collection
         model Fog::Volume::OpenStack::VolumeType
 
         def all(options = {})
           response = service.list_volume_types(options)
-          load(response.body['volume_types'])
+          load_response(response, 'volume_types')
         end
 
-        alias_method :summary, :all
-
         def get(volume_type_id)
           if volume_type = service.get_volume_type_details(volume_type_id).body['volume_type']
             new(volume_type)
@@ -21,7 +19,6 @@ module Fog
         rescue Fog::Volume::OpenStack::NotFound
           nil
         end
-        alias_method :find_by_id, :get
       end
     end
   end

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/volume/volume'
 
 module Fog
   module Volume
     class OpenStack
-      class Volumes < Fog::Collection
+      class Volumes < Fog::OpenStack::Collection
         model Fog::Volume::OpenStack::Volume
 
         def all(options = {})
@@ -13,16 +13,16 @@ module Fog
           detailed = options.is_a?(Hash) ? options.delete(:detailed) : options
           if detailed.nil? || detailed
             # This method gives details by default, unless false or {:detailed => false} is passed
-            load(service.list_volumes_detailed(options).body['volumes'])
+            load_response(service.list_volumes_detailed(options), 'volumes')
           else
             Fog::Logger.deprecation('Calling OpenStack[:volume].volumes.all(false) or volumes.all(:detailed => false) '\
                                     ' is deprecated, call .volumes.summary instead')
-            load(service.list_volumes(options).body['volumes'])
+            load_response(service.list_volumes(options), 'volumes')
           end
         end
 
         def summary(options = {})
-          load(service.list_volumes(options).body['volumes'])
+          load_response(service.list_volumes(options), 'volumes')
         end
 
         def get(volume_id)
@@ -32,7 +32,6 @@ module Fog
         rescue Fog::Volume::OpenStack::NotFound
           nil
         end
-        alias_method :find_by_id, :get
       end
     end
   end

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

@@ -3,13 +3,16 @@ module Fog
     class OpenStack
       class Real
         def list_servers(options = {})
-          params = Hash.new
-          params['all_tenants'] = 'True' if options[:all_tenants]
+          params = options.dup
+          if params[:all_tenants]
+            params['all_tenants'] = 'True'
+            params.delete(:all_tenants)
+          end
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => 'servers.json',
+            :expects => [200, 203],
+            :method  => 'GET',
+            :path    => 'servers.json',
             :query   => params
           )
         end

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

@@ -3,14 +3,17 @@ module Fog
     class OpenStack
       class Real
         # Available filters: name, status, image, flavor, changes_since, reservation_id
-        def list_servers_detail(filters = {})
-          params = Hash.new
-          filters[:all_tenants] ? params['all_tenants'] = 'True' : params = filters
+        def list_servers_detail(options = {})
+          params = options.dup
+          if params[:all_tenants]
+            params['all_tenants'] = 'True'
+            params.delete(:all_tenants)
+          end
 
           request(
-            :expects  => [200, 203],
-            :method   => 'GET',
-            :path     => 'servers/detail.json',
+            :expects => [200, 203],
+            :method  => 'GET',
+            :path    => 'servers/detail.json',
             :query   => params
           )
         end