fog 1.31.0 → 1.32.0

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

@@ -19,6 +19,8 @@ module Fog
           load(service.list_security_group_rules(filters).body['security_group_rules'])
         end
 
+        alias_method :summary, :all
+
         def get(sec_group_rule_id)
           if sec_group_rule = service.get_security_group_rule(sec_group_rule_id).body['security_group_rule']
             new(sec_group_rule)

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

@@ -19,6 +19,8 @@ module Fog
           load(service.list_security_groups(filters).body['security_groups'])
         end
 
+        alias_method :summary, :all
+
         def get(security_group_id)
           if security_group = service.get_security_group(security_group_id).body['security_group']
             new(security_group)

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

@@ -19,6 +19,8 @@ module Fog
           load(service.list_subnets(filters).body['subnets'])
         end
 
+        alias_method :summary, :all
+
         def get(subnet_id)
           if subnet = service.get_subnet(subnet_id).body['subnet']
             new(subnet)

data/lib/fog/openstack/models/orchestration/events.rb

@@ -6,16 +6,20 @@ module Fog
       class Events < Fog::Collection
         model Fog::Orchestration::OpenStack::Event
 
-        def all(obj, options={})
-          data = if obj.is_a?(Stack)
-            service.list_stack_events(obj, options).body['events']
-          else
-            service.list_resource_events(obj.stack, obj, options).body['events']
-          end
+        def all(options = {}, options_deprecated = {})
+          data = if options.is_a?(Stack)
+                   service.list_stack_events(options, options_deprecated).body['events']
+                 elsif options.is_a?(Hash)
+                   service.list_events(options).body['events']
+                 else
+                   service.list_resource_events(options.stack, options, options_deprecated).body['events']
+                 end
 
           load data
         end
 
+        alias_method :summary, :all
+
         def get(stack, resource, event_id)
           data = service.show_event_details(stack, resource, event_id).body['event']
           new(data)

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

@@ -10,11 +10,13 @@ module Fog
           service.list_resource_types.body['resource_types'].sort
         end
 
-        def all(stack, options={})
-          data = service.list_resources(stack, options).body['resources']
+        def all(options = {}, deprecated_options = {})
+          data = service.list_resources(options, deprecated_options).body['resources']
           load(data)
         end
 
+        alias_method :summary, :all
+
         def get(resource_name, stack=nil)
           stack = self.first.stack if stack.nil?
           data  = service.show_resource_data(stack.stack_name, stack.id, resource_name).body['resource']

data/lib/fog/openstack/models/orchestration/stack.rb

@@ -7,7 +7,7 @@ module Fog
 
         %w{capabilities description disable_rollback links notification_topics outputs parameters
             stack_name stack_status stack_status_reason template_description timeout_mins parent
-            creation_time updated_time}.each do |a|
+            creation_time updated_time stack_user_project_id stack_owner}.each do |a|
           attribute a.to_sym
         end
 

data/lib/fog/openstack/models/orchestration/stacks.rb

@@ -6,7 +6,15 @@ module Fog
       class Stacks < Fog::Collection
         model Fog::Orchestration::OpenStack::Stack
 
-        def all(options={})
+        def all(options = {})
+          # TODO(lsmola) we can uncomment this when https://bugs.launchpad.net/heat/+bug/1468318 is fixed, till then
+          # we will use non detailed list
+          # data = service.list_stack_data_detailed(options).body['stacks']
+          data = service.list_stack_data(options).body['stacks']
+          load(data)
+        end
+
+        def summary(options = {})
           data = service.list_stack_data(options).body['stacks']
           load(data)
         end

data/lib/fog/openstack/models/planning/plans.rb

@@ -7,10 +7,12 @@ module Fog
       class Plans < Fog::Collection
         model Fog::Openstack::Planning::Plan
 
-        def all
-          load(service.list_plans.body)
+        def all(options = {})
+          load(service.list_plans(options).body)
         end
 
+        alias_method :summary, :all
+
         def find_by_uuid(plan_uuid)
           new(service.get_plan(plan_uuid).body)
         end

data/lib/fog/openstack/models/planning/roles.rb

@@ -7,9 +7,12 @@ module Fog
       class Roles < Fog::Collection
         model Fog::Openstack::Planning::Role
 
-        def all
-          load(service.list_roles.body)
+        def all(options = {})
+          load(service.list_roles(options).body)
         end
+
+        alias_method :summary, :all
+
       end
     end
   end

data/lib/fog/openstack/models/storage/directories.rb

@@ -7,11 +7,13 @@ module Fog
       class Directories < Fog::Collection
         model Fog::Storage::OpenStack::Directory
 
-        def all
-          data = service.get_containers.body
+        def all(options = {})
+          data = service.get_containers(options).body
           load(data)
         end
 
+        alias_method :summary, :all
+
         def get(key, options = {})
           data = service.get_container(key, options)
           directory = new(:key => key)

data/lib/fog/openstack/models/storage/files.rb

@@ -33,6 +33,8 @@ module Fog
           end
         end
 
+        alias_method :summary, :all
+
         alias_method :each_file_this_page, :each
         def each
           if !block_given?

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

@@ -8,6 +8,7 @@ module Fog
 
         attribute :display_name,        :aliases => 'displayName'
         attribute :display_description, :aliases => 'displayDescription'
+        attribute :metadata
         attribute :status
         attribute :size
         attribute :volume_type,         :aliases => ['volumeType', 'type']

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

@@ -12,6 +12,8 @@ module Fog
           load(response.body['volume_types'])
         end
 
+        alias_method :summary, :all
+
         def get(volume_type_id)
           if volume_type = service.get_volume_type_details(volume_type_id).body['volume_type']
             new(volume_type)

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

@@ -7,11 +7,22 @@ module Fog
       class Volumes < Fog::Collection
         model Fog::Volume::OpenStack::Volume
 
-        def all(options = {:detailed => true})
+        def all(options = {})
           # the parameter has been "detailed = true" before. Make sure we are
           # backwards compatible
           detailed = options.is_a?(Hash) ? options.delete(:detailed) : options
-          load(service.list_volumes(detailed, options).body['volumes'])
+          if detailed.nil? || detailed
+            # This method gives details by default, unless false or {:detailed => false} is passed
+            load(service.list_volumes_detailed(options).body['volumes'])
+          else
+            Fog::Logger.deprecation('Calling OpenStack[:volume].volumes.all(false) or volumes.all(:detailed => false) '\
+                                    ' is deprecated, call .volumes.summary instead')
+            load(service.list_volumes(options).body['volumes'])
+          end
+        end
+
+        def summary(options = {})
+          load(service.list_volumes(options).body['volumes'])
         end
 
         def get(volume_id)

data/lib/fog/openstack/network.rb

@@ -204,10 +204,13 @@ module Fog
           @data = nil
         end
 
+        include Fog::OpenStack::Core
+
         def initialize(options={})
-          @openstack_username = options[:openstack_username]
-          @openstack_tenant   = options[:openstack_tenant]
-          @openstack_tenant_id = options[:openstack_tenant_id]
+          @auth_token = Fog::Mock.random_base64(64)
+          @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+          initialize_identity options
         end
 
         def data
@@ -218,71 +221,35 @@ module Fog
           self.class.data.delete("#{@openstack_username}-#{@openstack_tenant}")
         end
 
-        def credentials
-          { :provider                 => 'openstack',
-            :openstack_auth_url       => @openstack_auth_uri.to_s,
-            :openstack_auth_token     => @auth_token,
-            :openstack_management_url => @openstack_management_url }
-        end
       end
 
       class Real
-        attr_reader :current_user
-        attr_reader :current_tenant
-        attr_reader :openstack_user_domain
-        attr_reader :openstack_project_domain
+
+        include Fog::OpenStack::Core
 
         def initialize(options={})
-          @openstack_auth_token = options[:openstack_auth_token]
-
-          unless @openstack_auth_token
-            missing_credentials = Array.new
-            @openstack_api_key  = options[:openstack_api_key]
-            @openstack_username = options[:openstack_username]
-            @openstack_user_domain = options[:openstack_user_domain] || options[:openstack_domain]
-            @openstack_project_domain  = options[:openstack_project_domain]  || options[:openstack_domain] || 'Default'
-
-            missing_credentials << :openstack_api_key  unless @openstack_api_key
-            missing_credentials << :openstack_username unless @openstack_username
-            raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
-          end
 
-          @openstack_tenant               = options[:openstack_tenant]
-          @openstack_tenant_id             = options[:openstack_tenant_id]
-          @openstack_user_domain           = options[:openstack_user_domain] || options[:openstack_domain]
-          @openstack_project_domain            = options[:openstack_project_domain]  || options[:openstack_domain] || 'Default'
-          @openstack_auth_uri             = URI.parse(options[:openstack_auth_url])
-          @openstack_management_url       = options[:openstack_management_url]
-          @openstack_must_reauthenticate  = false
+          initialize_identity options
+
           @openstack_service_type         = options[:openstack_service_type] || ['network']
           @openstack_service_name         = options[:openstack_service_name]
-          @openstack_endpoint_type        = options[:openstack_endpoint_type] || 'publicURL'
-          @openstack_region               = options[:openstack_region]
 
           @connection_options = options[:connection_options] || {}
 
-          @current_user = options[:current_user]
-          @current_tenant = options[:current_tenant]
-
           authenticate
 
+          @path.sub!(/\/$/, '')
+          unless @path.match(SUPPORTED_VERSIONS)
+            @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
+                                                               @openstack_management_uri,
+                                                               @auth_token,
+                                                               @connection_options)
+          end
+
           @persistent = options[:persistent] || false
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
-        def credentials
-          { :provider                 => 'openstack',
-            :openstack_tenant_id      => @openstack_tenant_id,
-            :openstack_user_domain    => @openstack_user_domain,
-            :openstack_project_domain     => @openstack_project_domain,
-            :openstack_auth_url       => @openstack_auth_uri.to_s,
-            :openstack_auth_token     => @auth_token,
-            :openstack_management_url => @openstack_management_url,
-            :current_user             => @current_user,
-            :current_tenant           => @current_tenant,
-            :openstack_region         => @openstack_region }
-        end
-
         def reload
           @connection.reset
         end
@@ -319,52 +286,6 @@ module Fog
           response
         end
 
-        private
-
-        def authenticate
-          if !@openstack_management_url || @openstack_must_reauthenticate
-            options = {
-              :openstack_tenant        => @openstack_tenant,
-              :openstack_tenant_id      => @openstack_tenant_id,
-              :openstack_api_key       => @openstack_api_key,
-              :openstack_username      => @openstack_username,
-              :openstack_user_domain    => @openstack_user_domain,
-              :openstack_project_domain     => @openstack_project_domain,
-              :openstack_auth_uri      => @openstack_auth_uri,
-              :openstack_auth_token    => @openstack_must_reauthenticate ? nil : @openstack_auth_token,
-              :openstack_service_type  => @openstack_service_type,
-              :openstack_service_name  => @openstack_service_name,
-              :openstack_endpoint_type => @openstack_endpoint_type,
-              :openstack_region        => @openstack_region
-            }
-
-            credentials = Fog::OpenStack.authenticate(options, @connection_options)
-
-            @current_user = credentials[:user]
-            @current_tenant = credentials[:tenant]
-
-            @openstack_must_reauthenticate = false
-            @auth_token = credentials[:token]
-            @openstack_management_url = credentials[:server_management_url]
-            uri = URI.parse(@openstack_management_url)
-          else
-            @auth_token = @openstack_auth_token
-            uri = URI.parse(@openstack_management_url)
-          end
-
-          @host   = uri.host
-          @path   = uri.path
-          @path.sub!(/\/$/, '')
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
-                                                               uri,
-                                                               @auth_token,
-                                                               @connection_options)
-          end
-          @port   = uri.port
-          @scheme = uri.scheme
-          true
-        end
       end
     end
   end

data/lib/fog/openstack/orchestration.rb

@@ -32,10 +32,12 @@ module Fog
       request :create_stack
       request :delete_stack
       request :get_stack_template
+      request :list_events
       request :list_resource_events
       request :list_resource_types
       request :list_resources
       request :list_stack_data
+      request :list_stack_data_detailed
       request :list_stack_events
       request :preview_stack
       request :show_event_details

data/lib/fog/openstack/requests/baremetal/list_chassis.rb

@@ -2,18 +2,12 @@ module Fog
   module Baremetal
     class OpenStack
       class Real
-        def list_chassis(parameters=nil)
-          if parameters
-            query = parameters.each { |k, v| parameters[k] = URI::encode(v) }
-          else
-            query = {}
-          end
-
+        def list_chassis(options = {})
           request(
             :expects => [200, 204],
             :method  => 'GET',
             :path    => 'chassis',
-            :query   => query
+            :query   => options
           )
         end
       end # class Real

data/lib/fog/openstack/requests/baremetal/list_chassis_detailed.rb

@@ -2,24 +2,18 @@ module Fog
   module Baremetal
     class OpenStack
       class Real
-        def list_chassis_detailed(parameters=nil)
-          if parameters
-            query = parameters.each { |k, v| parameters[k] = URI::encode(v) }
-          else
-            query = {}
-          end
-
+        def list_chassis_detailed(options = {})
           request(
             :expects => [200, 204],
             :method  => 'GET',
             :path    => 'chassis/detail',
-            :query   => query
+            :query   => options
           )
         end
       end # class Real
 
       class Mock
-        def list_chassis_detailed(parameters=nil)
+        def list_chassis_detailed(options = {})
           response = Excon::Response.new
           response.status = [200, 204][rand(1)]
           response.body = { "chassis" => self.data[:chassis_collection] }

data/lib/fog/openstack/requests/baremetal/list_drivers.rb

@@ -2,17 +2,18 @@ module Fog
   module Baremetal
     class OpenStack
       class Real
-        def list_drivers
+        def list_drivers(options = {})
           request(
             :expects => [200, 204],
             :method  => 'GET',
-            :path    => 'drivers'
+            :path    => 'drivers',
+            :query   => options
           )
         end
       end # class Real
 
       class Mock
-        def list_drivers
+        def list_drivers(options = {})
           response = Excon::Response.new
           response.status = [200, 204][rand(1)]
           response.body = { "drivers" => self.data[:drivers] }

data/lib/fog/openstack/requests/baremetal/list_nodes.rb

@@ -2,24 +2,18 @@ module Fog
   module Baremetal
     class OpenStack
       class Real
-        def list_nodes(parameters=nil)
-          if parameters
-            query = parameters.each { |k, v| parameters[k] = URI::encode(v) }
-          else
-            query = {}
-          end
-
+        def list_nodes(options = {})
           request(
             :expects => [200, 204],
             :method  => 'GET',
             :path    => 'nodes',
-            :query   => query
+            :query   => options
           )
         end
       end # class Real
 
       class Mock
-        def list_nodes(parameters=nil)
+        def list_nodes(options = {})
           response = Excon::Response.new
           response.status = [200, 204][rand(1)]
           response.body = {