fog 1.31.0 → 1.32.0

data/lib/fog/openstack/identity.rb

@@ -28,6 +28,10 @@ module Fog
             options = {
                 :openstack_api_key => @openstack_api_key,
                 :openstack_username => @openstack_username,
+                :openstack_userid => @openstack_userid,
+                :openstack_domain_name => @openstack_domain_name,
+                :openstack_domain_id => @openstack_domain_id,
+                :openstack_project_name => @openstack_project_name,
                 :openstack_auth_token => @openstack_must_reauthenticate ? nil : @openstack_auth_token,
                 :openstack_auth_uri => @openstack_auth_uri,
                 :openstack_tenant => @openstack_tenant,

data/lib/fog/openstack/identity_v3.rb

@@ -5,15 +5,16 @@ module Fog
   module Identity
     class OpenStack
       class V3 < Fog::Service
-
         requires :openstack_auth_url
         recognizes :openstack_auth_token, :openstack_management_url, :persistent,
                    :openstack_service_type, :openstack_service_name, :openstack_tenant,
-                   :openstack_project_name, :openstack_domain_name, :openstack_userid,
-                   :openstack_api_key, :openstack_username, :openstack_current_user_id,
-                   :current_user, :current_tenant,
                    :openstack_endpoint_type, :openstack_region, :openstack_domain_id,
-                   :openstack_domain, :openstack_project, :provider
+                   :openstack_project_name, :openstack_domain_name,
+                   :openstack_user_domain, :openstack_project_domain,
+                   :openstack_user_domain_id, :openstack_project_domain_id,
+                   :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username,
+                   :current_user, :current_tenant,
+                   :provider
 
         model_path 'fog/openstack/models/identity_v3'
         model :domain
@@ -118,6 +119,7 @@ module Fog
         request :delete_policy
 
         class Mock
+          include Fog::OpenStack::Core
           def initialize(options={})
 
           end
@@ -152,30 +154,11 @@ module Fog
           attr_reader :auth_token
 
           include Fog::Identity::OpenStack::Common
+          include Fog::OpenStack::Core
 
           def initialize(options={})
-            @openstack_auth_token = options[:openstack_auth_token]
-
-            @openstack_region = options[:openstack_region]
-
-            unless @openstack_auth_token
-              missing_credentials = Array.new
-              @openstack_api_key = options[:openstack_api_key]
-              @openstack_username = options[:openstack_username]
-              @openstack_userid = options[:openstack_userid]
-
-              missing_credentials << :openstack_api_key unless @openstack_api_key
-              unless @openstack_username || @openstack_userid
-                missing_credentials << 'openstack_username or openstack_userid'
-              end
-              raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
-            end
-
+            initialize_identity options
 
-            @openstack_tenant = options[:openstack_tenant]
-            @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
-            @openstack_management_url = options[:openstack_management_url]
-            @openstack_must_reauthenticate = false
             @openstack_service_type = options[:openstack_service_type] || ['identity_v3','identityv3','identity']
             @openstack_service_name = options[:openstack_service_name]
 
@@ -185,25 +168,12 @@ module Fog
 
             @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
 
-            @current_user = options[:current_user]
-            @current_tenant = options[:current_tenant]
-
             authenticate
 
             @persistent = options[:persistent] || false
             @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
           end
 
-          def credentials
-            {:provider => 'openstack',
-             :openstack_auth_url => @openstack_auth_uri.to_s,
-             :openstack_auth_token => @auth_token,
-             :openstack_management_url => @openstack_management_url,
-             :openstack_current_user_id => @openstack_current_user_id,
-             :current_user => @current_user,
-             :current_tenant => @current_tenant}
-          end
-
           def reload
             @connection.reset
           end
@@ -240,10 +210,9 @@ module Fog
             response
           end
 
-
         end
 
       end
     end
   end
-end
+end

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

@@ -7,12 +7,18 @@ module Fog
       class ChassisCollection < Fog::Collection
         model Fog::Baremetal::OpenStack::Chassis
 
-        def all
-          load(service.list_chassis.body['chassis'])
+        def all(options = {})
+          load(service.list_chassis_detailed(options).body['chassis'])
         end
 
-        def details(parameters=nil)
-          load(service.list_chassis_detailed(parameters).body['chassis'])
+        def summary(options = {})
+          load(service.list_chassis(options).body['chassis'])
+        end
+
+        def details(options = {})
+          Fog::Logger.deprecation("Calling OpenStack[:baremetal].chassis_collection.details will be removed, "\
+                                  " call .chassis_collection.all for detailed list.")
+          load(service.list_chassis_detailed(options).body['chassis'])
         end
 
         def find_by_uuid(uuid)

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

@@ -7,10 +7,12 @@ module Fog
       class Drivers < Fog::Collection
         model Fog::Baremetal::OpenStack::Driver
 
-        def all
-          load(service.list_drivers.body['drivers'])
+        def all(options = {})
+          load(service.list_drivers(options).body['drivers'])
         end
 
+        alias_method :summary, :all
+
         def find_by_name(name)
           new(service.get_driver(name).body)
         end

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

@@ -7,12 +7,18 @@ module Fog
       class Nodes < Fog::Collection
         model Fog::Baremetal::OpenStack::Node
 
-        def all
-          load(service.list_nodes.body['nodes'])
+        def all(options = {})
+          load(service.list_nodes_detailed(options).body['nodes'])
         end
 
-        def details(parameters=nil)
-          load(service.list_nodes_detailed(parameters).body['nodes'])
+        def summary(options = {})
+          load(service.list_nodes(options).body['nodes'])
+        end
+
+        def details(options = {})
+          Fog::Logger.deprecation("Calling OpenStack[:baremetal].nodes.details will be removed, "\
+                                  " call .nodes.all for detailed list.")
+          load(service.list_nodes_detailed(options).body['nodes'])
         end
 
         def find_by_uuid(uuid)

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

@@ -7,12 +7,18 @@ module Fog
       class Ports < Fog::Collection
         model Fog::Baremetal::OpenStack::Port
 
-        def all
-          load(service.list_ports.body['ports'])
+        def all(options = {})
+          load(service.list_ports_detailed(options).body['ports'])
         end
 
-        def details(parameters=nil)
-          load(service.list_ports_detailed(parameters).body['ports'])
+        def summary(options = {})
+          load(service.list_ports(options).body['ports'])
+        end
+
+        def details(options = {})
+          Fog::Logger.deprecation("Calling OpenStack[:baremetal].ports.details will be removed, "\
+                                  " call .ports.all for detailed list.")
+          load(service.list_ports_detailed(options).body['ports'])
         end
 
         def find_by_uuid(uuid)

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

@@ -7,10 +7,12 @@ module Fog
       class Addresses < Fog::Collection
         model Fog::Compute::OpenStack::Address
 
-        def all
-          load(service.list_all_addresses.body['floating_ips'])
+        def all(options = {})
+          load(service.list_all_addresses(options).body['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

@@ -0,0 +1,64 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class OpenStack
+      class Aggregate < Fog::Model
+        identity :id
+
+        attribute :availability_zone
+        attribute :name
+        attribute :metadata
+        attribute :deleted
+        attribute :deleted_at
+        attribute :updated_at
+        attribute :created_at
+
+        # 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
+        end
+
+        def create
+          requires :name
+          merge_attributes(service.create_aggregate(self.name, self.attributes).body['aggregate'])
+          self
+        end
+
+        def update
+          merge_attributes(service.update_aggregate(self.id, self.attributes).body['aggregate'])
+          self
+        end
+
+        def add_host(host_uuid)
+          requires :id,
+          service.add_aggregate_host(self.id, host_uuid)
+        end
+
+        def remove_host(host_uuid)
+          requires :id,
+          service.remove_aggregate_host(self.id, host_uuid)
+        end
+
+        def update_metadata(metadata)
+          service.update_aggregate_metadata(self.id, metadata)
+        end
+
+        def destroy
+          requires :id
+          service.delete_aggregate(self.id)
+          true
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -12,6 +12,11 @@ module Fog
           load(data)
         end
 
+        def summary(options = {})
+          data = service.list_flavors(options).body['flavors']
+          load(data)
+        end
+
         def get(flavor_id)
           data = service.get_flavor_details(flavor_id).body['flavor']
           new(data)

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

@@ -7,11 +7,13 @@ module Fog
       class Hosts < Fog::Collection
         model Fog::Compute::OpenStack::Host
 
-        def all
-          data = service.list_hosts.body['hosts']
+        def all(options = {})
+          data = service.list_hosts(options).body['hosts']
           load(data)
         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/images.rb

@@ -26,6 +26,8 @@ module Fog
           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_pairs.rb

@@ -7,14 +7,16 @@ module Fog
       class KeyPairs < Fog::Collection
         model Fog::Compute::OpenStack::KeyPair
 
-        def all
+        def all(options = {})
           items = Array.new
-          service.list_key_pairs.body['keypairs'].each do |kp|
+          service.list_key_pairs(options).body['keypairs'].each do |kp|
             items = items + kp.values
           end
           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/security_groups.rb

@@ -7,10 +7,12 @@ module Fog
       class SecurityGroups < Fog::Collection
         model Fog::Compute::OpenStack::SecurityGroup
 
-        def all
-          load(service.list_security_groups.body['security_groups'])
+        def all(options = {})
+          load(service.list_security_groups(options).body['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/servers.rb

@@ -20,6 +20,8 @@ module Fog
           load(data)
         end
 
+        alias_method :summary, :all
+
         # Creates a new server and populates ssh keys
         # @return [Fog::Compute::OpenStack::Server]
         # @raise [Fog::Compute::OpenStack::NotFound] - HTTP 404

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

@@ -7,12 +7,15 @@ module Fog
       class Services < Fog::Collection
         model Fog::Compute::OpenStack::Service
 
-        def all(parameters=nil)
-          load(service.list_services(parameters).body['services'])
+        def all(options = {})
+          load(service.list_services(options).body['services'])
         end
 
-        def details(parameters=nil)
-          load(service.list_services(parameters).body['services'])
+        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'])
         end
       end
     end

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

@@ -7,8 +7,21 @@ module Fog
       class Snapshots < Fog::Collection
         model Fog::Compute::OpenStack::Snapshot
 
-        def all(detailed=true)
-          load(service.list_snapshots(detailed).body['snapshots'])
+        def all(options = {})
+          if !options.is_a?(Hash)
+            if options
+              Fog::Logger.deprecation('Calling OpenStack[:compute].snapshots.all(true) is deprecated, use .snapshots.all')
+            else
+              Fog::Logger.deprecation('Calling OpenStack[:compute].snapshots.all(false) is deprecated, use .snapshots.summary')
+            end
+            load(service.list_snapshots(options).body['snapshots'])
+          else
+            load(service.list_snapshots_detail(options).body['snapshots'])
+          end
+        end
+
+        def summary(options = {})
+          load(service.list_snapshots(options).body['snapshots'])
         end
 
         def get(snapshot_id)

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

@@ -7,8 +7,21 @@ module Fog
       class Volumes < Fog::Collection
         model Fog::Compute::OpenStack::Volume
 
-        def all(detailed=true)
-          load(service.list_volumes(detailed).body['volumes'])
+        def all(options = true)
+          if !options.is_a?(Hash)
+            if options
+              Fog::Logger.deprecation('Calling OpenStack[:compute].volumes.all(true) is deprecated, use .volumes.all')
+            else
+              Fog::Logger.deprecation('Calling OpenStack[:compute].volumes.all(false) is deprecated, use .volumes.summary')
+            end
+            load(service.list_volumes(options).body['volumes'])
+          else
+            load(service.list_volumes_detail(options).body['volumes'])
+          end
+        end
+
+        def summary(options = {})
+          load(service.list_volumes(options).body['volumes'])
         end
 
         def get(volume_id)