katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/bastion_katello.scss

@@ -5,6 +5,7 @@
   @import "environments";
   @import "errata";
   @import "subscriptions";
+  @import "host_subscriptions";
 
   a {
     &.confined-text {
@@ -28,3 +29,7 @@
     white-space: pre-line;
   }
 }
+
+.list-aligned {
+  list-style-position: inside;
+}

data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/host_subscriptions.scss

@@ -0,0 +1,14 @@
+@import "bastion/variables";
+
+tr.row-selector-label {
+  td {
+    &.row-select {
+      border-right: 0;
+    }
+    &:last-of-type {
+      border-left: 0;
+      position: relative;
+      left: -$row-select-width;
+    }
+  }
+}

data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/tasks.scss

@@ -6,3 +6,7 @@ table div.progress {
   width: 50em;
   padding-left: 1em;
 }
+
+dd pre {
+  margin:0;
+}

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -21,6 +21,7 @@ module BastionKatello
           content_hosts
           content_views
           docker_tags
+          files
           ostree_branches
           errata
           packages

data/lib/katello/engine.rb

@@ -254,28 +254,9 @@ module Katello
     end
 
     rake_tasks do
-      load "#{Katello::Engine.root}/lib/katello/tasks/test.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/jenkins.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/setup.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/delete_orphaned_content.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/repository.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/reimport.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/rubocop.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/clean_backend_objects.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/unify_hosts.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/upgrade_check.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/import_applicability.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/clean_published_repo_directories.rake"
-
-      load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/2.4/import_package_groups.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/2.4/import_rpms.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/2.4/import_distributions.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/2.4/import_puppet_modules.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/2.4/import_subscriptions.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/3.0/add_export_distributor.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/3.0/delete_docker_v1_content.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/3.0/update_puppet_repository_distributors.rake"
-      load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake"
+      Dir["#{Katello::Engine.root}/lib/katello/tasks/**/*"].each do |task|
+        load task if File.file?(task)
+      end
     end
   end
 

data/lib/katello/permissions/content_view_permissions.rb

@@ -65,13 +65,13 @@ Foreman::Plugin.find(:katello).security_block :content_views do
   permission :publish_content_views,
              {
                'katello/api/v2/content_views' => [:publish],
-               'katello/api/v2/content_view_versions' => [:incremental_update]
+               'katello/api/v2/content_view_versions' => [:incremental_update, :republish_repositories]
              },
              :resource_type => 'Katello::ContentView'
   permission :promote_or_remove_content_views,
              {
                'katello/api/v2/content_view_versions' => [:promote],
-               'katello/api/v2/content_views' => [:remove_from_environment, :remove]
+               'katello/api/v2/content_views' => [:remove_from_environment, :remove, :republish_repositories]
              },
              :resource_type => 'Katello::ContentView'
   permission :export_content_views,

data/lib/katello/permissions/host_permissions.rb

@@ -22,6 +22,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/add_subscriptions',
   'katello/api/v2/hosts_bulk_actions/remove_subscriptions',
   'katello/api/v2/hosts_bulk_actions/auto_attach',
+  'katello/api/v2/hosts_bulk_actions/content_overrides',
   'katello/api/v2/hosts_bulk_actions/environment_content_view',
   'katello/api/rhsm/candlepin_proxies/upload_package_profile',
   'katello/api/rhsm/candlepin_proxies/regenerate_identity_certificates',

data/lib/katello/permissions/product_permissions.rb

@@ -9,7 +9,7 @@ Foreman::Plugin.find(:katello).security_block :products do
                'katello/api/v2/packages' => [:index, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch],
                'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search],
                'katello/api/v2/docker_manifests' => [:index, :show, :auto_complete_search],
-               'katello/api/v2/docker_tags' => [:index, :show, :auto_complete_search],
+               'katello/api/v2/docker_tags' => [:index, :show, :auto_complete_search, :auto_complete_name],
                'katello/api/v2/file_units' => [:index, :show, :auto_complete_search],
                'katello/api/v2/ostree_branches' => [:index, :show, :auto_complete_search],
                'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
@@ -17,6 +17,7 @@ Foreman::Plugin.find(:katello).security_block :products do
                'katello/errata' => [:short_details, :auto_complete],
                'katello/packages' => [:details, :auto_complete],
                'katello/puppet_modules' => [:show],
+               'katello/files' => [:auto_complete],
                'katello/repositories' => [:auto_complete_library, :repository_types],
                'katello/content_search' => [:index,
                                             :products,
@@ -38,13 +39,14 @@ Foreman::Plugin.find(:katello).security_block :products do
   permission :create_products,
              {
                'katello/api/v2/products' => [:create],
-               'katello/api/v2/repositories' => [:create]
+               'katello/api/v2/repositories' => [:create],
+               'katello/api/v2/package_groups' => [:create]
              },
              :resource_type => 'Katello::Product'
   permission :edit_products,
              {
                'katello/api/v2/products' => [:update],
-               'katello/api/v2/repositories' => [:update, :remove_content, :import_uploads, :upload_content],
+               'katello/api/v2/repositories' => [:update, :remove_content, :import_uploads, :upload_content, :republish],
                'katello/api/v2/products_bulk_actions' => [:update_sync_plans],
                'katello/api/v2/content_uploads' => [:create, :update, :destroy],
                'katello/api/v2/organizations' => [:repo_discover, :cancel_repo_discover]
@@ -55,7 +57,8 @@ Foreman::Plugin.find(:katello).security_block :products do
                'katello/api/v2/products' => [:destroy],
                'katello/api/v2/repositories' => [:destroy],
                'katello/api/v2/products_bulk_actions' => [:destroy_products],
-               'katello/api/v2/repositories_bulk_actions' => [:destroy_repositories]
+               'katello/api/v2/repositories_bulk_actions' => [:destroy_repositories],
+               'katello/api/v2/package_groups' => [:destroy]
              },
              :resource_type => 'Katello::Product'
   permission :sync_products,

data/lib/katello/plugin.rb

@@ -119,6 +119,15 @@ Foreman::Plugin.register :katello do
          :engine => Katello::Engine,
          :turbolinks => false
 
+    menu :top_menu,
+         :files,
+         :caption => N_('Files'),
+         :url => '/files',
+         :url_hash => {:controller => 'katello/api/v2/file_units',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false
+
     menu :top_menu,
          :ostree_branches,
          :caption => N_('OSTree Branches'),
@@ -195,6 +204,7 @@ Foreman::Plugin.register :katello do
 
   register_custom_status(Katello::ErrataStatus)
   register_custom_status(Katello::SubscriptionStatus)
+  register_custom_status(Katello::TraceStatus)
 
   extend_page "smart_proxies/show" do |cx|
     cx.add_pagelet :details_content,
@@ -234,7 +244,13 @@ Foreman::Plugin.register :katello do
 
   add_controller_action_scope(HostsController, :index) do |base_scope|
     base_scope
-      .preload(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata)
-      .preload(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment])
+      .includes(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata)
+      .includes(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment])
+  end
+
+  add_controller_action_scope(Api::V2::HostsController, :index) do |base_scope|
+    base_scope
+      .includes(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata)
+      .includes(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment])
   end
 end

data/lib/katello/tasks/regenerate_ueber_certs.rake

@@ -0,0 +1,15 @@
+require File.expand_path("../engine", File.dirname(__FILE__))
+
+# Use when regenerating the CA on the system, i.e. a hostname change
+namespace :katello do
+  desc 'Regenerates the ueber cert for each organization in candlepin, can be passed an organization label.'
+  task :regenerate_ueber_certs, [:organization] => :environment do |_t, args|
+    user_org = Organization.where(:label => args.organization).first if args.organization
+    organizations = user_org.present? ? [user_org] : Organization.all
+
+    organizations.each do |org|
+      ::Katello::Resources::Candlepin::Owner.generate_ueber_cert(org.label)
+    end
+    puts "Regenerated the ueber certificate(s) for #{organizations.map(&:name).join(', ')}"
+  end
+end

data/lib/katello/tasks/rubocop.rake

@@ -3,12 +3,13 @@ require File.expand_path("../engine", File.dirname(__FILE__))
 namespace :katello do
   desc "Runs Rubocop style checker on Katello code"
   task :rubocop do
-    system("cd #{Katello::Engine.root} && bundle exec rubocop")
+    system("bundle exec rubocop #{Katello::Engine.root}")
+    exit($CHILD_STATUS.exitstatus)
   end
 
   desc "Runs Rubocop style checker with xml output for Jenkins"
   task 'rubocop:jenkins' do
-    system("cd #{Katello::Engine.root} && bundle exec rubocop \
+    system("bundle exec rubocop #{Katello::Engine.root} \
             --require rubocop/formatter/checkstyle_formatter \
             --format RuboCop::Formatter::CheckstyleFormatter \
             --no-color --out rubocop.xml")

data/lib/katello/tasks/test.rake

@@ -36,11 +36,23 @@ namespace :test do
     task :test => ['db:test:prepare'] do
       test_task = Rake::TestTask.new('katello_test_task') do |t|
         t.libs << ["test", "#{Katello::Engine.root}/test"]
-        t.test_files = [
-          "#{Katello::Engine.root}/test/models/**/*_test.rb",
-          "#{Katello::Engine.root}/test/controllers/**/*_test.rb",
-          "#{Katello::Engine.root}/test/**/*_test.rb"
-        ]
+        if ENV['MATCH']
+          tests = ENV['MATCH'].split(',')
+          test_files = tests.map do |tst|
+            Dir.glob("#{Katello::Engine.root}/test/**/*#{tst}*").select do |fl|
+              fl.end_with?("_test.rb")
+            end
+          end
+          test_files.flatten!
+          t.test_files = test_files
+          puts "Running Tests #{test_files.inspect}"
+        else
+          t.test_files = [
+            "#{Katello::Engine.root}/test/models/**/*_test.rb",
+            "#{Katello::Engine.root}/test/controllers/**/*_test.rb",
+            "#{Katello::Engine.root}/test/**/*_test.rb"
+          ]
+        end
         t.verbose = true
         t.warning = false
       end

data/lib/katello/tasks/unify_hosts.rake

@@ -105,7 +105,7 @@ namespace :katello do
       end
 
       if facet_host.managed?
-        puts "Host #{facet_host.name} is registered with subscription-manager but is managed, please un-unmanage this host first."
+        puts "Host #{facet_host.name} is registered with subscription-manager but is managed, please un-manage this host first."
         return
       end
 

data/lib/katello/tasks/update_subscription_facet_backend_data.rake

@@ -0,0 +1,61 @@
+namespace :katello do
+  task :update_subscription_facet_backend_data => ["environment"] do
+    def error(message)
+      @errors << message
+      @errors << "\n"
+    end
+
+    def report_errors
+      if @errors.any?
+        filename = "subscription_facet_upgrade-#{Time.now.to_i}.log"
+        path = "/var/log/foreman/#{filename}"
+        path = "/tmp/#{filename}" unless File.writable?(path)
+
+        file = File.open(path, 'w')
+        @errors.each { |error| file.write(error) }
+        file.close
+        $stderr.print "***********************************\n"
+        $stderr.print "*************WARNING***************\n"
+        $stderr.print "Errors detected during upgrade step.\n"
+        $stderr.print "Details saved to: #{file.path}\n"
+        $stderr.print "This step can be rerun with:\n"
+        $stderr.print "  foreman-rake katello:update_subscription_facet_backend_data\n"
+        $stderr.print "You are likely encountering a bug.\n"
+        $stderr.print "***********************************\n"
+      end
+    end
+
+    @errors ||= []
+    User.current = User.anonymous_api_admin
+    puts _("Updating backend data for subscription facets")
+
+    #there may be some invalid hosts, if there are create a primary interface
+    ::Host.includes(:interfaces).find_each do |host|
+      if host.primary_interface.nil?
+        host.interfaces.create!(:primary => true)
+      end
+    end
+
+    Katello::Host::SubscriptionFacet.find_each do |subscription_facet|
+      begin
+        candlepin_attrs = subscription_facet.candlepin_consumer.consumer_attributes
+        subscription_facet.import_database_attributes(candlepin_attrs)
+        subscription_facet.host = ::Host::Managed.find(subscription_facet.host_id)
+        subscription_facet.save!
+
+        host = subscription_facet.host
+        host.name = ::Katello::Host::SubscriptionFacet.sanitize_name(host.name)
+        host.save! if host.name_changed?
+
+        Katello::Host::SubscriptionFacet.update_facts(subscription_facet.host, candlepin_attrs[:facts])
+      rescue StandardError => exception
+        error("Error: #{subscription_facet.host.name} - #{subscription_facet.host.id}")
+        error(candlepin_attrs)
+        error(exception.message)
+        error(exception.backtrace.join("\n"))
+        error("\n")
+      end
+    end
+    report_errors
+  end
+end

data/lib/katello/tasks/upgrades/3.3/hypervisors.rake

@@ -0,0 +1,7 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.3' do
+      task :hypervisors => ["katello:update_subscription_facet_backend_data"]
+    end
+  end
+end

data/lib/katello/tasks/upgrades/3.3/import_subscriptions.rake

@@ -0,0 +1,12 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.3' do
+      task :import_subscriptions => ["environment"] do
+        User.current = User.anonymous_api_admin
+        puts _("Importing Subscriptions")
+        Katello::Subscription.import_all
+        Katello::Pool.import_all
+      end
+    end
+  end
+end

data/lib/katello/tasks/virt_who_report.rake

@@ -0,0 +1,150 @@
+namespace :katello do
+  desc <<-END_DESC
+  Report on hypervisors without VDC subscriptions and guests consuming virtual entitlements.  Returns non-negative exit code if any issue is found.
+  Options:
+    CSV - Output in csv format.  Example:  CSV=true
+    LIMIT - only execute on a specified number of hosts (useful when re-running with different options).  Example:  LIMIT=500
+    IGNORE - ignore one or more pools, separated via a pipe character '|'.
+      Example:  IGNORE="Red Hat Enterprise Linux Server with Smart Management, Standard (Physical or Virtual Nodes)|Some Other Pool"
+END_DESC
+  task :virt_who_report => ["environment", "check_ping"] do
+    class ProblemItem
+      attr_accessor :host, :hypervisor, :message
+
+      def initialize(hash)
+        hash.each { |k, v| instance_variable_set("@#{k}", v) }
+      end
+
+      def hostname
+        host.try(:name)
+      end
+
+      def host_id
+        host.try(:id)
+      end
+    end
+
+    def physical_entitlements(entitlements)
+      entitlements.select do |ent|
+        attributes = ent['pool']['productAttributes'] + ent['pool']["attributes"]
+        virtual = attributes.find { |att| att['name'] == 'virt_only' || att['name'] == 'virtual' }.try(:[], 'value') == 'true'
+        ent['pool']['quantity'] != -1 && virtual != true
+      end
+    end
+
+    #version specific methods
+    def total_count
+      Katello::Host::SubscriptionFacet.count
+    end
+
+    def for_each_item_with_index
+      Katello::Host::SubscriptionFacet.find_each.with_index do |item, index|
+        yield(item, index)
+      end
+    end
+
+    def candlepin_attributes(item)
+      item.candlepin_consumer.consumer_attributes
+    end
+
+    def entitlements(item)
+      item.candlepin_consumer.entitlements
+    end
+
+    def hypervisor_for(item)
+      item.candlepin_consumer.virtual_host
+    end
+
+    def host_for(item)
+      item.host
+    end
+
+    #output writing
+    def output_txt(directory, hypervisors, guests, errors)
+      write_to_file(File.join(directory, 'hypervisors.txt'), hypervisors) do |file, problem|
+        file.write("#{problem.hostname} (#{problem.host_id}): #{problem.message}\n")
+      end
+
+      write_to_file(File.join(directory, 'guests.txt'), guests) do |file, problem|
+        hypervisor_msg = "Could not identify hypervisor."
+        hypervisor_msg = "Hypervisor identified as #{problem.hypervisor.name} (#{problem.hypervisor.id})." if problem.hypervisor
+        file.write("#{problem.hostname} (#{problem.host_id}): #{problem.message} #{hypervisor_msg}\n")
+      end
+
+      write_to_file(File.join(directory, 'errors.txt'), errors) do |file, problem|
+        file.write("#{problem.hostname} (#{problem.host_id}): #{problem.message}\n")
+      end
+    end
+
+    def output_csv(directory, hypervisors, guests, errors)
+      hypervisor_header = ['Name', 'Id', 'Problem reason']
+      write_to_file(File.join(directory, 'hypervisors.csv'), hypervisors, hypervisor_header) do |file, problem|
+        file << [problem.hostname, problem.host_id, problem.message]
+      end
+
+      guests_header = ['Name', 'Id', 'Problem reason', 'Hypervisor name', 'Hypervisor id']
+      write_to_file(File.join(directory, 'guests.csv'), guests, guests_header) do |file, problem|
+        file << [problem.hostname, problem.host_id, problem.message, problem.hypervisor.try(:name), problem.hypervisor.try(:id)]
+      end
+
+      errors_header = ['Name', 'Id', 'Error']
+      write_to_file(File.join(directory, 'errors.csv'), errors, errors_header) do |file, problem|
+        file << [problem.hostname, problem.host_id, problem.message]
+      end
+    end
+
+    def write_to_file(filename, items, csv_header = nil)
+      file_obj = csv_header ? CSV : File
+      file_obj.open(filename, 'w') do |file|
+        file << csv_header if csv_header
+        items.each do |item|
+          yield(file, item)
+        end
+      end
+    end
+
+    total = total_count
+    guests = []
+    hypervisors = []
+    errors = []
+    ignored_pools = ENV['IGNORE'] ? ENV['IGNORE'].split('|') : []
+
+    for_each_item_with_index do |item, index|
+      break if ENV['LIMIT'] && ENV['LIMIT'].to_i < index
+      puts "#{index + 1}/#{total}"
+      begin
+        consumer_attributes = candlepin_attributes(item)
+        entitlements = entitlements(item)
+        if consumer_attributes['type']['label'] == 'hypervisor' && entitlements.empty?
+          hypervisors << ProblemItem.new(:host => host_for(item), :message => "Has no entitlements")
+        elsif consumer_attributes['facts']['virt.is_guest'].try(:to_s) == 'true'
+          physical_ents = physical_entitlements(entitlements).select { |ent| !ignored_pools.include?(ent) }
+
+          if physical_ents.count > 0
+            names = physical_ents.map { |ent| ent['pool']['productName'] }.join(',')
+            guests << ProblemItem.new(:host => host_for(item), :message => "Has physical entitlements: #{names}.", :hypervisor => hypervisor_for(item))
+          end
+        end
+      rescue StandardError => e
+        errors << ProblemItem.new(:host => host_for(item), :message => e.to_s)
+      end
+    end
+
+    directory = Dir.mktmpdir('virt_who_report')
+    if hypervisors.any? || guests.any? || errors.any?
+      puts "#{hypervisors.count} hypervisor issues found."
+      puts "#{guests.count} guest issues found."
+      puts "#{errors.count} errors encountered."
+      puts "Saving results to #{directory}/."
+
+      if ENV['CSV'] && ENV['CSV'] == 'true'
+        output_csv(directory, hypervisors, guests, errors)
+      else
+        output_txt(directory, hypervisors, guests, errors)
+      end
+      exit(-1)
+    else
+      puts "No issues found."
+    end
+  end
+end