katello 3.4.4 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8751ffc813891b31dd245dcf1d489d100d1949ef
-  data.tar.gz: 4d862eeda9bf7bfa65290774380d19f6efd69ca6
+  metadata.gz: 6decdc9453fd01ddb91c38c97e6404c2f34cc783
+  data.tar.gz: 73716c2989e80487d5adbe8cf9cf638296ab924f
 SHA512:
-  metadata.gz: b9b1d0659f08e44c3ccc28c322fa8ebfabc67fda376839b56a9abf55870f99946369cbbf1cde71ba32b0578486f7a3de3b82dccca3e3ae863aba479e6f2007b2
-  data.tar.gz: 14531bc8de473c9cb8aa0d4b500119a944a1feac7461801c0def52b08839dd6137a22eef63e9e0f597849777c2bdb13f32e7ff5cd43c92d9f1edf148bea59c8a
+  metadata.gz: 7b47b7ced813970a5a2b46d993c076f10e4ea82be0952b9f39be28f1146f3b1b3f7c3088ee611451374a3f3f2f84b8267a42c2d01596111c89e715afdb569187
+  data.tar.gz: 01775bd60e7f80c929ad14c2328482d9ecd38f30224b0411c9b3f425a7d9b81ea41529105a9a644da68d212d3d7b3fe807c29bbf788f6b1ffa9e414ebd5505c3

data/app/controllers/katello/api/v2/api_controller.rb

@@ -88,7 +88,7 @@ module Katello
 
       scoped_search_results(query, sub_total, total, page, per_page)
     rescue ScopedSearch::QueryNotSupported => error
-      return scoped_search_results(query, sub_total, total, page, per_page, error.message)
+      return scoped_search_results([], sub_total, total, page, per_page, error.message)
     end
 
     protected

data/app/controllers/katello/api/v2/host_collections_controller.rb

@@ -34,7 +34,7 @@ module Katello
     param :available_for, String, :required => false,
           :desc => N_("Interpret specified object to return only Host Collections that can be associated with specified object. The value 'host' is supported.")
     def index
-      respond(:collection => scoped_search(index_relation.uniq, :name, :asc))
+      respond(:collection => scoped_search(index_relation.uniq!, :name, :asc))
     end
 
     def index_relation

data/app/controllers/katello/concerns/api/v2/content_overrides_controller.rb

@@ -7,7 +7,7 @@ module Katello
       def validate_content_overrides_enabled(content_params, overriden_object = nil)
         name = content_params[:name] || "enabled"
         compare_value = content_params[:value].to_s.downcase
-        remove = content_params.key?(:remove) ? Foreman::Cast.to_bool(content_params[:remove]) : nil
+        remove = content_params.key?(:remove) ? ::Foreman::Cast.to_bool(content_params[:remove]) : nil
         content_label = content_params[:content_label]
 
         if !remove && name == "enabled" &&

data/app/helpers/katello/concerns/dashboard_helper_extensions.rb

@@ -0,0 +1,30 @@
+module Katello
+  module Concerns
+    module DashboardHelperExtensions
+      def total_host_count
+        total_host_count = ::Host::Managed.authorized('view_hosts', ::Host::Managed).where(:organization => Organization.current).size
+        return total_host_count || 0
+      end
+
+      def partial_consumer_count
+        partial_consumer_count = ::Host::Managed.authorized('view_hosts', ::Host::Managed).where(:organization => Organization.current).search_for("subscription_status = partial").size
+        return partial_consumer_count || 0
+      end
+
+      def valid_consumer_count
+        valid_consumer_count = ::Host::Managed.authorized('view_hosts', ::Host::Managed).where(:organization => Organization.current).search_for("subscription_status = valid").size
+        return valid_consumer_count || 0
+      end
+
+      def invalid_consumer_count
+        invalid_consumer_count = ::Host::Managed.authorized('view_hosts', ::Host::Managed).where(:organization => Organization.current).search_for("subscription_status = invalid").size
+        return invalid_consumer_count || 0
+      end
+
+      def unknown_consumer_count
+        unknown_consumer_count = ::Host::Managed.authorized('view_hosts', ::Host::Managed).where(:organization => Organization.current).search_for("subscription_status = unknown").size
+        return unknown_consumer_count || 0
+      end
+    end
+  end
+end

data/app/lib/actions/candlepin/owner/import_products.rb

@@ -8,7 +8,9 @@ module Actions
 
         def run
           organization = ::Organization.find(input[:organization_id])
-          organization.redhat_provider.import_products_from_cp
+          User.as_anonymous_admin do
+            organization.redhat_provider.import_products_from_cp
+          end
         end
       end
     end

data/app/lib/actions/katello/capsule_content/sync.rb

@@ -51,7 +51,8 @@ module Actions
           concurrence do
             repository_ids.each do |repo_id|
               sequence do
-                repo = ::Katello::Repository.find_by(pulp_id: repo_id)
+                repo = ::Katello::Repository.find_by(pulp_id: repo_id) ||
+                        ::Katello::ContentViewPuppetEnvironment.find_by(pulp_id: repo_id)
                 if repo && ['yum', 'puppet'].exclude?(repo.content_type)
                   # we unassociate units in non-yum/puppet repos in order to avoid version conflicts
                   # during publish. (i.e. two versions of a unit in the same repo)

data/app/lib/actions/katello/host/hypervisors_update.rb

@@ -16,7 +16,9 @@ module Actions
           hypervisors = input[:hypervisors]
 
           if hypervisors
-            hypervisors.each { |hypervisor| update_or_create_hypervisor(hypervisor) }
+            User.as_anonymous_admin do
+              hypervisors.each { |hypervisor| update_or_create_hypervisor(hypervisor) }
+            end
           end
         end
 

data/app/lib/actions/katello/host/register.rb

@@ -16,7 +16,6 @@ module Actions
               content_view_environment ||= lookup_content_view_environment(activation_keys)
               set_host_collections(host, activation_keys)
             end
-
             fail _('Content View and Environment not set for registration.') if content_view_environment.nil?
 
             host.save!
@@ -33,6 +32,13 @@ module Actions
             plan_self(uuid: cp_create.output[:response][:uuid], host_id: host.id, hostname: host.name,
                       user_id: User.current.id, :facts => consumer_params[:facts])
             plan_action(Pulp::Consumer::Create, uuid: cp_create.output[:response][:uuid], name: host.name)
+
+            begin
+              set_content_and_subscription_uuids(host, cp_create.input[:response][:uuid])
+            rescue => e
+              ::Katello::Resources::Candlepin::Consumer.destroy(cp_create.input[:response][:uuid])
+              raise e
+            end
           end
         end
 
@@ -57,13 +63,6 @@ module Actions
         def finalize
           User.as_anonymous_admin do
             host = ::Host.find(input[:host_id])
-            host.content_facet.uuid = input[:uuid]
-            host.subscription_facet.uuid = input[:uuid]
-
-            user = ::User.find(input[:user_id])
-            host.subscription_facet.user = user unless user.nil? || user.hidden?
-
-            host.content_facet.save!
             host.subscription_facet.update_from_consumer_attributes(host.subscription_facet.candlepin_consumer.
                 consumer_attributes.except(:installedProducts, :guestIds, :facts))
             host.subscription_facet.save!
@@ -119,6 +118,14 @@ module Actions
           subscription_facet.activation_keys = activation_keys
           subscription_facet
         end
+
+        def set_content_and_subscription_uuids(host, uuid)
+          host.content_facet.uuid = uuid
+          host.subscription_facet.uuid = uuid
+          host.subscription_facet.user = User.current unless User.current.nil? || User.current.hidden?
+          host.content_facet.save!
+          host.subscription_facet.save!
+        end
       end
     end
   end

data/app/lib/actions/katello/organization/create.rb

@@ -5,8 +5,8 @@ module Actions
         def plan(organization)
           organization.setup_label_from_name
           organization.create_library
-          organization.create_anonymous_provider
-          organization.create_redhat_provider
+          organization.create_anonymous_provider unless organization.anonymous_provider
+          organization.create_redhat_provider unless organization.redhat_provider
           cp_create = nil
 
           organization.save!

data/app/lib/actions/katello/organization/manifest_refresh.rb

@@ -31,7 +31,8 @@ module Actions
             import_products = plan_action(Candlepin::Owner::ImportProducts, :organization_id => organization.id, :dependency => owner_import.output)
 
             if manifest_update && SETTINGS[:katello][:use_pulp]
-              organization.products.redhat.flat_map(&:repositories).each do |repo|
+              repositories = ::Katello::Repository.in_default_view.where(:product_id => ::Katello::Product.redhat.in_org(organization))
+              repositories.each do |repo|
                 plan_action(Katello::Repository::RefreshRepository, repo, :dependency => import_products.output)
               end
             end

data/app/models/katello/glue/candlepin/pool.rb

@@ -93,6 +93,7 @@ module Katello
         subscription
       end
 
+      # rubocop:disable MethodLength
       def import_data
         pool_attributes = {}.with_indifferent_access
         pool_json = self.backend_data
@@ -126,7 +127,11 @@ module Katello
           pool_attributes[:unmapped_guest] = true
         end
 
-        pool_attributes[:virt_who] = pool_attributes['virt_limit'] != "0" && !pool_attributes['virt_limit'].nil? && subscription.try(:redhat?)
+        if subscription.try(:redhat?)
+          pool_attributes[:virt_who] = pool_attributes['virt_limit'] != "0" && pool_attributes['virt_limit'].present?
+        else
+          pool_attributes[:virt_who] = false
+        end
 
         exceptions = pool_attributes.keys.map(&:to_sym) - self.attribute_names.map(&:to_sym)
         self.update_attributes(pool_attributes.except!(*exceptions))

data/app/models/katello/rhsm_fact_parser.rb

@@ -1,8 +1,9 @@
 module Katello
   class RhsmFactParser < ::FactParser
     def architecture
-      name = facts['lscpu.architecture']
+      name = facts['lscpu.architecture'] || facts['uname.machine']
       name = "x86_64" if name == "amd64"
+      name = "i386" if name == "i686"
       Architecture.where(:name => name).first_or_create unless name.blank?
     end
 

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

@@ -5,12 +5,14 @@
 <% unless Organization.current.present? %>
   <p class="ca"><%= _("Please select an organization to view subscription status.") %></p>
 <% else %>
-  <% owner_info = Organization.current.owner_info %>
-  <% invalid_consumer_count = owner_info.total_invalid_compliance_consumers %>
-  <% partial_consumer_count = owner_info.total_partial_compliance_consumers %>
-  <% valid_consumer_count = owner_info.total_valid_compliance_consumers %>
-  <% total_count = owner_info.total_consumers %>
-  <% subscription_status_url = '/content_hosts?search='  + ERB::Util.url_encode('subscription_status = ') %>
+  <% total_count = total_host_count() %>
+  <% partial_consumer_count = partial_consumer_count() %>
+  <% valid_consumer_count = valid_consumer_count()%>
+  <% invalid_consumer_count = invalid_consumer_count()%>
+  <% unknown_consumer_count = unknown_consumer_count() %>
+  <% unregistered_consumer_count = total_count-partial_consumer_count-valid_consumer_count-invalid_consumer_count%>
+  <% subscription_status_url = '/content_hosts?search='%>
+  <% registered_subscription_url = subscription_status_url + ERB::Util.url_encode('subscription_status = ') %>
 
   <table class="table table-fixed table-striped table-bordered">
     <thead>
@@ -22,32 +24,52 @@
     <tbody>
       <tr>
         <td>
-          <%= link_to("#{subscription_status_url}" + 'invalid') do %>
+          <%= link_to("#{registered_subscription_url}" + 'invalid') do %>
             <i class="label label-danger" style="margin-right: 6px">&nbsp;</i><%= _("Invalid") %>
           <% end %>
         </td>
         <td style="text-align:right">
-          <%= link_to( "#{invalid_consumer_count}", "#{subscription_status_url}" + 'invalid')%>
+          <%= link_to( "#{invalid_consumer_count}", "#{registered_subscription_url}" + 'invalid')%>
         </td>
       </tr>
       <tr>
         <td>
-          <%= link_to("#{subscription_status_url}" + 'partial') do %>
+          <%= link_to("#{registered_subscription_url}" + 'partial') do %>
             <i class="label label-warning" style="margin-right: 6px">&nbsp;</i><%= _("Partial") %>
           <% end %>
         </td>
         <td style="text-align:right">
-          <%= link_to( "#{partial_consumer_count}", "#{subscription_status_url}" + 'partial')%>
+          <%= link_to( "#{partial_consumer_count}", "#{registered_subscription_url}" + 'partial')%>
         </td>
       </tr>
       <tr>
         <td>
-          <%= link_to("#{subscription_status_url}" + 'valid') do %>
+          <%= link_to("#{registered_subscription_url}" + 'valid') do %>
             <i class="label label-success" style="margin-right: 6px">&nbsp;</i><%= _("Valid") %>
           <% end %>
         </td>
         <td style="text-align:right">
-          <%= link_to( "#{valid_consumer_count}", "#{subscription_status_url}" + 'valid')%>
+          <%= link_to( "#{valid_consumer_count}", "#{registered_subscription_url}" + 'valid')%>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <%= link_to("#{registered_subscription_url}" + 'unknown') do %>
+              <i class="label label-warning" style="margin-right: 6px">&nbsp;</i><%= _("Unknown") %>
+          <% end %>
+        </td>
+        <td style="text-align:right">
+          <%= link_to( "#{unknown_consumer_count}", "#{registered_subscription_url}" + 'unknown')%>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <%= link_to("#{subscription_status_url}" + 'null? subscription_uuid') do %>
+              <i class="label label-danger" style="margin-right: 6px">&nbsp;</i><%= _("Unregistered") %>
+          <% end %>
+        </td>
+        <td style="text-align:right">
+          <%= link_to( "#{unregistered_consumer_count}", "#{subscription_status_url}" + 'null? subscription_uuid')%>
         </td>
       </tr>
       <tr>

data/db/migrate/20161014133811_move_content_view_version_description_to_histories.rb

@@ -1,12 +1,13 @@
 class MoveContentViewVersionDescriptionToHistories < ActiveRecord::Migration
-  class Katello::ContentViewVersion < ActiveRecord::Base
-    has_many :history, :class_name => "Katello::CVHistory", :inverse_of => :content_view_version,
+  class FakeContentViewVersion < ActiveRecord::Base
+    self.table_name = 'katello_content_view_versions'
+    has_many :history, :class_name => "CVHistory", :inverse_of => :content_view_version,
                        :dependent => :destroy, :foreign_key => :katello_content_view_version_id
   end
 
-  class Katello::CVHistory < ActiveRecord::Base
+  class CVHistory < ActiveRecord::Base
     self.table_name = 'katello_content_view_histories'
-    belongs_to :content_view_version, :class_name => "Katello::ContentViewVersion", :foreign_key => :katello_content_view_version_id, :inverse_of => :history
+    belongs_to :content_view_version, :class_name => "FakeContentViewVersion", :foreign_key => :katello_content_view_version_id, :inverse_of => :history
     SUCCESSFUL = 'successful'.freeze
     scope :successful, -> { where(:status => SUCCESSFUL) }
 
@@ -19,14 +20,14 @@ class MoveContentViewVersionDescriptionToHistories < ActiveRecord::Migration
   end
 
   def up
-    Katello::ContentViewVersion.find_each do |version|
+    FakeContentViewVersion.find_each do |version|
       publish_history = version.history.publish.successful.first
       unless publish_history
-        publish_history = Katello::CVHistory.create!(action: Katello::CVHistory.actions[:publish],
-                                                     katello_content_view_version_id: version.id,
-                                                     status: 'successful',
-                                                     user: ''
-                                                    )
+        publish_history = CVHistory.create!(action: CVHistory.actions[:publish],
+                                            katello_content_view_version_id: version.id,
+                                            status: 'successful',
+                                            user: ''
+                                           )
       end
 
       publish_history.update_attributes!(notes: version[:description])

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-associations.controller.js

@@ -16,7 +16,7 @@
 angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsController',
     ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'ContentHostsHelper', 'CurrentOrganization', 'Host',
     function ($scope, $location, translate, Nutupane, ActivationKey, ContentHostsHelper, CurrentOrganization, Host) {
-        var contentHostsNutupane, params = {
+        var contentHostsNutupane, nutupaneParams, params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
             'page': 1,
@@ -25,7 +25,11 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAssociationsC
             'paged': true
         };
 
-        contentHostsNutupane = new Nutupane(Host, params);
+        nutupaneParams = {
+            'disableAutoLoad': true
+        };
+
+        contentHostsNutupane = new Nutupane(Host, params, undefined, nutupaneParams);
         $scope.controllerName = 'hosts';
         contentHostsNutupane.searchTransform = function (term) {
             var searchQuery, addition = "activation_key_id=" + $scope.$stateParams.activationKeyId;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-host-collections-table.html

@@ -29,8 +29,7 @@
     </div>
 
     <div data-block="table">
-      <table ng-show="table.rows.length > 0"
-             ng-class="{'table-mask': table.working}" class="table table-bordered table-striped">
+      <table ng-class="{'table-mask': table.working}" class="table table-bordered table-striped">
         <thead>
           <tr bst-table-head row-select="hostCollection">
             <th bst-table-column="name" translate>Name</th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/select-action-dropdown.html

@@ -3,8 +3,8 @@
     <span translate>Select Action</span>
   </button>
 
-  <button type="button" class="btn btn-default" uib-dropdown-toggle>
+  <button type="button" class="btn btn-default" ng-click="toggleDropdown($event)">
     <span class="caret"></span>
     <span class="sr-only" translate>Toggle Dropdown</span>
   </button>
-</div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-subscriptions-modal.controller.js

@@ -21,7 +21,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkSubscription
         function ($scope, $location, $uibModalInstance, Nutupane, CurrentOrganization, HostBulkAction, Subscription, SubscriptionsHelper, GlobalNotification, hostIds) {
             var success, error, params = {
                 'organization_id': CurrentOrganization,
-                'search': $location.search().search || "",
                 'sort_order': 'ASC',
                 'available_for': 'host',
                 'host_id': $scope.$stateParams.hostId

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html

@@ -61,9 +61,7 @@
       </span>
 
       <div data-block="table">
-        <table class="table table-striped table-bordered"
-               ng-class="{'table-mask': table.working}"
-               ng-show="table.rows.length > 0">
+        <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
          <thead>
            <tr bst-table-head row-select>
              <th bst-table-column="type" translate>Type</th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html

@@ -53,9 +53,7 @@
   </span>
 
   <div data-block="table">
-    <table class="table table-striped table-bordered"
-           ng-class="{'table-mask': table.working}"
-           ng-show="table.rows.length > 0">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
       <thead>
         <tr bst-table-head row-select>
           <th bst-table-column="name" sortable><span translate>Name</span></th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filters.html

@@ -29,8 +29,7 @@
   </span>
 
   <div data-block="table">
-    <table class="table table-striped table-bordered" ng-show="table.rows.length > 0"
-           ng-class="{'table-mask': table.working}">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
 
       <thead>
         <tr bst-table-head row-select>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-environments.html

@@ -16,10 +16,7 @@
   </span>
 
   <div data-block="table">
-    <table bst-table="table"
-           class="table table-striped table-bordered"
-           ng-class="{'table-mask': table.working}"
-           ng-show="table.rows.length > 0">
+    <table bst-table="table" class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
       <thead>
         <tr bst-table-head>
           <th bst-table-column="environment" translate>Environment</th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum-content-hosts.html

@@ -46,9 +46,7 @@
       <span translate>The Content View or Lifecycle Environment needs to be updated in order to make errata available to these hosts.</span>
     </p>
 
-    <table class="table table-striped table-bordered"
-           ng-class="{'table-mask': table.working}"
-           ng-show="table.rows.length > 0">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
       <thead>
         <tr bst-table-head row-select>
           <th bst-table-column="name"><span translate>Name</span></th>