katello 3.2.0.rc2 → 3.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1746a52c274c0de6f5d7d9bfe445688ac837f11e
-  data.tar.gz: 99ca72367e3c93ec650f2269d7438fc050aec55c
+  metadata.gz: ce99710c536ecdc466fbed467cdb96100f9ddd57
+  data.tar.gz: 2d82b66f5c5f99167da329a7e794b20421fc7933
 SHA512:
-  metadata.gz: 6dd2a6dcf3602edad6b41282a2d2e5238648f718124cfc04aa8d0ca2c7258d7142c35173e85f4e048656ef7db0ce763705eb4d189f0b2b0d9dda5b12601db98e
-  data.tar.gz: b64938cda76dc55a07e01453d4c99139e79e4e33479298656efb8269fed805d76b8e07bc8e8270a89536728323e7f354f1ec2ee5ca61a220ccc6726930634b77
+  metadata.gz: 653d6cb9ee622d8547d9a6afa4defa2bfaae487ac49b648c602312b7741fb905701cdde5b2a075469d787c9c737848831a0aa6ca6f2d4ff815cc5df60f89be1f
+  data.tar.gz: 8fcaa8457b8f154a31c94184d9290603f77d8995039fb2bd5596be0d59194266c2ca488b6372829e93ee8d115dd02a01e1cff8260df255104bfa63e233d8a3c9

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -253,10 +253,12 @@ KT.hosts.set_media_selection_bindings = function() {
 // Hopefully when this gets resolved http://projects.theforeman.org/issues/14699
 // This method will get backed out.
 function os_selected(element){
-  var attrs = attribute_hash(['operatingsystem_id', 'organization_id', 'location_id', 'content_view_id',
-                              'lifecycle_environment_id', 'content_source_id', 'architecture_id', 'hostgroup_id',
-                              'medium_id', 'kickstart_repository_id']);
-  var url = $(element).attr('data-url');
+    var url = $(element).attr('data-url');
+    var type = $(element).attr('data-type');
+    var attrs = {};
+    attrs[type] = attribute_hash(['operatingsystem_id', 'organization_id', 'location_id', 'content_view_id',
+                                  'lifecycle_environment_id', 'content_source_id', 'architecture_id', 'hostgroup_id',
+                                  'medium_id', 'kickstart_repository_id']);
   tfm.tools.showSpinner();
   $.ajax({
     data: attrs,
@@ -267,7 +269,8 @@ function os_selected(element){
     },
     success: function(request) {
       $('#media_select').html(request);
-      reload_host_params();
+        reload_host_params();
+        reload_puppetclass_params();
     }
   });
   update_provisioning_image();

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -192,8 +192,7 @@ module Katello
     #api :POST, "/environments/:environment_id/consumers", N_("Register a consumer in environment")
     def consumer_create
       content_view_environment = find_content_view_environment
-      host = Katello::Host::SubscriptionFacet.find_or_create_host(params[:facts]['network.hostname'],
-                 content_view_environment.environment.organization, rhsm_params)
+      host = Katello::Host::SubscriptionFacet.find_or_create_host(content_view_environment.environment.organization, rhsm_params)
 
       sync_task(::Actions::Katello::Host::Register, host, rhsm_params, content_view_environment)
       host.reload
@@ -224,8 +223,7 @@ module Katello
       # Set it before calling find_activation_keys to allow communication with candlepin
       User.current = User.anonymous_admin
       activation_keys = find_activation_keys
-      host = Katello::Host::SubscriptionFacet.find_or_create_host(params[:facts]['network.hostname'],
-                                    activation_keys.first.organization, rhsm_params)
+      host = Katello::Host::SubscriptionFacet.find_or_create_host(activation_keys.first.organization, rhsm_params)
 
       sync_task(::Actions::Katello::Host::Register, host, rhsm_params, nil, activation_keys)
 

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

@@ -26,7 +26,6 @@ module Katello
     api :GET, "/host_collections", N_("List host collections")
     api :GET, "/organizations/:organization_id/host_collections", N_("List host collections within an organization")
     api :GET, "/activation_keys/:activation_key_id/host_collections", N_("List host collections in an activation key")
-    api :GET, "/hosts/:host_id/host_collections", N_("List host collections containing a content host")
     param_group :search, Api::V2::ApiController
     param :organization_id, :number, :desc => N_("organization identifier"), :required => false
     param :name, String, :desc => N_("host collection name to filter by")

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

@@ -203,6 +203,8 @@ module Katello
         end
       end
 
+      fail HttpErrors::BadRequest, _("Repository content type must be 'yum' to export.") unless @repository.content_type == 'yum'
+
       task = async_task(::Actions::Katello::Repository::Export, [@repository],
                         ::Foreman::Cast.to_bool(params[:export_to_iso]),
                         params[:since].try(:to_datetime),

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

@@ -24,6 +24,7 @@ module Katello
             param :content_source_id, :number, :desc => N_('Content source ID')
             param :content_view_id, :number, :desc => N_('Content view ID')
             param :lifecycle_environment_id, :number, :desc => N_('Lifecycle environment ID')
+            param :kickstart_repository_id, :number, :desc => N_('Kickstart repository ID')
             param_group :taxonomies, ::Api::V2::BaseController
           end
         end

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -202,18 +202,19 @@ module Katello
       os_selection_params = ["operatingsystem_id", 'content_view_id', 'lifecycle_environment_id',
                              'content_source_id', 'architecture_id']
       view_options = []
-      if os_selection_params.all? { |key| params[key].present? }
+      host_params = params[:hostgroup] || params[:host]
+      if host_params && os_selection_params.all? { |key| host_params[key].present? }
         if host.nil?
           host = ::Host.new
         end
-        host.operatingsystem = Operatingsystem.find(params[:operatingsystem_id])
-        host.architecture = Architecture.find(params[:architecture_id])
+        host.operatingsystem = Operatingsystem.find(host_params[:operatingsystem_id])
+        host.architecture = Architecture.find(host_params[:architecture_id])
 
-        lifecycle_env = Katello::KTEnvironment.find(params[:lifecycle_environment_id])
-        content_view = Katello::ContentView.find(params[:content_view_id])
+        lifecycle_env = Katello::KTEnvironment.find(host_params[:lifecycle_environment_id])
+        content_view = Katello::ContentView.find(host_params[:content_view_id])
         host.content_facet = Host::ContentFacet.new(:lifecycle_environment_id => lifecycle_env.id,
                                                     :content_view_id => content_view.id)
-        host.content_source = SmartProxy.find(params[:content_source_id])
+        host.content_source = SmartProxy.find(host_params[:content_source_id])
         if host.operatingsystem.is_a?(Redhat)
           view_options = host.operatingsystem.kickstart_repos(host).map { |repo| OpenStruct.new(repo) }
         end

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

@@ -32,7 +32,8 @@ module Actions
                                     consumer_parameters: consumer_params, activation_keys: activation_keys.map(&:cp_name))
             return if cp_create.error
 
-            plan_self(uuid: cp_create.output[:response][:uuid], host_id: host.id, hostname: host.name)
+            plan_self(uuid: cp_create.output[:response][:uuid], host_id: host.id, hostname: host.name,
+                      user_id: User.current.id)
             plan_action(Pulp::Consumer::Create, uuid: cp_create.output[:response][:uuid], name: host.name)
           end
         end
@@ -49,6 +50,10 @@ module Actions
           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))

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

@@ -57,7 +57,8 @@ module Katello
         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 path
+        self.update_attribute(:puppet_path, path)
+        path
       end
 
       def refresh_with_puppet_path

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

@@ -6,6 +6,7 @@ module Katello
       included do
         has_many :task_statuses, :dependent => :destroy, :class_name => "Katello::TaskStatus"
         has_many :activation_keys, :dependent => :nullify, :class_name => "Katello::ActivationKey"
+        has_many :subscription_facets, :dependent => :nullify, :class_name => "Katello::Host::SubscriptionFacet"
 
         def self.remote_user
           SETTINGS[:katello][:pulp][:default_login]

data/app/models/katello/erratum.rb

@@ -51,6 +51,13 @@ module Katello
         where("#{Katello::Host::ContentFacet.table_name}.host_id" => hosts).uniq
     end
 
+    def self.applicable_to_hosts_dashboard(hosts)
+      self.joins(:content_facets).
+        where("#{Katello::Host::ContentFacet.table_name}.host_id" => hosts).
+        select("DISTINCT ON (#{self.table_name}.updated, #{self.table_name}.id) #{self.table_name}.*").
+        order("#{self.table_name}.updated desc").limit(6)
+    end
+
     def <=>(other)
       return self.errata_id <=> other.errata_id
     end

data/app/models/katello/host/content_facet.rb

@@ -106,7 +106,8 @@ module Katello
         self.joins("INNER JOIN #{facet_repository} on #{facet_repository}.content_facet_id = #{table_name}.id",
                    "INNER JOIN #{repository_erratum} on #{repository_erratum}.repository_id = #{facet_repository}.repository_id",
                    "INNER JOIN #{erratum} on #{erratum}.id = #{repository_erratum}.erratum_id",
-                   "INNER JOIN #{facet_errata} on #{facet_errata}.erratum_id = #{erratum}.id")
+                   "INNER JOIN #{facet_errata} on #{facet_errata}.erratum_id = #{erratum}.id").
+              where("#{facet_errata}.content_facet_id = #{self.table_name}.id")
       end
 
       def content_view_version

data/app/models/katello/host/subscription_facet.rb

@@ -3,6 +3,7 @@ module Katello
     class SubscriptionFacet < Katello::Model
       self.table_name = 'katello_subscription_facets'
       belongs_to :host, :inverse_of => :subscription_facet, :class_name => "::Host::Managed"
+      belongs_to :user, :inverse_of => :subscription_facets, :class_name => "::User"
 
       has_many :activation_keys, :through => :subscription_facet_activation_keys, :class_name => "Katello::ActivationKey"
       has_many :subscription_facet_activation_keys, :class_name => "Katello::SubscriptionFacetActivationKey", :dependent => :destroy, :inverse_of => :subscription_facet
@@ -70,7 +71,8 @@ module Katello
       end
 
       def self.new_host_from_facts(facts, org, location)
-        ::Host::Managed.new(:name => facts['network.hostname'], :organization => org, :location => location, :managed => false)
+        name = propose_name_from_facts(facts)
+        ::Host::Managed.new(:name => name, :organization => org, :location => location, :managed => false)
       end
 
       def self.update_facts(host, rhsm_facts)
@@ -80,24 +82,45 @@ module Katello
         host.import_facts(rhsm_facts)
       end
 
-      def self.find_or_create_host(name, organization, rhsm_params)
-        host = find_host(name, organization)
+      def self.find_or_create_host(organization, rhsm_params)
+        host = find_host(rhsm_params[:facts], organization)
         host = Katello::Host::SubscriptionFacet.new_host_from_facts(rhsm_params[:facts], organization,
                                           Location.default_location) unless host
         host.organization = organization unless host.organization
         host
       end
 
+      def self.propose_name_from_facts(facts)
+        facts['network.fqdn'] || facts['network.hostname-override'] || facts['network.hostname']
+      end
+
+      def self.propose_existing_hostname(facts)
+        if ::Host.where(:name => facts['network.hostname'].downcase).any?
+          name = facts['network.hostname']
+        elsif facts['network.fqdn'] && ::Host.where(:name => facts['network.fqdn'].downcase).any?
+          name = facts['network.fqdn']
+        elsif facts['network.hostname-override'] && ::Host.where(:name => facts['network.hostname-override'].downcase).any?
+          name = facts['network.hostname-override']
+        else
+          name = facts['network.hostname'] #fallback to default, even if it doesn't exist
+        end
+
+        name.downcase
+      end
+
       def remove_subscriptions(pools_with_quantities)
         ForemanTasks.sync_task(Actions::Katello::Host::RemoveSubscriptions, self.host, pools_with_quantities)
       end
 
-      def self.find_host(name, organization)
-        hosts = ::Host.where(:name => name.downcase)
+      def self.find_host(facts, organization)
+        host_name = propose_existing_hostname(facts)
+        hosts = ::Host.where(:name => host_name)
+
         return nil if hosts.empty? #no host exists
         if hosts.where("organization_id = #{organization.id} OR organization_id is NULL").empty? #not in the correct org
           #TODO: http://projects.theforeman.org/issues/11532
-          fail _("Host is currently registered to a different org, please migrate host to %s.") % organization.name
+          fail _("Host with name %{host_name} is currently registered to a different org, please migrate host to %{org_name}.") %
+                   {:org_name => organization.name, :host_name => host_name }
         end
         hosts.first
       end

data/app/models/katello/host_collection.rb

@@ -78,19 +78,7 @@ module Katello
       host_collections.each do |host_collection|
         host_collection_state = :ok
         unless host_collection.hosts.empty?
-          host_collection.errata.each do |erratum|
-            case erratum.errata_type
-            when Erratum::SECURITY
-              # there is a critical errata, so stop searching...
-              host_collection_state = :critical
-              break
-
-            when Erratum::BUGZILLA
-            when Erratum::ENHANCEMENT
-              # set state to warning, but continue searching...
-              host_collection_state = :warning
-            end
-          end
+          host_collection_state = host_collection.security_updates? ? :critical : :warning
         end
 
         host_collections_hash[host_collection_state] ||= []
@@ -100,15 +88,15 @@ module Katello
     end
 
     def security_updates?
-      errata.any? { |erratum| erratum.errata_type == Erratum::SECURITY }
+      errata(Erratum::SECURITY).any?
     end
 
     def bugzilla_updates?
-      errata.any? { |erratum| erratum.errata_type == Erratum::BUGZILLA }
+      errata(Erratum::BUGZILLA).any?
     end
 
     def enhancement_updates?
-      errata.any? { |erratum| erratum.errata_type == Erratum::ENHANCEMENT }
+      errata(Erratum::ENHANCEMENT).any?
     end
 
     def self.humanize_class_name(_name = nil)

data/app/models/katello/sync_plan.rb

@@ -51,23 +51,17 @@ module Katello
     end
 
     def schedule_format
-      if (self.interval != DURATION[self.interval])
-        format = self.sync_date.iso8601 << "/P" << DURATION[self.interval]
-      else
-        if self.sync_date < Time.now
-          format = nil # do not schedule tasks in past
-        else
-          format = "R1/" << self.sync_date.iso8601 << "/P1D"
-        end
-      end
-      return format
+      return nil if DURATION[self.interval].nil?
+      date = self.sync_date
+      date = next_sync_date if self.sync_date < DateTime.now
+      "#{date.iso8601}/P#{DURATION[self.interval]}"
     end
 
     def plan_zone
       self.sync_date.strftime('%Z')
     end
 
-    def next_sync
+    def next_sync_date
       return nil unless self.enabled
       now = Time.current
       next_sync = self.sync_date
@@ -100,10 +94,13 @@ module Katello
         end
       end
 
-      next_sync = next_sync.strftime('%Y/%m/%d %H:%M:%S %Z') if next_sync
       next_sync
     end
 
+    def next_sync
+      next_sync_date.try(:strftime, '%Y/%m/%d %H:%M:%S %Z')
+    end
+
     def self.humanize_class_name(_name = nil)
       _("Sync Plans")
     end

data/app/models/setting/content.rb

@@ -22,7 +22,7 @@ class Setting::Content < Setting
         self.set('pulp_sync_node_action_finish_timeout', N_("Time in seconds to wait for a pulp node to finish sync"), 12.hours.to_i),
         self.set('check_services_before_actions', N_("Whether or not to check the status of backend services such as pulp and candlepin prior to performing some actions."), true),
         self.set('force_post_sync_actions', N_("Force post sync actions such as indexing and email even if no content was available."), false),
-        self.set('default_download_policy', N_("Default download policy for repositories (either 'immediate', 'on_demand', or 'background')"), "immediate"),
+        self.set('default_download_policy', N_("Default download policy for repositories (either 'immediate', 'on_demand', or 'background')"), "on_demand"),
         self.set('pulp_docker_registry_port', N_("The port used by Pulp Crane to provide Docker Registries"), 5000),
         self.set('pulp_export_destination', N_("On-disk location for exported repositories"), N_("/var/lib/pulp/katello-export")),
         self.set('pulp_client_key', N_("Path for ssl key used for pulp server auth"), "/etc/pki/katello/private/pulp-client.key"),

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

@@ -4,7 +4,7 @@
 
 <% organizations = Organization.current.present? ? [Organization.current] : User.current.allowed_organizations %>
 <% hosts = ::Host::Managed.authorized("view_hosts") %>
-<% errata = Katello::Erratum.applicable_to_hosts(hosts).order('updated desc').limit(6) %>
+<% errata = Katello::Erratum.applicable_to_hosts_dashboard(hosts) %>
 
 <% if errata.empty? %>
   <p class="ca"><%= _("There are no errata that need to be applied to registered content hosts.") %></p>

data/app/views/foreman/job_templates/install_errata.erb

@@ -15,4 +15,5 @@ foreign_input_sets:
   exclude: action,package
 %>
 
-<%= render_template('Package Action - SSH Default', :action => 'update', :package => "--advisory=#{input(:errata)}") %>
+<% advisories = input(:errata).split(',').map { |e| "--advisory=#{e}" }.join(' ') %>
+<%= render_template('Package Action - SSH Default', :action => 'update', :package => advisories) %>

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

@@ -1 +1,5 @@
 attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through
+
+child :user => :user do
+  attributes :id, :login
+end

data/db/migrate/20161003204325_add_user_to_katello_subscription_facets.rb

@@ -0,0 +1,7 @@
+class AddUserToKatelloSubscriptionFacets < ActiveRecord::Migration
+  def change
+    add_column :katello_subscription_facets, :user_id, :integer
+    add_index :katello_subscription_facets, [:user_id], :unique => true
+    add_foreign_key "katello_subscription_facets", "users", :column => "user_id"
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-associations-content-hosts.html

@@ -41,10 +41,10 @@
             <span ng-class="getHostStatusIcon(host.subscription_global_status)">
             </span>
           </td>
-          <td bst-table-cell>{{ host.environment.name }}</td>
-          <td bst-table-cell>{{ host.content_view.name || "" }}</td>
-          <td bst-table-cell>{{ host.service_level }}</td>
-          <td bst-table-cell>{{ host.release_ver }}</td>
+          <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment_name }}</td>
+          <td bst-table-cell>{{ host.content_facet_attributes.content_view_name || "" }}</td>
+          <td bst-table-cell>{{ host.subscription_facet_attributes.service_level }}</td>
+          <td bst-table-cell>{{ host.subscription_facet_attributes.release_version }}</td>
         </tr>
       </tbody>
     </table>

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

@@ -19,14 +19,14 @@
 
       <button ng-if="isState('activation-keys.details.host-collections.list')"
               class="btn btn-default"
-              ng-hide="denied('edit_activation_key', activationKey)"
+              ng-hide="denied('edit_activation_keys', activationKey)"
               ng-disabled="hostCollectionsTable.numSelected == 0 || hostCollectionsTable.working"
               ng-click="removeHostCollections()">
         {{ 'Remove Selected' | translate }}
       </button>
       <button ng-if="isState('activation-keys.details.host-collections.add')"
               class="btn btn-default"
-              ng-hide="denied('edit_activation_key', activationKey)"
+              ng-hide="denied('edit_activation_keys', activationKey)"
               ng-disabled="hostCollectionsTable.numSelected == 0 || hostCollectionsTable.working"
               ng-click="addHostCollections()">
         {{ 'Add Selected' | translate }}

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

@@ -281,7 +281,7 @@
         <span class="info-value"
               translate
               ng-show="host.subscription_facet_attributes.activation_keys.length == 0">
-          {{ contentHost.registered_by }}
+          {{ host.subscription_facet_attributes.user.login }}
         </span>
         <span class="info-value"
               ng-show="host.subscription_facet_attributes.activation_keys.length > 0"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js

@@ -29,6 +29,7 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
         }
 
         nutupane = new Nutupane(ContentViewVersion, {'content_view_id': contentViewId});
+        nutupane.setSearchKey('contentViewVersionSearch');
         nutupane.masterOnly = true;
 
         function saveSuccess() {

data/lib/katello/permissions/activation_key_permissions.rb

@@ -14,7 +14,9 @@ Foreman::Plugin.find(:katello).security_block :activation_keys do
              :resource_type => 'Katello::ActivationKey'
   permission :edit_activation_keys,
              {
-               'katello/api/v2/activation_keys' => [:update, :content_override, :add_subscriptions, :remove_subscriptions]
+               'katello/api/v2/activation_keys' => [:update, :content_override,
+                                                    :add_subscriptions, :remove_subscriptions,
+                                                    :add_host_collections, :remove_host_collections]
              },
              :resource_type => 'Katello::ActivationKey'
   permission :destroy_activation_keys,

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.2.0.rc2".freeze
+  VERSION = "3.2.0.rc3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc2
+  version: 3.2.0.rc3
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1344,6 +1344,7 @@ files:
 - db/migrate/20160727144242_add_registered_through_to_katello_subscription_facets.rb
 - db/migrate/20160808002834_add_files.rb
 - db/migrate/20160906181923_add_puppet_path_to_smart_proxy.rb
+- db/migrate/20161003204325_add_user_to_katello_subscription_facets.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
@@ -1986,7 +1987,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: ''