fog 1.31.0 → 1.37.0

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

@@ -0,0 +1,149 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Image
+    class OpenStack
+      class V2
+        class Image < Fog::OpenStack::Model
+          identity :id
+
+          attribute :name
+          attribute :visibility # public or private
+
+          attribute :tags
+
+          attribute :self
+          attribute :size
+          attribute :disk_format
+          attribute :container_format
+          attribute :id
+          attribute :checksum
+          attribute :self
+          attribute :file
+
+          #detailed
+          attribute :min_disk
+          attribute :created_at
+          attribute :updated_at
+          attribute :protected
+          attribute :status # "queued","saving","active","killed","deleted","pending_delete"
+          attribute :min_ram
+          attribute :owner
+          attribute :properties
+          attribute :metadata
+          attribute :location
+
+          # from snapshot support
+          attribute :network_allocated
+          attribute :base_image_ref
+          attribute :image_type
+          attribute :instance_uuid
+          attribute :user_id
+
+          def create
+            requires :name
+            merge_attributes(service.create_image(self.attributes).body)
+            self
+          end
+
+          # This overrides the behaviour of Fog::OpenStack::Model::save() which tries to be clever and
+          #  assumes save=update if an ID is present - but Image V2 allows ID to specified on creation
+          def identity
+            nil
+          end
+
+          # Hash of attributes to update is passed in. Setting value to nil will delete that attribute.
+          #  Here we convert that hash into a form suitable for Glance's usage of JSON Patch (RFC6902)
+          def update(attr = {})
+            requires :id
+            json_patch = []
+            attr.each do |key, value|
+              op = (@attributes.keys.include? key) ? 'replace' : 'add'
+              op = 'remove' if value.nil?
+              json_patch << {:op => op, :path => "/#{key}", :value => value }
+            end
+            merge_attributes(
+                service.update_image(self.id, json_patch).body)
+            self
+          end
+
+          def destroy
+            requires :id
+            service.delete_image(self.id)
+            true
+          end
+
+          def upload_data(io_obj)
+            requires :id
+            if io_obj.is_a? Hash
+              service.upload_image(self.id, nil, io_obj)
+            else
+              service.upload_image(self.id, io_obj)
+            end
+          end
+
+          def download_data(params={})
+            requires :id
+            service.download_image(self.id, content_range=params[:content_range], params)
+          end
+
+          def reactivate
+            requires :id
+            service.reactivate_image(self.id)
+          end
+
+          def deactivate
+            requires :id
+            service.deactivate_image(self.id)
+          end
+
+          def add_member(member_id)
+            requires :id
+            service.add_member_to_image(self.id, member_id)
+          end
+
+          def remove_member(member_id)
+            requires :id
+            service.remove_member_from_image(self.id, member_id)
+          end
+
+          def update_member(member)
+            requires :id
+            service.update_image_member(self.id, member)
+          end
+
+          def members
+            requires :id
+            service.get_image_members(self.id).body['members']
+          end
+
+          def member(member_id)
+            requires :id
+            service.get_member_details(self.id, member_id)
+          end
+
+          def add_tags(tags)
+            requires :id
+            tags.each {|tag| add_tag tag}
+          end
+
+          def add_tag(tag)
+            requires :id
+            service.add_tag_to_image(self.id, tag)
+          end
+
+          def remove_tags(tags)
+            requires :id
+            tags.each {|tag| remove_tag tag}
+          end
+
+          def remove_tag(tag)
+            requires :id
+            service.remove_tag_from_image(self.id, tag)
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/image_v2/image'
+
+module Fog
+  module Image
+    class OpenStack
+      class V2
+
+        class Images < Fog::OpenStack::Collection
+          model Fog::Image::OpenStack::V2::Image
+
+          def all(options = {})
+            load_response(service.list_images(options), 'images')
+          end
+
+          def summary(options = {})
+            load_response(service.list_images(options), 'images')
+          end
+
+          def find_by_id(id)
+            image_hash = service.get_image_by_id(id).body
+            Fog::Image::OpenStack::V2::Image.new(
+                image_hash.merge(:service => service))
+          end
+
+          alias_method :get, :find_by_id
+
+          def public
+            images = load(service.list_images.body['images'])
+            images.delete_if { |image| image.is_public == false }
+          end
+
+          def private
+            images = load(service.list_images.body['images'])
+            images.delete_if { |image| image.is_public }
+          end
+
+          def destroy(id)
+            image = self.find_by_id(id)
+            image.destroy
+          end
+
+          def method_missing(method_sym, *arguments, &block)
+            if method_sym.to_s =~ /^find_by_(.*)$/
+              load(service.list_images_detailed($1, arguments.first).body['images'])
+            else
+              super
+            end
+          end
+
+          def find_by_size_min(size)
+            find_attribute(__method__, size)
+          end
+
+          def find_by_size_max(size)
+            find_attribute(__method__, size)
+          end
+
+          def find_attribute(attribute, value)
+            attribute = attribute.to_s.gsub("find_by_", "")
+            load(service.list_images_detailed(attribute, value).body['images'])
+          end
+        end
+      end
+    end
+  end
+end

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,7 +16,7 @@ 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
 
         def get(floating_network_id)

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,7 +16,7 @@ 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
 
         def get(health_monitor_id)

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,7 +16,7 @@ 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
 
         def get(member_id)

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,7 +16,7 @@ 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
 
         def get(pool_id)

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,7 +16,7 @@ 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
 
         def get(vip_id)

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,7 +16,7 @@ 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
 
         def get(network_id)

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
@@ -15,17 +15,7 @@ module Fog
         attribute :device_owner
         attribute :device_id
         attribute :tenant_id
-
-        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
+        attribute :security_groups
 
         def create
           requires :network_id

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/network/port'
 
 module Fog
   module Network
     class OpenStack
-      class Ports < Fog::Collection
+      class Ports < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Network::OpenStack::Port
@@ -16,7 +16,7 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          load(service.list_ports(filters).body['ports'])
+          load_response(service.list_ports(filters), 'ports')
         end
 
         def get(port_id)