fog 1.32.0 → 1.33.0

data/lib/fog/openstack/models/compute/images.rb

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/image'
 
 module Fog
   module Compute
     class OpenStack
-      class Images < Fog::Collection
+      class Images < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Compute::OpenStack::Image
@@ -18,16 +18,14 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          data = service.list_images_detail(filters).body['images']
-          images = load(data)
+          data = service.list_images_detail(filters)
+          images = load_response(data, 'images')
           if server
             self.replace(self.select {|image| image.server_id == server.id})
           end
           images
         end
 
-        alias_method :summary, :all
-
         def get(image_id)
           data = service.get_image_details(image_id).body['image']
           new(data)

data/lib/fog/openstack/models/compute/key_pair.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Compute
     class OpenStack
-      class KeyPair < Fog::Model
+      class KeyPair < Fog::OpenStack::Model
         identity  :name
 
         attribute :fingerprint

data/lib/fog/openstack/models/compute/key_pairs.rb

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/key_pair'
 
 module Fog
   module Compute
     class OpenStack
-      class KeyPairs < Fog::Collection
+      class KeyPairs < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::KeyPair
 
         def all(options = {})
@@ -12,11 +12,10 @@ module Fog
           service.list_key_pairs(options).body['keypairs'].each do |kp|
             items = items + kp.values
           end
+          # TODO convert to load_response?
           load(items)
         end
 
-        alias_method :summary, :all
-
         def get(key_pair_name)
           if key_pair_name
             self.all.select {|kp| kp.name == key_pair_name}.first

data/lib/fog/openstack/models/compute/metadata.rb

@@ -1,4 +1,4 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/meta_parent'
 require 'fog/openstack/models/compute/metadatum'
 require 'fog/openstack/models/compute/image'
@@ -7,7 +7,7 @@ require 'fog/openstack/models/compute/server'
 module Fog
   module Compute
     class OpenStack
-      class Metadata < Fog::Collection
+      class Metadata < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::Metadatum
 
         include Fog::Compute::OpenStack::MetaParent
@@ -17,6 +17,7 @@ module Fog
           metadata = service.list_metadata(collection_name, @parent.id).body['metadata']
           metas = []
           metadata.each_pair {|k,v| metas << {"key" => k, "value" => v} } unless metadata.nil?
+          # TODO convert to load_response?
           load(metas)
         end
 

data/lib/fog/openstack/models/compute/metadatum.rb

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 require 'fog/openstack/models/meta_parent'
 
 module Fog
   module Compute
     class OpenStack
-      class Metadatum < Fog::Model
+      class Metadatum < Fog::OpenStack::Model
         include Fog::Compute::OpenStack::MetaParent
 
         identity :key

data/lib/fog/openstack/models/compute/network.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Compute
     class OpenStack
-      class Network < Fog::Model
+      class Network < Fog::OpenStack::Model
         identity  :id
         attribute :name
         attribute :addresses

data/lib/fog/openstack/models/compute/networks.rb

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/network'
 
 module Fog
   module Compute
     class OpenStack
-      class Networks < Fog::Collection
+      class Networks < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::Network
 
         attribute :server
@@ -21,6 +21,7 @@ module Fog
             }
           end
 
+          # TODO convert to load_response?
           load(networks)
         end
       end # class Networks

data/lib/fog/openstack/models/compute/security_group.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Compute
     class OpenStack
-      class SecurityGroup < Fog::Model
+      class SecurityGroup < Fog::OpenStack::Model
         identity  :id
 
         attribute :name

data/lib/fog/openstack/models/compute/security_group_rule.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Compute
     class OpenStack
-      class SecurityGroupRule < Fog::Model
+      class SecurityGroupRule < Fog::OpenStack::Model
         identity :id
 
         attribute :from_port

data/lib/fog/openstack/models/compute/security_group_rules.rb

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/security_group_rule'
 
 module Fog
   module Compute
     class OpenStack
-      class SecurityGroupRules < Fog::Collection
+      class SecurityGroupRules < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::SecurityGroupRule
 
         def get(security_group_rule_id)

data/lib/fog/openstack/models/compute/security_groups.rb

@@ -1,18 +1,16 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/security_group'
 
 module Fog
   module Compute
     class OpenStack
-      class SecurityGroups < Fog::Collection
+      class SecurityGroups < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::SecurityGroup
 
         def all(options = {})
-          load(service.list_security_groups(options).body['security_groups'])
+          load_response(service.list_security_groups(options), 'security_groups')
         end
 
-        alias_method :summary, :all
-
         def get(security_group_id)
           if security_group_id
             new(service.get_security_group(security_group_id).body['security_group'])

data/lib/fog/openstack/models/compute/server.rb

@@ -52,6 +52,10 @@ module Fog
         attr_writer :image_ref, :flavor_ref, :nics, :os_scheduler_hints
         attr_accessor :block_device_mapping, :block_device_mapping_v2
 
+        # In some cases it's handy to be able to store the project for the record, e.g. swift doesn't contain project info
+        # in the result, so we can track it in this attribute based on what project was used in the request
+        attr_accessor :project
+
         def initialize(attributes={})
           # Old 'connection' is renamed as service and should be used instead
           prepare_service_value(attributes)
@@ -84,7 +88,7 @@ module Fog
         end
 
         def user_data=(ascii_userdata)
-          self.user_data_encoded = [ascii_userdata].pack('m')
+          self.user_data_encoded = [ascii_userdata].pack('m') if ascii_userdata
         end
 
         def destroy
@@ -253,6 +257,21 @@ module Fog
           end
         end
 
+        def shelve
+          requires :id
+          service.shelve_server(id)
+        end
+
+        def unshelve
+          requires :id
+          service.unshelve_server(id)
+        end
+
+        def shelve_offload
+          requires :id
+          service.shelve_offload_server(id)
+        end
+
         def create_image(name, metadata={})
           requires :id
           service.create_image(id, name, metadata)

data/lib/fog/openstack/models/compute/servers.rb

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/server'
 
 module Fog
   module Compute
     class OpenStack
-      class Servers < Fog::Collection
+      class Servers < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Compute::OpenStack::Server
@@ -16,11 +16,15 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          data = service.list_servers_detail(filters).body['servers']
-          load(data)
+          data = service.list_servers_detail(filters)
+          load_response(data, 'servers')
         end
 
-        alias_method :summary, :all
+        def summary(filters_arg = filters)
+          filters = filters_arg
+          data = service.list_servers(filters)
+          load_response(data, 'servers')
+        end
 
         # Creates a new server and populates ssh keys
         # @return [Fog::Compute::OpenStack::Server]

data/lib/fog/openstack/models/compute/service.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Compute
     class OpenStack
-      class Service < Fog::Model
+      class Service < Fog::OpenStack::Model
         identity :id
 
         attribute :binary
@@ -16,12 +16,6 @@ module Fog
         #detailed
         attribute :disabled_reason
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
         def enable
           requires :binary, :host
           service.enable_service(self.host, self.binary)

data/lib/fog/openstack/models/compute/services.rb

@@ -1,21 +1,21 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/service'
 
 module Fog
   module Compute
     class OpenStack
-      class Services < Fog::Collection
+      class Services < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::Service
 
         def all(options = {})
-          load(service.list_services(options).body['services'])
+          load_response(service.list_services(options), 'services')
         end
 
         alias_method :summary, :all
 
         def details(options = {})
           Fog::Logger.deprecation('Calling OpenStack[:compute].services.details is deprecated, use .services.all')
-          load(service.list_services(options).body['services'])
+          all(options)
         end
       end
     end

data/lib/fog/openstack/models/compute/snapshot.rb

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 require 'fog/openstack/models/compute/metadata'
 
 module Fog
   module Compute
     class OpenStack
-      class Snapshot < Fog::Model
+      class Snapshot < Fog::OpenStack::Model
         identity :id
 
         attribute :name,                :aliases => 'displayName'
@@ -14,12 +14,6 @@ module Fog
         attribute :size
         attribute :created_at,          :aliases => 'createdAt'
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
         def save(force=false)
           requires :volume_id, :name, :description
           data = service.create_volume_snapshot(volume_id, name, description, force)

data/lib/fog/openstack/models/compute/snapshots.rb

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/snapshot'
 
 module Fog
   module Compute
     class OpenStack
-      class Snapshots < Fog::Collection
+      class Snapshots < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::Snapshot
 
         def all(options = {})
@@ -14,14 +14,14 @@ module Fog
             else
               Fog::Logger.deprecation('Calling OpenStack[:compute].snapshots.all(false) is deprecated, use .snapshots.summary')
             end
-            load(service.list_snapshots(options).body['snapshots'])
+            load_response(service.list_snapshots(options), 'snapshots')
           else
-            load(service.list_snapshots_detail(options).body['snapshots'])
+            load_response(service.list_snapshots_detail(options), 'snapshots')
           end
         end
 
         def summary(options = {})
-          load(service.list_snapshots(options).body['snapshots'])
+          load_response(service.list_snapshots(options), 'snapshots')
         end
 
         def get(snapshot_id)

data/lib/fog/openstack/models/compute/tenant.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Compute
     class OpenStack
-      class Tenant < Fog::Model
+      class Tenant < Fog::OpenStack::Model
         identity :id
 
         attribute :description

data/lib/fog/openstack/models/compute/tenants.rb

@@ -1,14 +1,14 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/tenant'
 
 module Fog
   module Compute
     class OpenStack
-      class Tenants < Fog::Collection
+      class Tenants < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::Tenant
 
         def all
-          load(service.list_tenants.body['tenants'])
+          load_response(service.list_tenants, 'tenants')
         end
 
         def usages(start_date = nil, end_date = nil, details = false)
@@ -18,7 +18,6 @@ module Fog
         def get(id)
           self.find {|tenant| tenant.id == id}
         end
-        alias_method :find_by_id, :get
 
       end # class Tenants
     end # class OpenStack

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 require 'fog/openstack/models/compute/metadata'
 
 module Fog
   module Compute
     class OpenStack
-      class Volume < Fog::Model
+      class Volume < Fog::OpenStack::Model
         identity :id
 
         attribute :name,                :aliases => 'displayName'
@@ -17,12 +17,6 @@ module Fog
         attribute :created_at,          :aliases => 'createdAt'
         attribute :attachments
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
         def save
           requires :name, :description, :size
           data = service.create_volume(name, description, size, attributes)