katello 4.0.3 → 4.1.0.rc1

data/app/lib/katello/event_daemon/services/agent_event_receiver.rb

@@ -2,6 +2,8 @@ module Katello
   module EventDaemon
     module Services
       class AgentEventReceiver
+        STATUS_CACHE_KEY = 'katello_agent_events'.freeze
+
         class Handler
           attr_accessor :processed, :failed
 
@@ -46,12 +48,14 @@ module Katello
           @agent_connection&.open? && @thread&.status.present?
         end
 
-        def self.status
-          {
-            running: running?,
-            processed_count: @handler&.processed || 0,
-            failed_count: @handler&.failed || 0
-          }
+        def self.status(refresh: true)
+          Rails.cache.fetch(STATUS_CACHE_KEY, force: refresh) do
+            {
+              running: running?,
+              processed_count: @handler&.processed || 0,
+              failed_count: @handler&.failed || 0
+            }
+          end
         end
       end
     end

data/app/lib/katello/http_resource.rb

@@ -137,13 +137,8 @@ module Katello
 
       # re-raise the same exception with nicer error message
       def raise_rest_client_exception(e, a_path, http_method)
-        # message method in rest-client is hardcoded - we need to override it
         msg = "#{name}: #{e.message} #{e.http_body} (#{http_method} #{a_path})"
-        (class << e; self; end).instance_eval do
-          define_method(:message) do
-            msg
-          end
-        end
+        e.message = msg
         fail e
       end
 

data/app/lib/katello/logging.rb

@@ -2,13 +2,18 @@ module Katello
   module Logging
     def self.time(message, data: {}, logger: Rails.logger, level: :info)
       start = Time.now
+      data[:success] = true
 
-      yield
-
-      data[:duration] = ((Time.now - start) * 1000).truncate(2)
-      data_string = data.map { |k, v| "#{k}=#{v}" }.join(' ')
-
-      logger.send(level, "#{message} #{data_string}")
+      begin
+        yield(data)
+      rescue => e
+        data[:success] = false
+        raise e
+      ensure
+        data[:duration] = ((Time.now - start) * 1000).truncate(2)
+        data_string = data.map { |k, v| "#{k}=#{v}" }.join(' ')
+        logger.send(level, "#{message} #{data_string}")
+      end
     end
 
     class Timer

data/app/lib/katello/qpid/connection.rb

@@ -74,13 +74,11 @@ module Katello
       def initialize(url:, ssl_cert_file:, ssl_key_file:, ssl_ca_file:)
         @url = url
         ssl_domain = ::Qpid::Proton::SSLDomain.new(::Qpid::Proton::SSLDomain::MODE_CLIENT)
-        ssl_domain.peer_authentication(::Qpid::Proton::SSLDomain::VERIFY_PEER_NAME)
         ssl_domain.credentials(ssl_cert_file, ssl_key_file, nil) if ssl_cert_file && ssl_key_file
         ssl_domain.trusted_ca_db(ssl_ca_file) if ssl_ca_file
         @connection_options = {
           ssl_domain: ssl_domain,
-          sasl_allowed_mechs: 'external',
-          virtual_host: URI.parse(url).host
+          sasl_allowed_mechs: 'external'
         }
       end
 

data/app/lib/katello/repo_discovery.rb

@@ -3,7 +3,9 @@ module Katello
     attr_reader :found, :crawled, :to_follow
 
     # rubocop:disable Metrics/ParameterLists
-    def initialize(url, content_type = 'yum', upstream_username = nil, upstream_password = nil, search = '*', proxy = {}, crawled = [], found = [], to_follow = [])
+    def initialize(url, content_type = 'yum', upstream_username = nil,
+      upstream_password = nil, search = '*', proxy = {}, crawled = [],
+      found = [], to_follow = [])
       @uri = uri(url)
       @content_type = content_type
       @upstream_username = upstream_username.empty? ? nil : upstream_username
@@ -45,6 +47,18 @@ module Katello
       }
       params[:user] = @upstream_username unless @upstream_username.empty?
       params[:password] = @upstream_password unless @upstream_password.empty?
+
+      RestClient.proxy = nil
+
+      if @proxy && @proxy[:proxy_host]
+        proxy_uri = URI(@proxy[:proxy_host])
+        proxy_uri.user = @proxy[:proxy_user] if @proxy[:proxy_user]
+        proxy_uri.password = @proxy[:proxy_password] if @proxy[:proxy_password]
+        proxy_uri.port = @proxy[:proxy_port] if @proxy[:proxy_port]
+
+        RestClient.proxy = proxy_uri.to_s
+      end
+
       begin
         results = RestClient.get(@uri.to_s + "v1/search?q=#{@search}", params)
         JSON.parse(results)['results'].each do |result|

data/app/lib/katello/resources/candlepin/owner.rb

@@ -40,12 +40,13 @@ module Katello
           end
 
           def import(organization_name, path_to_file, options)
-            path = join_path(path(organization_name), 'imports')
+            path = join_path(path(organization_name), 'imports/async')
             if options[:force] || SETTINGS[:katello].key?(:force_manifest_import)
               path += "?force=#{SETTINGS[:katello][:force_manifest_import]}"
             end
 
-            self.post(path, {:import => File.new(path_to_file, 'rb')}, self.default_headers.except('content-type'))
+            response = self.post(path, {:import => File.new(path_to_file, 'rb')}, self.default_headers.except('content-type'))
+            JSON.parse(response)
           end
 
           def product_content(organization_name)

data/app/lib/katello/resources/candlepin/pool.rb

@@ -18,8 +18,12 @@ module Katello
           end
 
           def find(pool_id)
-            pool_json = self.get(path(pool_id), self.default_headers).body
-            fail ArgumentError, "pool id cannot contain ?" if pool_id["?"]
+            begin
+              pool_json = self.get(path(pool_id), self.default_headers).body
+            rescue RestClient::ResourceNotFound
+              raise Katello::Errors::CandlepinPoolGone
+            end
+
             JSON.parse(pool_json).with_indifferent_access
           end
 

data/app/lib/katello/resources/candlepin.rb

@@ -19,6 +19,16 @@ module Katello
             logger.send(debug_level, "Candlepin request #{response.headers[:x_candlepin_request_uuid]} returned with code #{response.code}")
             super
           end
+
+          def raise_rest_client_exception(error, path, http_method)
+            # this differentiates between Tomcat returning a 404 (candlepin is down or not deployed)
+            # vs a 404 from Candlepin itself
+            unless error&.response&.headers&.dig(:x_version)
+              fail ::Katello::Errors::CandlepinNotRunning
+            end
+
+            super
+          end
         end
 
         def self.logger

data/app/lib/katello/util/package.rb

@@ -59,7 +59,7 @@ module Katello
       end
 
       def self.format_requires(requires)
-        flags = {'GT' => '>', 'LT' => '>', 'EQ' => '=', 'GE' => '>=', 'LE' => '<='}
+        flags = {'GT' => '>', 'LT' => '<', 'EQ' => '=', 'GE' => '>=', 'LE' => '<='}
         if requires['flags']
           "#{requires['name']} #{flags[requires['flags']]} #{build_vrea(requires, false)}"
         else

data/app/lib/katello/util/pulpcore_content_filters.rb

@@ -8,7 +8,7 @@ module Katello
       def filter_package_groups_by_pulp_href(package_groups, package_pulp_hrefs)
         rpms = Katello::Rpm.where(:pulp_id => package_pulp_hrefs)
         package_groups.reject do |package_group|
-          (package_group.package_names & rpms.pluck(:name)).empty?
+          (package_group.package_names - rpms.pluck(:name)).any?
         end
       end
 

data/app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb

@@ -2,12 +2,6 @@ module Katello
   module Validators
     class HostgroupKickstartRepositoryValidator < ActiveModel::Validator
       def validate(facet)
-        # check content source first, otherwise it's meaningless to proceed
-        if facet.content_source && facet.lifecycle_environment
-          valid = facet.content_source.lifecycle_environments.include?(facet.lifecycle_environment)
-          facet.errors.add(:base, _("The selected content source and lifecycle environment do not match")) && return unless valid
-        end
-
         return unless facet.kickstart_repository_id
 
         msg = if facet.content_source.blank?

data/app/models/katello/authorization/content_view.rb

@@ -49,6 +49,14 @@ module Katello
         ::User.current.can?(:view_content_views)
       end
 
+      def creatable?
+        ::User.current.can?(:create_content_views)
+      end
+
+      def publishable?
+        ::User.current.can?(:publish_content_views)
+      end
+
       def editable
         authorized(:edit_content_views)
       end

data/app/models/katello/authorization/content_view_version_import_history.rb

@@ -0,0 +1,11 @@
+module Katello
+  module Authorization::ContentViewVersionImportHistory
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def readable
+        joins(:content_view_version).merge(Katello::ContentViewVersion.readable)
+      end
+    end
+  end
+end

data/app/models/katello/concerns/content_facet_host_extensions.rb

@@ -63,7 +63,7 @@ module Katello
           property :content_view, 'ContentView', desc: 'Returns content view associated with the host'
           property :lifecycle_environment, 'KTEnvironment', desc: 'Returns lifecycle environment object associated with the host'
           property :content_source, 'SmartProxy', desc: 'Returns Smart Proxy object as the content source for the host'
-          property :applicable_errata, array_of: 'Erratum', desc: 'Returns Smart Proxy object as the content source for the host'
+          property :applicable_errata, array_of: 'Erratum', desc: 'Returns errata applicable to the host'
         end
       end
 

data/app/models/katello/concerns/content_view_filter_rule_common.rb

@@ -4,8 +4,8 @@ module Katello
       extend ActiveSupport::Concern
 
       included do
-        scoped_search on: :id
-        scoped_search on: :name
+        scoped_search on: :id, :complete_value => true
+        scoped_search on: :name, :complete_value => true
 
         validates_lengths_from_database
       end

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -50,7 +50,6 @@ module Katello
 
         has_many :hypervisor_pools, :class_name => '::Katello::Pool', :foreign_key => :hypervisor_id, :dependent => :nullify
 
-        before_save :correct_puppet_environment
         before_validation :correct_kickstart_repository
         before_update :check_host_registration, :if => proc { organization_id_changed? }
 
@@ -148,23 +147,6 @@ module Katello
         [:update]
       end
 
-      def correct_puppet_environment
-        if content_and_puppet_matched?
-          new_environment = content_facet.content_view.puppet_env(content_facet.lifecycle_environment).try(:puppet_environment)
-          self.environment = new_environment if new_environment
-        end
-      end
-
-      def content_and_puppet_matched?
-        content_facet && content_facet.content_view_id_was == environment.try(:content_view).try(:id) &&
-          content_facet.lifecycle_environment_id_was == self.environment.try(:lifecycle_environment).try(:id)
-      end
-
-      def content_and_puppet_match?
-        content_facet && content_facet.content_view_id == environment.try(:content_view).try(:id) &&
-          content_facet.lifecycle_environment_id == self.environment.try(:lifecycle_environment).try(:id)
-      end
-
       def import_package_profile(simple_packages)
         found = import_package_profile_in_bulk(simple_packages)
         sync_package_associations(found.map(&:id).uniq)
@@ -233,15 +215,10 @@ module Katello
         new_ids = new_available_module_streams.keys - old_associated_ids
         new_ids.each do |new_id|
           module_stream = new_available_module_streams[new_id]
-          status = module_stream["status"]
-          # Set status to "unknown" only if the active field is in use and set to false and the module is enabled
-          if enabled_module_stream_inactive?(module_stream)
-            status = "unknown"
-          end
           self.host_available_module_streams.create!(host_id: self.id,
                                                      available_module_stream_id: new_id,
                                                      installed_profiles: module_stream["installed_profiles"],
-                                                     status: status)
+                                                     status: module_stream["status"])
         end
 
         upgradable_streams.each do |hams|
@@ -251,10 +228,6 @@ module Katello
           if hams.attributes.slice(*shared_keys) != module_stream_data
             hams.update!(module_stream_data)
           end
-          # Set status to "unknown" only if the active field is in use and set to false and the module is enabled
-          if enabled_module_stream_inactive?(module_stream)
-            hams.update!(status: "unknown")
-          end
         end
       end
 
@@ -374,10 +347,6 @@ module Katello
         self.get_status(::Katello::TraceStatus).refresh!
         self.refresh_global_status!
       end
-
-      def enabled_module_stream_inactive?(module_stream)
-        !module_stream["active"].nil? && module_stream["active"] == false && module_stream["status"] == "enabled"
-      end
     end
   end
 end

data/app/models/katello/concerns/hostgroup_extensions.rb

@@ -90,11 +90,6 @@ module Katello
         end
       end
 
-      def content_and_puppet_match?
-        self.content_view && self.lifecycle_environment && self.content_view == self.environment.try(:content_view) &&
-            self.lifecycle_environment == self.environment.try(:lifecycle_environment)
-      end
-
       def equivalent_kickstart_repository
         return unless operatingsystem &&
                       kickstart_repository &&
@@ -107,9 +102,7 @@ module Katello
         return true unless operatingsystem
 
         if operatingsystem.respond_to? :kickstart_repos
-          operatingsystem.kickstart_repos(self, content_facet: content_facet).any? do |repo|
-            repo[:id] == (content_facet&.kickstart_repository_id || content_facet&.kickstart_repository&.id)
-          end
+          return operatingsystem.kickstart_repos(self).any? { |repo| repo[:id] == (content_facet&.kickstart_repository_id || content_facet&.kickstart_repository&.id) }
         end
       end
 
@@ -128,7 +121,7 @@ module Katello
           facet_model = Facets.registered_facets[facet].hostgroup_configuration.model
           value = facet_model.where.not(attribute => nil).joins(:hostgroup).merge(
             ::Hostgroup.where(id: self.ancestor_ids).reorder(ancestry: :desc)
-          ).limit(1).pluck(attribute).first
+          ).limit(1).pluck(attribute)
         end
         value
       end

data/app/models/katello/concerns/http_proxy_extensions.rb

@@ -49,10 +49,8 @@ module Katello
         changes = self.previous_changes
         if changes.key?(:name)
           previous_name = changes[:name].first
-          setting = Setting.find_by(name: 'content_default_http_proxy')
-
-          if setting && setting.value == previous_name && !previous_name.blank?
-            setting.update_attribute(:value, self.name)
+          if !previous_name.blank? && Setting['content_default_http_proxy'] == previous_name
+            Setting['content_default_http_proxy'] = self.name
           end
         end
       end

data/app/models/katello/concerns/location_extensions.rb

@@ -20,9 +20,6 @@ module Katello
           if ::Setting[:default_location_subscribed_hosts] == self.title_before_last_save
             ::Setting[:default_location_subscribed_hosts] = self.title
           end
-          if ::Setting[:default_location_puppet_content] == self.title_before_last_save
-            ::Setting[:default_location_puppet_content] = self.title
-          end
         end
       end
 
@@ -34,9 +31,7 @@ module Katello
         if ::Location.unscoped.count == 1
           errors.add(
             :base,
-            _('Cannot delete the last Location. '\
-              'Foreman needs at least one Location to put newly published '\
-              'Puppet content and Hosts registered via subscription-manager'))
+            _('Cannot delete the last Location.'))
           false
         elsif title == ::Setting[:default_location_subscribed_hosts]
           errors.add(
@@ -46,14 +41,6 @@ module Katello
               'subscribed hosts under Administer > Settings, tab Content.')
           )
           false
-        elsif title == ::Setting[:default_location_puppet_content]
-          errors.add(
-            :base,
-            _('Cannot delete the default Location for Puppet content. If you '\
-              'no longer want this Location, change the default Location for '\
-              'Puppet content under Administer > Settings, tab Content.')
-          )
-          false
         else
           true
         end
@@ -67,16 +54,6 @@ module Katello
       end
 
       module ClassMethods
-        def default_puppet_content_location
-          ::Location.unscoped.find_by_title(::Setting[:default_location_puppet_content]) if ::Setting[:default_location_puppet_content].present?
-        end
-
-        def default_puppet_content_location!
-          location = default_puppet_content_location
-          fail _("Setting 'default_location_puppet_content' is not set to a valid location.") if location.nil?
-          location
-        end
-
         def default_host_subscribe_location
           ::Location.unscoped.find_by_title(::Setting[:default_location_subscribed_hosts]) if ::Setting[:default_location_subscribed_hosts].present?
         end
@@ -88,7 +65,7 @@ module Katello
         end
 
         def default_location_ids
-          [default_host_subscribe_location, default_puppet_content_location].compact.map(&:id).uniq
+          [default_host_subscribe_location].compact.map(&:id).uniq
         end
       end
     end

data/app/models/katello/concerns/operatingsystem_extensions.rb

@@ -17,8 +17,6 @@ module Katello
           TemplateKind.all.each do |kind|
             if name == ::Operatingsystem::REDHAT_ATOMIC_HOST_OS && kind.name == "provision"
               provisioning_template_name = Setting["katello_default_atomic_provision"]
-            elsif kind.name == 'registration'
-              provisioning_template_name = 'Linux registration default'
             else
               provisioning_template_name = Setting["katello_default_#{kind.name}"]
             end

data/app/models/katello/concerns/organization_extensions.rb

@@ -39,6 +39,8 @@ module Katello
 
         scope :with_upstream_pools, -> { joins(:pools).merge(Katello::Pool.upstream).distinct }
         scope :having_name_or_label, ->(name_or_label) { where("name = :id or label = :id", :id => name_or_label) }
+        scope :created_in_katello, -> { where(created_in_katello: true) }
+        scope :not_created_in_katello, -> { where.not(created_in_katello: true) }
         scoped_search :on => :label, :complete_value => :true
 
         after_create :associate_default_capsule
@@ -104,14 +106,6 @@ module Katello
           self.task_statuses.where(:task_type => :repo_discovery).order('created_at DESC').first
         end
 
-        def create_library
-          self.library = Katello::KTEnvironment.new(:name => "Library", :label => "Library", :library => true, :organization => self)
-        end
-
-        def create_redhat_provider
-          self.providers << Katello::Provider.new(:name => "Red Hat", :provider_type => Katello::Provider::REDHAT)
-        end
-
         def associate_default_capsule
           smart_proxy = SmartProxy.pulp_primary
           smart_proxy.organizations << self if smart_proxy
@@ -124,10 +118,6 @@ module Katello
           end
         end
 
-        def create_anonymous_provider
-          self.providers << Katello::Provider.new(:name => Katello::Provider::ANONYMOUS, :provider_type => Katello::Provider::ANONYMOUS)
-        end
-
         def validate_destroy(current_org)
           def_error = _("Could not delete organization '%s'.") % [self.name]
           if (current_org == self)
@@ -174,12 +164,8 @@ module Katello
         end
 
         def enabled_product_content_for(roots)
-          return [] if roots.blank?
-          content_ids = roots.pluck(:content_id)
-
-          filtered_product_content do |pc|
-            content_ids.include?(pc.content.cp_content_id) && pc.product.enabled?
-          end
+          Katello::ProductContent.joins(:content).where(:product_id => self.products.enabled,
+                             "#{::Katello::Content.table_name}.cp_content_id" => roots.select(:content_id))
         end
 
         def enabled_product_content

data/app/models/katello/concerns/redhat_extensions.rb

@@ -10,15 +10,8 @@ module Katello
           minor ||= '' # treat minor versions as empty string to not confuse with nil
           os = ::Redhat.where(:name => os_name, :major => major, :minor => minor).try(:first)
           return os if os
-
-          if ::Redhat.where(:title => "#{os_name} #{repo.distribution_version}").present?
-            description = "#{os_name} #{repo.distribution_version} #{SecureRandom.uuid}"
-            create_os = lambda do
-              ::Redhat.create!(:name => os_name, :major => major, :minor => minor, :description => description)
-            end
-          else
-            create_os = lambda { ::Redhat.create!(:name => os_name, :major => major, :minor => minor) }
-          end
+          description = "#{os_name}-#{repo.distribution_version}"
+          create_os = lambda { ::Redhat.create!(:name => os_name, :major => major, :minor => minor, :description => description) }
 
           begin
             create_os.call
@@ -49,11 +42,10 @@ module Katello
         end
       end
 
-      def kickstart_repos(host, content_facet: nil)
-        distros = distribution_repositories(host, content_facet: content_facet).where(distribution_bootable: true)
-        content_facet ||= host.content_facet
-        if distros && content_facet&.content_source
-          distros.map { |distro| distro.to_hash(content_facet.content_source) }
+      def kickstart_repos(host)
+        distros = distribution_repositories(host).where(distribution_bootable: true)
+        if distros && host&.content_facet&.content_source
+          distros.map { |distro| distro.to_hash(host.content_facet.content_source) }
         else
           []
         end
@@ -70,10 +62,10 @@ module Katello
         end
       end
 
-      def distribution_repositories(host, content_facet: nil)
-        content_facet ||= host.content_facet
-        content_view = content_facet.try(:content_view) || host.try(:content_view)
-        lifecycle_environment = content_facet.try(:lifecycle_environment) || host.try(:lifecycle_environment)
+      def distribution_repositories(host)
+        content_view = host.try(:content_facet).try(:content_view) || host.try(:content_view)
+        lifecycle_environment = host.try(:content_facet).try(:lifecycle_environment) || host.try(:lifecycle_environment)
+
         if content_view && lifecycle_environment && host.os && host.architecture
           Katello::Repository.in_environment(lifecycle_environment).in_content_views([content_view]).
               where(:distribution_arch => host.architecture.name).

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -10,7 +10,6 @@ module Katello
       module Overrides
         def refresh
           errors = super
-          update_puppet_path
           errors
         end
       end
@@ -90,10 +89,6 @@ module Katello
         end
 
         def self.with_environment(environment, include_default = false)
-          (pulp2_proxies_with_environment(environment, include_default) + pulpcore_proxies_with_environment(environment)).try(:uniq)
-        end
-
-        def self.pulp2_proxies_with_environment(environment, include_default = false)
           features = [PULP_NODE_FEATURE]
           features << PULP_FEATURE if include_default
 
@@ -101,11 +96,6 @@ module Katello
               where(katello_capsule_lifecycle_environments: { lifecycle_environment_id: environment.id })
         end
 
-        def self.pulpcore_proxies_with_environment(environment)
-          unscoped.where(id: unscoped.select { |p| p.pulp_mirror? }.pluck(:id)).joins(:capsule_lifecycle_environments).
-              where(katello_capsule_lifecycle_environments: { lifecycle_environment_id: environment.id })
-        end
-
         def self.sync_needed?(environment)
           Setting[:foreman_proxy_content_auto_sync] && unscoped.with_environment(environment).any?
         end
@@ -115,20 +105,6 @@ module Katello
         ProxyAPI::ContainerGateway.new(url: self.url).unauthenticated_repository_list("repositories": repo_names)
       end
 
-      def puppet_path
-        self[:puppet_path] || update_puppet_path
-      end
-
-      def update_puppet_path
-        if has_feature?(PULP_FEATURE)
-          path = ::ProxyAPI::Pulp.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
-        elsif has_feature?(PULP_NODE_FEATURE)
-          path = ::ProxyAPI::PulpNode.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
-        end
-        self.update_attribute(:puppet_path, path || '') if persisted?
-        path
-      end
-
       def update_container_repo_list(repo_list)
         ProxyAPI::ContainerGateway.new(url: self.url).repository_list({ repositories: repo_list })
       end
@@ -250,7 +226,8 @@ module Katello
 
         pulp3_supported = repository_type_obj.pulp3_plugin.present? &&
                           pulp3_enabled? &&
-                          self.capabilities(PULP3_FEATURE).try(:include?, repository_type_obj.pulp3_plugin)
+                          (self.capabilities(PULP3_FEATURE).try(:include?, repository_type_obj.pulp3_plugin) ||
+                           self.capabilities(PULP3_FEATURE).try(:include?, 'pulp_' + repository_type_obj.pulp3_plugin))
 
         check_pulp2_preferred ? pulp3_supported && !pulp2_preferred_for_type?(repository_type_obj.id) : pulp3_supported
       end
@@ -318,12 +295,10 @@ module Katello
 
       def associate_default_locations
         return unless self.pulp_primary?
-        ['puppet_content', 'subscribed_hosts'].each do |type|
-          default_location = ::Location.unscoped.find_by_title(
-            ::Setting[:"default_location_#{type}"])
-          if default_location.present? && !locations.include?(default_location)
-            self.locations << default_location
-          end
+        default_location = ::Location.unscoped.find_by_title(
+          ::Setting[:default_location_subscribed_hosts])
+        if default_location.present? && !locations.include?(default_location)
+          self.locations << default_location
         end
       end