fog 1.32.0 → 1.33.0

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

@@ -1,24 +1,24 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/image/image'
 
 module Fog
   module Image
     class OpenStack
-      class Images < Fog::Collection
+      class Images < Fog::OpenStack::Collection
         model Fog::Image::OpenStack::Image
 
         def all(options = {})
-          load(service.list_public_images_detailed(options).body['images'])
+          load_response(service.list_public_images_detailed(options), 'images')
         end
 
         def summary(options = {})
-          load(service.list_public_images(options).body['images'])
+          load_response(service.list_public_images(options), 'images')
         end
 
         def details(options = {}, deprecated_query = nil)
           Fog::Logger.deprecation("Calling OpenStack[:glance].images.details will be removed, "\
                                   " call .images.all for detailed list.")
-          load(service.list_public_images_detailed(options, deprecated_query).body['images'])
+          load_response(service.list_public_images_detailed(options, deprecated_query), 'images')
         end
 
         def find_by_id(id)

data/lib/fog/openstack/models/metering/resource.rb

@@ -1,19 +1,14 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Metering
     class OpenStack
-      class Resource < Fog::Model
+      class Resource < Fog::OpenStack::Model
         identity :resource_id
 
         attribute :project_id
         attribute :user_id
         attribute :metadata
-
-        def initialize(attributes)
-          prepare_service_value(attributes)
-          super
-        end
       end
     end
   end

data/lib/fog/openstack/models/metering/resources.rb

@@ -1,14 +1,14 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/metering/resource'
 
 module Fog
   module Metering
     class OpenStack
-      class Resources < Fog::Collection
+      class Resources < Fog::OpenStack::Collection
         model Fog::Metering::OpenStack::Resource
 
         def all(detailed=true)
-          load(service.list_resources.body)
+          load_response(service.list_resources)
         end
 
         def find_by_id(resource_id)

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

@@ -0,0 +1,44 @@
+require 'fog/core/model'
+
+module Fog
+  module OpenStack
+    class Model < Fog::Model
+      # 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
+
+      ##################################################################################################################
+      # Abstract base class methods, please keep the consistent naming in all subclasses of the Model class
+
+      # Initialize a record
+      def initialize(attributes)
+        # Old 'connection' is renamed as service and should be used instead
+        prepare_service_value(attributes)
+        super
+      end
+
+      # Saves a record, call create or update based on identity, which marks if object was already created
+      def save
+        identity ? update : create
+      end
+
+      # Updates a record
+      def update
+        # uncomment when exception is defined in another PR
+        # raise Fog::OpenStack::Errors::InterfaceNotImplemented.new('Method :get is not implemented')
+      end
+
+      # Creates a record
+      def create
+        # uncomment when exception is defined in another PR
+        # raise Fog::OpenStack::Errors::InterfaceNotImplemented.new('Method :get is not implemented')
+      end
+
+      # Destroys a record
+      def destroy
+        # uncomment when exception is defined in another PR
+        # raise Fog::OpenStack::Errors::InterfaceNotImplemented.new('Method :get is not implemented')
+      end
+    end
+  end
+end

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Network
     class OpenStack
-      class FloatingIp < Fog::Model
+      class FloatingIp < Fog::OpenStack::Model
         identity :id
 
         attribute :floating_network_id
@@ -17,11 +17,6 @@ module Fog
           super
         end
 
-        def save
-          requires :floating_network_id
-          identity ? update : create
-        end
-
         def create
           requires :floating_network_id
           merge_attributes(service.create_floating_ip(self.floating_network_id,

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/network/floating_ip'
 
 module Fog
   module Network
     class OpenStack
-      class FloatingIps < Fog::Collection
+      class FloatingIps < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Network::OpenStack::FloatingIp
@@ -16,11 +16,9 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          load(service.list_floating_ips(filters).body['floatingips'])
+          load_response(service.list_floating_ips(filters), 'floatingips')
         end
 
-        alias_method :summary, :all
-
         def get(floating_network_id)
           if floating_ip = service.get_floating_ip(floating_network_id).body['floatingip']
             new(floating_ip)

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Network
     class OpenStack
-      class LbHealthMonitor < Fog::Model
+      class LbHealthMonitor < Fog::OpenStack::Model
         identity :id
 
         attribute :type
@@ -17,16 +17,6 @@ module Fog
         attribute :admin_state_up
         attribute :tenant_id
 
-        def initialize(attributes)
-          prepare_service_value(attributes)
-          super
-        end
-
-        def save
-          requires :type, :delay, :timeout, :max_retries
-          identity ? update : create
-        end
-
         def create
           requires :type, :delay, :timeout, :max_retries
           merge_attributes(service.create_lb_health_monitor(self.type,

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/network/lb_health_monitor'
 
 module Fog
   module Network
     class OpenStack
-      class LbHealthMonitors < Fog::Collection
+      class LbHealthMonitors < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Network::OpenStack::LbHealthMonitor
@@ -16,11 +16,9 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          load(service.list_lb_health_monitors(filters).body['health_monitors'])
+          load_response(service.list_lb_health_monitors(filters), 'health_monitors')
         end
 
-        alias_method :summary, :all
-
         def get(health_monitor_id)
           if health_monitor = service.get_lb_health_monitor(health_monitor_id).body['health_monitor']
             new(health_monitor)

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Network
     class OpenStack
-      class LbMember < Fog::Model
+      class LbMember < Fog::OpenStack::Model
         identity :id
 
         attribute :pool_id
@@ -14,16 +14,6 @@ module Fog
         attribute :admin_state_up
         attribute :tenant_id
 
-        def initialize(attributes)
-          prepare_service_value(attributes)
-          super
-        end
-
-        def save
-          requires :pool_id, :address, :protocol_port, :weight
-          identity ? update : create
-        end
-
         def create
           requires :pool_id, :address, :protocol_port, :weight
           merge_attributes(service.create_lb_member(self.pool_id,

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/network/lb_member'
 
 module Fog
   module Network
     class OpenStack
-      class LbMembers < Fog::Collection
+      class LbMembers < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Network::OpenStack::LbMember
@@ -16,11 +16,9 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          load(service.list_lb_members(filters).body['members'])
+          load_response(service.list_lb_members(filters), 'members')
         end
 
-        alias_method :summary, :all
-
         def get(member_id)
           if member = service.get_lb_member(member_id).body['member']
             new(member)

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Network
     class OpenStack
-      class LbPool < Fog::Model
+      class LbPool < Fog::OpenStack::Model
         identity :id
 
         attribute :subnet_id
@@ -22,16 +22,6 @@ module Fog
         attribute :bytes_out
         attribute :total_connections
 
-        def initialize(attributes)
-          prepare_service_value(attributes)
-          super
-        end
-
-        def save
-          requires :subnet_id, :protocol, :lb_method
-          identity ? update : create
-        end
-
         def create
           requires :subnet_id, :protocol, :lb_method
           merge_attributes(service.create_lb_pool(self.subnet_id,

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/network/lb_pool'
 
 module Fog
   module Network
     class OpenStack
-      class LbPools < Fog::Collection
+      class LbPools < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Network::OpenStack::LbPool
@@ -16,11 +16,9 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          load(service.list_lb_pools(filters).body['pools'])
+          load_response(service.list_lb_pools(filters), 'pools')
         end
 
-        alias_method :summary, :all
-
         def get(pool_id)
           if pool = service.get_lb_pool(pool_id).body['pool']
             new(pool)

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Network
     class OpenStack
-      class LbVip < Fog::Model
+      class LbVip < Fog::OpenStack::Model
         identity :id
 
         attribute :subnet_id
@@ -20,16 +20,6 @@ module Fog
         attribute :admin_state_up
         attribute :tenant_id
 
-        def initialize(attributes)
-          prepare_service_value(attributes)
-          super
-        end
-
-        def save
-          requires :subnet_id, :pool_id, :protocol, :protocol_port
-          identity ? update : create
-        end
-
         def create
           requires :subnet_id, :pool_id, :protocol, :protocol_port
           merge_attributes(service.create_lb_vip(self.subnet_id,

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/network/lb_vip'
 
 module Fog
   module Network
     class OpenStack
-      class LbVips < Fog::Collection
+      class LbVips < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Network::OpenStack::LbVip
@@ -16,11 +16,9 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          load(service.list_lb_vips(filters).body['vips'])
+          load_response(service.list_lb_vips(filters), 'vips')
         end
 
-        alias_method :summary, :all
-
         def get(vip_id)
           if vip = service.get_lb_vip(vip_id).body['vip']
             new(vip)

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Network
     class OpenStack
-      class Network < Fog::Model
+      class Network < Fog::OpenStack::Model
         identity :id
 
         attribute :name
@@ -17,16 +17,6 @@ module Fog
         attribute :provider_segmentation_id,  :aliases => 'provider:segmentation_id'
         attribute :router_external,           :aliases => 'router:external'
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
-        def save
-          identity ? update : create
-        end
-
         def subnets
           service.subnets.select {|s| s.network_id == self.id }
         end

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/network/network'
 
 module Fog
   module Network
     class OpenStack
-      class Networks < Fog::Collection
+      class Networks < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Network::OpenStack::Network
@@ -16,11 +16,9 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          load(service.list_networks(filters).body['networks'])
+          load_response(service.list_networks(filters), 'networks')
         end
 
-        alias_method :summary, :all
-
         def get(network_id)
           if network = service.get_network(network_id).body['network']
             new(network)

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Network
     class OpenStack
-      class Port < Fog::Model
+      class Port < Fog::OpenStack::Model
         identity :id
 
         attribute :name
@@ -17,17 +17,6 @@ module Fog
         attribute :tenant_id
         attribute :security_groups
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
-        def save
-          requires :network_id
-          identity ? update : create
-        end
-
         def create
           requires :network_id
           merge_attributes(service.create_port(self.network_id,