katello 3.7.0.rc1 → 3.7.0.rc2

data/app/models/katello/kt_environment.rb

@@ -11,14 +11,12 @@ module Katello
     belongs_to :organization, :class_name => "Organization", :inverse_of => :environments
     has_many :activation_keys, :class_name => "Katello::ActivationKey",
                                :dependent => :restrict_with_exception, :foreign_key => :environment_id
-    # rubocop:disable HasAndBelongsToMany
-    # TODO: change these into has_many associations
-    has_and_belongs_to_many :priors,  :class_name => "Katello::KTEnvironment", :foreign_key => :environment_id,
-                                      :join_table => "katello_environment_priors",
-                                      :association_foreign_key => "prior_id", :uniq => true
-    has_and_belongs_to_many :successors,  :class_name => "Katello::KTEnvironment", :foreign_key => "prior_id",
-                                          :join_table => "katello_environment_priors",
-                                          :association_foreign_key => :environment_id, :readonly => true
+
+    has_many :env_priors, :class_name => "Katello::EnvironmentPrior", :foreign_key => :environment_id, :dependent => :destroy
+    has_many :priors, :class_name => "Katello::KTEnvironment", :through => :env_priors, :source => :env_prior
+
+    has_many :env_successors, :class_name => "Katello::EnvironmentPrior", :foreign_key => :prior_id, :dependent => :destroy
+    has_many :successors, :class_name => "Katello::KTEnvironment", :through => :env_successors, :source => :env
 
     has_many :repositories, :class_name => "Katello::Repository", dependent: :destroy, foreign_key: :environment_id
     has_many :content_view_environments, :class_name => "Katello::ContentViewEnvironment",
@@ -102,6 +100,28 @@ module Katello
       self.organization.promotion_paths[0][0] unless self.organization.promotion_paths.empty?
     end
 
+    # creates new env from create_params with self as a prior
+    def insert_successor(create_params, path)
+      self.class.transaction do
+        new_successor = self.class.create!(create_params)
+        if library?
+          if path
+            old_successor = path.first
+            old_successor.prior = new_successor
+          end
+          save_successor new_successor
+        elsif successor.nil?
+          save_successor new_successor
+        else
+          old_successor = successor
+          old_successor.prior = new_successor
+          save_successor new_successor
+        end
+        fail HttpErrors::UnprocessableEntity, _('An environment is missing a prior') unless all_have_prior?
+        new_successor
+      end
+    end
+
     def display_name
       self.name
     end
@@ -262,5 +282,16 @@ module Katello
     class Jail < ::Safemode::Jail
       allow :name, :label
     end
+
+    private
+
+    def all_have_prior?
+      organization.kt_environments.reject { |env| env.library? || env.prior.present? }.empty?
+    end
+
+    def save_successor(new_successor)
+      new_successor.prior = self
+      new_successor.save
+    end
   end
 end

data/app/models/katello/pool.rb

@@ -12,7 +12,8 @@ module Katello
     has_many :subscription_facet_pools, :class_name => "Katello::SubscriptionFacetPool", :dependent => :destroy
     has_many :subscription_facets, :through => :subscription_facet_pools
 
-    belongs_to :organization, :class_name => "Organization", :inverse_of => :pools
+    belongs_to :organization, :class_name => 'Organization', :inverse_of => :pools
+    belongs_to :hypervisor, :class_name => 'Host::Managed', :inverse_of => :hypervisor_pools
 
     scope :in_organization, ->(org_id) { where(:organization_id => org_id) }
     scope :for_activation_key, ->(ak) { joins(:activation_keys).where("#{Katello::ActivationKey.table_name}.id" => ak.id) }

data/app/models/katello/rpm.rb

@@ -12,10 +12,11 @@ module Katello
     has_many :content_facets, :through => :content_facet_applicable_rpms, :class_name => "Katello::Host::ContentFacet"
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :version, :complete_value => true
-    scoped_search :on => :release, :complete_value => true
+    scoped_search :on => :version, :complete_value => true, :ext_method => :scoped_search_version
+    scoped_search :on => :release, :complete_value => true, :ext_method => :scoped_search_release
     scoped_search :on => :arch, :complete_value => true
     scoped_search :on => :epoch, :complete_value => true
+    scoped_search :on => :evr, :ext_method => :scoped_search_evr
     scoped_search :on => :filename, :complete_value => true
     scoped_search :on => :sourcerpm, :complete_value => true
     scoped_search :on => :checksum
@@ -30,6 +31,147 @@ module Katello
       RepositoryRpm
     end
 
+    def self.scoped_search_version(_key, operator, value)
+      self.scoped_search_sortable('version', operator, value)
+    end
+
+    def self.scoped_search_release(_key, operator, value)
+      self.scoped_search_sortable('release', operator, value)
+    end
+
+    def self.scoped_search_sortable(column, operator, value)
+      if ['>', '>=', '<', '<='].include?(operator)
+        conditions = "#{self.table_name}.#{column}_sortable COLLATE \"C\" #{operator} ? COLLATE \"C\""
+        parameter = Util::Package.sortable_version(value)
+        return { :conditions => conditions, :parameter => [parameter] }
+      end
+
+      # Use the default behavior for all other operators.
+      # Unfortunately there is no way to call the default behavior from here, so
+      # we replicate the default behavior from sql_test() in
+      # https://github.com/wvanbergen/scoped_search/blob/master/lib/scoped_search/query_builder.rb
+      if ['LIKE', 'NOT LIKE'].include?(operator)
+        conditions = "#{self.table_name}.#{column} #{operator} ?"
+        parameter = (value !~ /^\%|\*/ && value !~ /\%|\*$/) ? "%#{value}%" : value.tr_s('%*', '%')
+        return { :conditions => conditions, :parameter => [parameter] }
+      elsif ['IN', 'NOT IN'].include?(operator)
+        conditions = "#{self.table_name}.#{column} #{operator} (#{value.split(',').collect { '?' }.join(',')})"
+        parameters = value.split(',').collect { |v| v.strip }
+        return { :conditions => conditions, :parameter => parameters }
+      else
+        conditions = "#{self.table_name}.#{column} #{operator} ?"
+        parameter = value
+        return { :conditions => conditions, :parameter => [parameter] }
+      end
+    end
+
+    def self.scoped_search_evr(_key, operator, value)
+      if ['=', '<>'].include?(operator)
+        return self.scoped_search_evr_equal(operator, value)
+      elsif ['IN', 'NOT IN'].include?(operator)
+        return self.scoped_search_evr_in(operator, value)
+      elsif ['LIKE', 'NOT LIKE'].include?(operator)
+        return self.scoped_search_evr_like(operator, value)
+      elsif ['>', '>=', '<', '<='].include?(operator)
+        return self.scoped_search_evr_compare(operator, value)
+      else
+        return {}
+      end
+    end
+
+    def self.scoped_search_evr_equal(operator, value)
+      joiner = (operator == '=' ? 'AND' : 'OR')
+      evr = Util::Package.parse_evr(value)
+      (e, v, r) = [evr[:epoch], evr[:version], evr[:release]]
+      e = e.to_i # nil or blank becomes 0
+      conditions = "CAST(#{self.table_name}.epoch AS INT) #{operator} ?"
+      parameters = [e]
+      unless v.nil? || v.blank?
+        conditions += " #{joiner} #{self.table_name}.version #{operator} ?"
+        parameters += [v]
+      end
+      unless r.nil? || r.blank?
+        conditions += " #{joiner} #{self.table_name}.release #{operator} ?"
+        parameters += [r]
+      end
+      return { :conditions => conditions, :parameter => parameters }
+    end
+
+    def self.scoped_search_evr_in(operator, value)
+      op = (operator == 'IN' ? '=' : '<>')
+      joiner1 = (operator == 'IN' ? 'AND' : 'OR')
+      joiner2 = (operator == 'IN' ? 'OR' : 'AND')
+      conditions = []
+      parameters = []
+      value.split(',').collect { |v| v.strip }.each do |val|
+        evr = Util::Package.parse_evr(val)
+        (e, v, r) = [evr[:epoch], evr[:version], evr[:release]]
+        e = e.to_i # nil or blank becomes 0
+        condition = "CAST(#{self.table_name}.epoch AS INT) #{op} ?"
+        parameters += [e]
+        unless v.nil? || v.blank?
+          condition += " #{joiner1} #{self.table_name}.version #{op} ?"
+          parameters += [v]
+        end
+        unless r.nil? || r.blank?
+          condition += " #{joiner1} #{self.table_name}.release #{op} ?"
+          parameters += [r]
+        end
+        conditions += ["(#{condition})"]
+      end
+      return { :conditions => conditions.join(" #{joiner2} "), :parameter => parameters }
+    end
+
+    def self.scoped_search_evr_like(operator, value)
+      val = (value !~ /^\%|\*/ && value !~ /\%|\*$/) ? "%#{value}%" : value.tr_s('%*', '%')
+      evr = Util::Package.parse_evr(val)
+      (e, v, r) = [evr[:epoch], evr[:version], evr[:release]]
+      conditions = []
+      parameters = []
+      unless e.nil? || e.blank?
+        conditions += ["CAST(#{self.table_name}.epoch AS VARCHAR(10)) #{operator} ?"]
+        parameters += [e]
+      end
+      unless v.nil? || v.blank?
+        conditions += ["#{self.table_name}.version #{operator} ?"]
+        parameters += [v]
+      end
+      unless r.nil? || r.blank?
+        conditions += ["#{self.table_name}.release #{operator} ?"]
+        parameters += [r]
+      end
+      return {} if conditions.empty?
+      joiner = (operator == 'LIKE' ? 'AND' : 'OR')
+      return { :conditions => conditions.join(" #{joiner} "), :parameter => parameters }
+    end
+
+    def self.scoped_search_evr_compare(operator, value)
+      evr = Util::Package.parse_evr(value)
+      (e, v, r) = [evr[:epoch], evr[:version], evr[:release]]
+      e = e.to_i # nil or blank becomes 0
+      conditions = ''
+      if v.nil? || v.blank?
+        conditions = "CAST(#{self.table_name}.epoch AS INT) #{operator} ?"
+        parameters = [e]
+      else
+        sv = Util::Package.sortable_version(v)
+        if r.nil? || r.blank?
+          conditions = "#{self.table_name}.version_sortable COLLATE \"C\" #{operator} ? COLLATE \"C\""
+          parameters = [sv]
+        else
+          conditions =
+            "#{self.table_name}.version_sortable COLLATE \"C\" #{operator[0]} ? COLLATE \"C\" OR " \
+            "(#{self.table_name}.version_sortable = ? AND " \
+             "#{self.table_name}.release_sortable COLLATE \"C\" #{operator} ? COLLATE \"C\")"
+          sv = Util::Package.sortable_version(v)
+          parameters = [sv, sv, Util::Package.sortable_version(r)]
+        end
+        conditions = "CAST(#{self.table_name}.epoch AS INT) #{operator[0]} ? OR (CAST(#{self.table_name}.epoch AS INT) = ? AND (#{conditions}))"
+        parameters = [e, e] + parameters
+      end
+      return { :conditions => conditions, :parameter => parameters }
+    end
+
     def self.search_version_range(min = nil, max = nil)
       query = self.all
       query = Katello::Util::PackageFilter.new(query, min, Katello::Util::PackageFilter::GREATER_THAN).results if min.present?

data/app/models/katello/upstream_pool.rb

@@ -5,7 +5,7 @@ module Katello
     class << self
       def fetch_pools(params)
         quantities_only = ::Foreman::Cast.to_bool(params.delete(:quantities_only))
-        pool_id_map = upstream_pool_id_map(params.delete(:pool_ids))
+        pool_id_map = Katello::Candlepin::PoolService.upstream_pool_id_map(params.delete(:pool_ids))
 
         cp_params = request_params(
           base_params: base_params(params),
@@ -38,20 +38,17 @@ module Katello
         CP_POOL.upstream_consumer_id
       end
 
-      def upstream_pool_id_map(local_pool_ids)
-        return {} unless local_pool_ids
-
-        Katello::Candlepin::PoolService.local_to_upstream_ids(local_pool_ids)
-      end
-
       def response_to_pools(response, pool_id_map: {})
         pools = JSON.parse(response)
+        if pool_id_map.empty?
+          pool_id_map = Katello::Candlepin::PoolService.map_upstream_pools_to_local(pools)
+        end
         pools.map { |pool| self.new(map_attributes(pool, pool_id_map: pool_id_map)) }
       end
 
       def kat_to_cp_map
         {
-          pool_id: 'id',
+          id: 'id',
           active: 'activeSubscription',
           quantity: 'quantity',
           start_date: 'startDate',
@@ -70,13 +67,13 @@ module Katello
           attributes[kat] = pool[cp] if pool[cp]
         end
 
-        attributes[:local_pool_ids] = pool_id_map[attributes[:pool_id]]
+        attributes[:local_pool_ids] = pool_id_map[attributes[:id]]
 
         attributes
       end
 
       def minimal_fields
-        kat_to_cp_map.values_at(:pool_id, :quantity)
+        kat_to_cp_map.values_at(:id, :quantity)
       end
 
       def all_fields

data/app/services/katello/candlepin/pool_service.rb

@@ -1,17 +1,32 @@
 module Katello
   module Candlepin
     class PoolService
-      def self.local_to_upstream_ids(local_pool_ids)
-        pools = Katello::Pool.find(local_pool_ids)
+      def self.upstream_pool_id_map(local_pool_ids, fail_on_not_found: true)
+        return {} unless local_pool_ids
+
+        local_to_upstream_ids(local_pool_ids, fail_on_not_found: fail_on_not_found)
+      end
+
+      def self.local_to_upstream_ids(local_pool_ids, fail_on_not_found: true)
+        pools = Katello::Pool.where(id: local_pool_ids)
         id_map = Hash.new { |hash, key| hash[key] = [] }
 
         pools.each do |pool|
-          fail 'No upstream pool ID was found for Katello::Pool with ID: %s' % pool.id unless pool.upstream_pool_id
+          if fail_on_not_found && !pool.upstream_pool_id
+            fail 'No upstream pool ID was found for Katello::Pool with ID: %s' % pool.id
+          end
           id_map[pool.upstream_pool_id] << pool.id
         end
 
         id_map
       end
+
+      # For mapping the upstream pools after the candlepin request has returned them
+      def self.map_upstream_pools_to_local(pools)
+        upstream_pool_ids = pools.map { |x| x['id'] }
+        local_pool_ids = Katello::Pool.where(upstream_pool_id: upstream_pool_ids).pluck(:id)
+        return upstream_pool_id_map(local_pool_ids, fail_on_not_found: false)
+      end
     end
   end
 end

data/app/services/katello/ui_notifications/pulp/proxy_disk_space.rb

@@ -8,27 +8,24 @@ module Katello
               percentage = proxy.statuses[:pulp].storage['pulp_dir']['percent']
               if percentage[0..2].to_i < 90 && notification_already_exists?(proxy)
                 blueprint.notifications.where(subject: proxy).destroy_all
-                next
-              end
-              next unless update_notifications(proxy).empty?
-              ::Notification.create!(
-                :subject => proxy,
-                :initiator => User.anonymous_admin,
-                :audience => Notification::AUDIENCE_ADMIN,
-                :message => ::UINotifications::StringParser.new(
-                  blueprint.message,
+              elsif update_notifications(proxy).empty? && percentage[0..2].to_i > 90
+                ::Notification.create!(
                   :subject => proxy,
-                  :percentage => percentage
-                ),
-                :notification_blueprint => blueprint
-              )
+                  :initiator => User.anonymous_admin,
+                  :audience => Notification::AUDIENCE_ADMIN,
+                  :message => ::UINotifications::StringParser.new(
+                    blueprint.message,
+                    :subject => proxy,
+                    :percentage => percentage
+                  ),
+                  :notification_blueprint => blueprint
+                )
+              end
             end
           end
 
           def notification_already_exists?(subject)
-            low_disk_notification = Notification.unscoped.find_by(:subject => subject)
-            return false if low_disk_notification.blank?
-            low_disk_notification.notification_blueprint == blueprint
+            blueprint.notifications.where(:subject => subject).any?
           end
 
           def update_notifications(subject)

data/app/views/dashboard/_content_views_widget.html.erb

@@ -12,9 +12,9 @@
   <table class="table table-fixed table-striped table-bordered">
     <thead>
       <tr>
-        <th><%= _("Content View") %></th>
-        <th><%= _("Task") %></th>
-        <th><%= _("Status") %></th>
+        <th class='ellipsis'><%= _("Content View") %></th>
+        <th class='ellipsis'><%= _("Task") %></th>
+        <th class='ellipsis'><%= _("Status") %></th>
       </tr>
     </thead>
     <tbody>

data/app/views/dashboard/_errata_widget.html.erb

@@ -12,8 +12,8 @@
   <table class="table table-fixed table-striped">
     <thead>
       <tr>
-        <th><%= _("Type") %></th>
-        <th><%= _("Errata") %></th>
+        <th class='ellipsis'><%= _("Type") %></th>
+        <th class='ellipsis'><%= _("Errata") %></th>
       </tr>
     </thead>
     <tbody>

data/app/views/dashboard/_host_collection_widget.html.erb

@@ -12,9 +12,9 @@
   <table class="table table-fixed table-striped table-bordered">
     <thead>
       <tr>
-        <th><%= _("Updates") %></th>
-        <th><%= _("Name") %></th>
-        <th><%= _("Content Hosts") %></th>
+        <th class='ellipsis'><%= _("Updates") %></th>
+        <th class='ellipsis'><%= _("Name") %></th>
+        <th class='ellipsis'><%= _("Content Hosts") %></th>
       </tr>
     </thead>
     <tbody>

data/app/views/dashboard/_subscription_status_widget.html.erb

@@ -13,8 +13,8 @@
   <table class="table table-fixed table-striped table-bordered">
     <thead>
       <tr>
-        <th><%= _("Subscription Status") %></th>
-        <th><%= _("Count") %></th>
+        <th class='ellipsis'><%= _("Subscription Status") %></th>
+        <th class='ellipsis'><%= _("Count") %></th>
       </tr>
     </thead>
     <tbody>

data/app/views/dashboard/_subscription_widget.html.erb

@@ -18,7 +18,7 @@
     <thead>
       <tr>
         <th></th>
-        <th><%= _("Count") %></th>
+        <th class='ellipsis'><%= _("Count") %></th>
       </tr>
     </thead>
     <tbody>

data/app/views/dashboard/_sync_widget.html.erb

@@ -14,9 +14,9 @@
   <table class="table table-fixed table-striped table-bordered">
     <thead>
       <tr>
-        <th><%= _("Product") %></th>
-        <th><%= _("Status") %></th>
-        <th><%= _("Finished") %></th>
+        <th class='ellipsis'><%= _("Product") %></th>
+        <th class='ellipsis'><%= _("Status") %></th>
+        <th class='ellipsis'><%= _("Finished") %></th>
       </tr>
     </thead>
     <tbody>

data/app/views/katello/api/v2/subscriptions/base.json.rabl

@@ -18,7 +18,7 @@ attributes :virt_only
 attributes :virt_who
 attributes :upstream? => :upstream
 
-node :hypervisor, :if => lambda { |sub| sub && sub.try(:hypervisor) && sub.hypervisor_id } do |subscription|
+node :hypervisor, :if => lambda { |sub| sub && sub.respond_to?(:hypervisor) && sub.hypervisor } do |subscription|
   {
     id: subscription.hypervisor.id,
     name: subscription.hypervisor.name