fog 1.32.0 → 1.33.0

data/lib/fog/openstack/models/baremetal/driver.rb

@@ -1,20 +1,14 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Baremetal
     class OpenStack
-      class Driver < Fog::Model
+      class Driver < Fog::OpenStack::Model
         identity :name
 
         attribute :name
         attribute :hosts
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
         def properties
           requires :name
           service.get_driver_properties(self.name).body

data/lib/fog/openstack/models/baremetal/drivers.rb

@@ -1,18 +1,16 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/baremetal/driver'
 
 module Fog
   module Baremetal
     class OpenStack
-      class Drivers < Fog::Collection
+      class Drivers < Fog::OpenStack::Collection
         model Fog::Baremetal::OpenStack::Driver
 
         def all(options = {})
-          load(service.list_drivers(options).body['drivers'])
+          load_response(service.list_drivers(options), 'drivers')
         end
 
-        alias_method :summary, :all
-
         def find_by_name(name)
           new(service.get_driver(name).body)
         end

data/lib/fog/openstack/models/baremetal/node.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Baremetal
     class OpenStack
-      class Node < Fog::Model
+      class Node < Fog::OpenStack::Model
         identity :uuid
 
         attribute :instance_uuid
@@ -29,17 +29,6 @@ module Fog
         attribute :target_power_state
         attribute :target_provision_state
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
-        def save
-          requires :driver
-          identity ? update : create
-        end
-
         def create
           requires :driver
           merge_attributes(service.create_node(self.attributes).body)
@@ -47,7 +36,7 @@ module Fog
         end
 
         def update(patch=nil)
-          requires :uuid
+          requires :uuid, :driver
           if patch
             merge_attributes(service.patch_node(uuid, patch).body)
           else

data/lib/fog/openstack/models/baremetal/nodes.rb

@@ -1,18 +1,18 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/baremetal/node'
 
 module Fog
   module Baremetal
     class OpenStack
-      class Nodes < Fog::Collection
+      class Nodes < Fog::OpenStack::Collection
         model Fog::Baremetal::OpenStack::Node
 
         def all(options = {})
-          load(service.list_nodes_detailed(options).body['nodes'])
+          load_response(service.list_nodes_detailed(options), 'nodes')
         end
 
         def summary(options = {})
-          load(service.list_nodes(options).body['nodes'])
+          load_response(service.list_nodes(options), 'nodes')
         end
 
         def details(options = {})

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Baremetal
     class OpenStack
-      class Port < Fog::Model
+      class Port < Fog::OpenStack::Model
         identity :uuid
 
         attribute :address
@@ -15,17 +15,6 @@ module Fog
         attribute :extra
         attribute :node_uuid
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
-        def save
-          requires :address, :node_uuid
-          identity ? update : create
-        end
-
         def create
           requires :address, :node_uuid
           merge_attributes(service.create_port(self.attributes).body)
@@ -33,7 +22,7 @@ module Fog
         end
 
         def update(patch=nil)
-          requires :uuid
+          requires :uuid, :address, :node_uuid
           if patch
             merge_attributes(service.patch_port(uuid, patch).body)
           else

data/lib/fog/openstack/models/baremetal/ports.rb

@@ -1,18 +1,18 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/baremetal/port'
 
 module Fog
   module Baremetal
     class OpenStack
-      class Ports < Fog::Collection
+      class Ports < Fog::OpenStack::Collection
         model Fog::Baremetal::OpenStack::Port
 
         def all(options = {})
-          load(service.list_ports_detailed(options).body['ports'])
+          load_response(service.list_ports_detailed(options), 'ports')
         end
 
         def summary(options = {})
-          load(service.list_ports(options).body['ports'])
+          load_response(service.list_ports(options), 'ports')
         end
 
         def details(options = {})

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

@@ -0,0 +1,45 @@
+require 'fog/core/collection'
+
+module Fog
+  module OpenStack
+    class Collection < Fog::Collection
+      # It's important to store the whole response, it contains e.g. important info about whether there is another
+      # page of data.
+      attr_accessor :response
+
+      def load_response(response, index = nil)
+        # Delete it index if it's there, so we don't store response with data twice, but we store only metadata
+        objects = index ? response.body.delete(index) : response.body
+
+        clear && objects.each { |object| self << new(object) }
+        self.response = response
+        self
+      end
+
+      ##################################################################################################################
+      # Abstract base class methods, please keep the consistent naming in all subclasses of the Collection class
+
+      # Returns detailed list of records
+      def all(options = {})
+        raise Fog::OpenStack::Errors::InterfaceNotImplemented.new('Method :all is not implemented')
+      end
+
+      # Returns non detailed list of records, usually just subset of attributes, which makes this call more effective.
+      # Not all openstack services support non detailed list, so it delegates to :all by default.
+      def summary(options = {})
+        all(options)
+      end
+
+      # Gets record given record's UUID
+      def get(uuid)
+        raise Fog::OpenStack::Errors::InterfaceNotImplemented.new('Method :get is not implemented')
+      end
+      alias_method :find_by_id, :get
+
+      # Destroys record given record's UUID
+      def destroy(uuid)
+        raise Fog::OpenStack::Errors::InterfaceNotImplemented.new('Method :destroy is not implemented')
+      end
+    end
+  end
+end

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

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

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

@@ -1,18 +1,16 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/address'
 
 module Fog
   module Compute
     class OpenStack
-      class Addresses < Fog::Collection
+      class Addresses < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::Address
 
         def all(options = {})
-          load(service.list_all_addresses(options).body['floating_ips'])
+          load_response(service.list_all_addresses(options), 'floating_ips')
         end
 
-        alias_method :summary, :all
-
         def get(address_id)
           if address = service.get_address(address_id).body['floating_ip']
             new(address)

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Compute
     class OpenStack
-      class Aggregate < Fog::Model
+      class Aggregate < Fog::OpenStack::Model
         identity :id
 
         attribute :availability_zone
@@ -17,12 +17,6 @@ module Fog
         # Detailed
         attribute :hosts
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
         def save
           requires :name
           identity ? update : create

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

@@ -1,18 +1,16 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/aggregate'
 
 module Fog
   module Compute
     class OpenStack
-      class Aggregates < Fog::Collection
+      class Aggregates < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::Aggregate
 
         def all(options = {})
-          load(service.list_aggregates(options).body['aggregates'])
+          load_response(service.list_aggregates(options), 'aggregates')
         end
 
-        alias_method :summary, :all
-
         def find_by_id(id)
           new(service.get_aggregate(id).body['aggregate'])
         end

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

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

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

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

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Compute
     class OpenStack
-      class Flavor < Fog::Model
+      class Flavor < Fog::OpenStack::Model
         identity :id
 
         attribute :name
@@ -18,12 +18,6 @@ module Fog
         attribute :is_public, :aliases => 'os-flavor-access:is_public'
         attribute :disabled, :aliases => 'OS-FLV-DISABLED:disabled'
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
         def save
           requires :name, :ram, :vcpus, :disk
           attributes[:ephemeral] = self.ephemeral || 0

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

@@ -1,20 +1,20 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/flavor'
 
 module Fog
   module Compute
     class OpenStack
-      class Flavors < Fog::Collection
+      class Flavors < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::Flavor
 
         def all(options = {})
-          data = service.list_flavors_detail(options).body['flavors']
-          load(data)
+          data = service.list_flavors_detail(options)
+          load_response(data, 'flavors')
         end
 
         def summary(options = {})
-          data = service.list_flavors(options).body['flavors']
-          load(data)
+          data = service.list_flavors(options)
+          load_response(data, 'flavors')
         end
 
         def get(flavor_id)

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

@@ -4,7 +4,7 @@ require 'fog/openstack/models/compute/metadata'
 module Fog
   module Compute
     class OpenStack
-      class Host < Fog::Model
+      class Host < Fog::OpenStack::Model
         attribute :host_name
         attribute :service_name
         attribute :details

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

@@ -1,19 +1,17 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/host'
 
 module Fog
   module Compute
     class OpenStack
-      class Hosts < Fog::Collection
+      class Hosts < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::Host
 
         def all(options = {})
-          data = service.list_hosts(options).body['hosts']
-          load(data)
+          data = service.list_hosts(options)
+          load_response(data, 'hosts')
         end
 
-        alias_method :summary, :all
-
         def get(host_name)
           if host = service.get_host_details(host_name).body['host']
             new({

data/lib/fog/openstack/models/compute/image.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 Image < Fog::Model
+      class Image < Fog::OpenStack::Model
         identity :id
 
         attribute :name
@@ -18,12 +18,6 @@ module Fog
         attribute :metadata
         attribute :links
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
         def metadata
           @metadata ||= begin
             Fog::Compute::OpenStack::Metadata.new({