katello 3.5.2 → 3.6.0.rc1

data/app/models/katello/rhsm_fact_parser.rb

@@ -37,7 +37,7 @@ module Katello
       end
     end
 
-    # rubocop:disable Style/AccessorMethodName:
+    # rubocop:disable Naming/AccessorMethodName:
     def get_interfaces
       mac_keys = facts.keys.select { |f| f =~ /net\.interface\..*\.mac_address/ }
       names = mac_keys.map do |key|

data/app/models/katello/rpm.rb

@@ -4,12 +4,12 @@ module Katello
 
     CONTENT_TYPE = Pulp::Rpm::CONTENT_TYPE
 
-    has_many :repositories, :through => :repository_rpms, :class_name => "Katello::Repository"
     has_many :repository_rpms, :class_name => "Katello::RepositoryRpm", :dependent => :destroy, :inverse_of => :rpm
+    has_many :repositories, :through => :repository_rpms, :class_name => "Katello::Repository"
 
-    has_many :content_facets, :through => :content_facet_applicable_rpms, :class_name => "Katello::Host::ContentFacet"
     has_many :content_facet_applicable_rpms, :class_name => "Katello::ContentFacetApplicableRpm",
              :dependent => :destroy, :inverse_of => :rpm
+    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
@@ -54,7 +54,7 @@ module Katello
     end
 
     def self.total_for_repositories(repos)
-      self.in_repositories(repos).uniq.count
+      self.in_repositories(repos).count
     end
 
     def nvrea
@@ -88,12 +88,12 @@ module Katello
         where("#{Katello::ContentFacetRepository.table_name}.repository_id = host_repo_rpm.repository_id")
 
       query = query.joins(:content_facets).where("#{Katello::Host::ContentFacet.table_name}.host_id" => hosts.map(&:id)) if hosts
-      query.uniq
+      query.distinct
     end
 
     def self.applicable_to_hosts(hosts)
       self.joins(:content_facets).
-        where("#{Katello::Host::ContentFacet.table_name}.host_id" => hosts).uniq
+        where("#{Katello::Host::ContentFacet.table_name}.host_id" => hosts).distinct
     end
   end
 end

data/app/models/katello/srpm.rb

@@ -0,0 +1,40 @@
+module Katello
+  class Srpm < Katello::Model
+    include Concerns::PulpDatabaseUnit
+
+    CONTENT_TYPE = Pulp::Rpm::CONTENT_TYPE
+
+    has_many :repository_srpms, :class_name => "Katello::RepositorySrpm", :dependent => :destroy, :inverse_of => :srpm
+    has_many :repositories, :through => :repository_srpms, :class_name => "Katello::Repository"
+
+    before_save lambda { |rpm| rpm.summary = rpm.summary.truncate(255) unless rpm.summary.blank? }
+
+    def self.repository_association_class
+      RepositorySrpm
+    end
+
+    def update_from_json(json)
+      keys = Pulp::Srpm::PULP_INDEXED_FIELDS - ['_id']
+      custom_json = json.slice(*keys)
+      if custom_json.any? { |name, value| self.send(name) != value }
+        custom_json[:release_sortable] = Util::Package.sortable_version(custom_json[:release])
+        custom_json[:version_sortable] = Util::Package.sortable_version(custom_json[:version])
+        self.assign_attributes(custom_json)
+        self.nvra = self.build_nvra
+        self.save!
+      end
+    end
+
+    def self.total_for_repositories(repos)
+      self.in_repositories(repos).count
+    end
+
+    def nvrea
+      Util::Package.build_nvrea(self.attributes.with_indifferent_access, false)
+    end
+
+    def build_nvra
+      Util::Package.build_nvra(self.attributes.with_indifferent_access)
+    end
+  end
+end

data/app/models/katello/subscription.rb

@@ -3,8 +3,8 @@ module Katello
     include Glue::Candlepin::CandlepinObject
     include Glue::Candlepin::Subscription
     include Katello::Authorization::Subscription
-    has_many :products, :through => :subscription_products, :class_name => "Katello::Product"
     has_many :subscription_products, :class_name => "Katello::SubscriptionProduct", :dependent => :destroy, :inverse_of => :subscription
+    has_many :products, :through => :subscription_products, :class_name => "Katello::Product"
 
     has_many :pools, :class_name => "Katello::Pool", :inverse_of => :subscription, :dependent => :destroy
 
@@ -13,8 +13,9 @@ module Katello
     scope :in_organization, ->(org) { where(:organization => org) }
 
     def self.subscribable
+      product_ids = Product.subscribable.pluck(:id) + [nil]
       joins("LEFT OUTER JOIN #{Katello::SubscriptionProduct.table_name} subprod ON #{self.table_name}.id = subprod.subscription_id")
-        .where("subprod.product_id" => Product.subscribable << nil)
+        .where("subprod.product_id" => product_ids)
         .group("#{self.table_name}.id")
     end
 

data/app/models/katello/sync_plan.rb

@@ -58,7 +58,7 @@ module Katello
     def schedule_format
       return nil if DURATION[self.interval].nil?
       date = self.sync_date
-      date = next_sync_date if enabled? && self.sync_date < DateTime.now
+      date = next_sync_date if enabled? && self.sync_date < Time.now
       "#{date.iso8601}/P#{DURATION[self.interval]}"
     end
 
@@ -66,6 +66,10 @@ module Katello
       self.sync_date.strftime('%Z')
     end
 
+    def sync_time
+      self.sync_date.utc.strftime('%H%M%S%N')
+    end
+
     def next_sync_date
       return nil unless self.enabled
       now = Time.current
@@ -77,6 +81,7 @@ module Katello
         seconds = self.sync_date.sec - now.sec
 
         next_sync = nil
+        now_time = now.utc.strftime('%H%M%S%N')
 
         case self.interval
         when HOURLY
@@ -85,15 +90,13 @@ module Katello
           end
           next_sync = now.advance(:minutes => minutes, :seconds => seconds)
         when DAILY
-          sync_time = Time.at(self.sync_date.hour * 60 * 60 + self.sync_date.min * 60 + self.sync_date.sec)
-          now_time = Time.at(now.hour * 60 * 60 + now.min * 60 + now.sec)
-          if sync_time < now_time
+          if self.sync_time < now_time
             hours += 24
           end
           next_sync = now.advance(:hours => hours, :minutes => minutes, :seconds => seconds)
         when WEEKLY
           days = self.sync_date.wday - now.wday
-          days += 7 if days <= 0
+          days += 7 if days < 0 || (days == 0 && self.sync_time <= now_time)
           next_sync = now.change(:hour => self.sync_date.hour, :min => self.sync_date.min,
                                  :sec => self.sync_date.sec).advance(:days => days)
         end

data/app/models/setting/content.rb

@@ -18,8 +18,12 @@ class Setting::Content < Setting
                  'Katello Kickstart Default Finish', N_('Default synced OS finish template')),
         self.set('katello_default_user_data', N_("Default user data for new Operating Systems created from synced content"),
                  'Katello Kickstart Default User Data', N_('Default synced OS user-data')),
-        self.set('katello_default_PXELinux', N_("Default PXElinux template for new Operating Systems created from synced content"),
+        self.set('katello_default_PXELinux', N_("Default PXELinux template for new Operating Systems created from synced content"),
                  'Kickstart default PXELinux', N_('Default synced OS PXELinux template')),
+        self.set('katello_default_PXEGrub', N_("Default PXEGrub template for new Operating Systems created from synced content"),
+                 'Kickstart default PXEGrub', N_('Default synced OS PXEGrub template')),
+        self.set('katello_default_PXEGrub2', N_("Default PXEGrub2 template for new Operating Systems created from synced content"),
+                 'Kickstart default PXEGrub2', N_('Default synced OS PXEGrub2 template')),
         self.set('katello_default_iPXE', N_("Default iPXE template for new Operating Systems created from synced content"),
                  'Kickstart default iPXE', N_('Default synced OS iPXE template')),
         self.set('katello_default_ptable', N_("Default partitioning table for new Operating Systems created from synced content"),
@@ -56,8 +60,6 @@ class Setting::Content < Setting
                  "/etc/pki/katello/certs/pulp-client.crt", N_('Pulp client cert')),
         self.set('remote_execution_by_default', N_("If set to true, use the remote execution over katello-agent for remote actions"),
                  false, N_('Use remote execution by default')),
-        self.set('use_pulp_oauth', N_("use oauth authentication for pulp instead of the default cert based authentication"),
-                 false, N_('Use Pulp OAuth authentication')),
         self.set('unregister_delete_host', N_("When unregistering a host via subscription-manager, also delete the host record. Managed resources linked to host " \
                                               "such as virtual machines and DNS records may also be deleted."),
                  false, N_('Delete Host upon unregister')),

data/app/services/katello/product_content_finder.rb

@@ -25,7 +25,7 @@ module Katello
       considered_products = match_subscription ? consumable.products : consumable.organization.products.enabled.uniq
 
       repositories = Katello::Repository.where(:product_id => considered_products).subscribable
-      repositories = repositories.where(:content_view_version_id => version .id) if version
+      repositories = repositories.where(:content_view_version_id => version.id) if version
 
       consumable.organization.enabled_product_content_for(repositories)
     end

data/app/services/katello/pulp/deb.rb

@@ -0,0 +1,46 @@
+module Katello
+  module Pulp
+    class Deb < PulpContentUnit
+      include LazyAccessor
+
+      PULP_SELECT_FIELDS = %w(name version architecture checksumtype checksum).freeze
+      PULP_INDEXED_FIELDS = %w(name version architecture description sourcedeb checksum filename _id).freeze
+      CONTENT_TYPE = "deb".freeze
+
+      lazy_accessor :pulp_facts, :initializer => :backend_data
+
+      lazy_accessor :description, :license, :buildhost, :vendor, :relativepath, :children, :checksumtype,
+                    :changelog, :group, :size, :url, :build_time, :group,
+                    :initializer => :pulp_facts
+
+      def requires
+        if pulp_facts['requires']
+          pulp_facts['requires'].map { |entry| Katello::Util::Package.format_requires(entry) }.uniq.sort
+        else
+          []
+        end
+      end
+
+      def provides
+        if pulp_facts['provides']
+          pulp_facts['provides'].map { |entry| Katello::Util::Package.build_nvrea(entry, false) }.uniq.sort
+        else
+          []
+        end
+      end
+
+      def files
+        result = []
+        if pulp_facts['files']
+          if pulp_facts['files']['file']
+            result << pulp_facts['files']['file']
+          end
+          if pulp_facts['files']['dir']
+            result << pulp_facts['files']['dir']
+          end
+        end
+        result.flatten
+      end
+    end
+  end
+end

data/app/services/katello/pulp/docker_manifest_list.rb

@@ -0,0 +1,7 @@
+module Katello
+  module Pulp
+    class DockerManifestList < PulpContentUnit
+      CONTENT_TYPE = "docker_manifest_list".freeze
+    end
+  end
+end

data/app/services/katello/pulp/server.rb

@@ -15,6 +15,10 @@ module Katello
             :exception => true,
             :info => true,
             :debug => true
+          },
+          :cert_auth => {
+            :ssl_client_cert => ::Cert::Certs.ssl_client_cert,
+            :ssl_client_key => ::Cert::Certs.ssl_client_key
           }
         }
 
@@ -22,18 +26,6 @@ module Katello
           runcible_params[:ca_cert_file] = ca_cert
         end
 
-        if Setting[:use_pulp_oauth]
-          runcible_params[:oauth] = {
-            :oauth_secret => SETTINGS[:katello][:pulp][:oauth_secret],
-            :oauth_key => SETTINGS[:katello][:pulp][:oauth_key]
-          }
-        else
-          runcible_params[:cert_auth] = {
-            :ssl_client_cert => ::Cert::Certs.ssl_client_cert,
-            :ssl_client_key => ::Cert::Certs.ssl_client_key
-          }
-        end
-
         Runcible::Instance.new(runcible_params)
       end
     end

data/app/services/katello/pulp/srpm.rb

@@ -0,0 +1,17 @@
+module Katello
+  module Pulp
+    class Srpm < PulpContentUnit
+      include LazyAccessor
+
+      PULP_SELECT_FIELDS = %w(name epoch version release arch checksumtype checksum).freeze
+      PULP_INDEXED_FIELDS = %w(name version release arch epoch summary sourcerpm checksum filename _id).freeze
+      CONTENT_TYPE = "srpm".freeze
+
+      lazy_accessor :pulp_facts, :initializer => :backend_data
+
+      lazy_accessor :description, :license, :buildhost, :vendor, :relativepath, :children, :checksumtype,
+                    :changelog, :group, :size, :url, :build_time, :group,
+                    :initializer => :pulp_facts
+    end
+  end
+end

data/app/views/foreman/unattended/finish-katello.erb

@@ -20,8 +20,8 @@ service network restart
   rhel_compatible = @host.operatingsystem.family == 'Redhat' && @host.operatingsystem.name != 'Fedora'
   os_major = @host.operatingsystem.major.to_i
   pm_set = @host.puppetmaster.empty? ? false : true
-  puppet_enabled = pm_set || @host.params['force-puppet']
-  salt_enabled = @host.params['salt_master'] ? true : false
+  puppet_enabled = pm_set || host_param('force-puppet')
+  salt_enabled = host_param('salt_master') ? true : false
   chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
 %>
 
@@ -33,10 +33,10 @@ service network restart
 
 # update local time
 echo "updating system time"
-/usr/sbin/ntpdate -sub <%= @host.params['ntp-server'] || '0.fedora.pool.ntp.org' %>
+/usr/sbin/ntpdate -sub <%= host_param('ntp-server') || '0.fedora.pool.ntp.org' %>
 /usr/sbin/hwclock --systohc
 
-<% if @host.info['parameters']['realm'] && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
+<% if host_param('realm') && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
 <%= snippet "freeipa_register" %>
 <% end -%>
 

data/app/views/foreman/unattended/kickstart-katello-atomic.erb

@@ -3,9 +3,9 @@ kind: provision
 name: Katello Atomic Kickstart default
 %>
 
-lang <%= @host.params['lang'] || 'en_US.UTF-8' %>
-keyboard <%= @host.params['keyboard'] || 'us' %>
-timezone --utc <%= @host.params['time-zone'] || 'UTC' %>
+lang <%= host_param('lang') || 'en_US.UTF-8' %>
+keyboard <%= host_param('keyboard') || 'us' %>
+timezone --utc <%= host_param('time-zone') || 'UTC' %>
 
 <% subnet = @host.subnet -%>
 <% if subnet.respond_to?(:dhcp_boot_mode?) -%>

data/app/views/foreman/unattended/kickstart-katello.erb

@@ -16,8 +16,8 @@ oses:
   os_major = @host.operatingsystem.major.to_i
   # safemode renderer does not support unary negation
   pm_set = @host.puppetmaster.empty? ? false : true
-  puppet_enabled = pm_set || @host.params['force-puppet']
-  salt_enabled = @host.params['salt_master'] ? true : false
+  puppet_enabled = pm_set || host_param('force-puppet')
+  salt_enabled = host_param('salt_master') ? true : false
   chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
   section_end = (rhel_compatible && os_major <= 5) ? '' : '%end'
 %>
@@ -40,7 +40,7 @@ network --bootproto <%= dhcp ? 'dhcp' : "static --ip=#{@host.ip} --netmask=#{sub
 rootpw --iscrypted <%= root_pass %>
 firewall --<%= os_major >= 6 ? 'service=' : '' %>ssh
 authconfig --useshadow --passalgo=<%= @host.operatingsystem.password_hash || 'sha256' %> --kickstart
-timezone --utc <%= @host.params['time-zone'] || 'UTC' %>
+timezone --utc <%= host_param('time-zone') || 'UTC' %>
 
 <% if @host.operatingsystem.name == 'Fedora' and os_major <= 16 -%>
 # Bootloader exception for Fedora 16:
@@ -68,10 +68,6 @@ yum
 dhclient
 ntp
 wget
-<% if host_param('kt_activation_keys') -%>
-<% # if you want to use subscription manager you need to install it now, in %post it would rely on upstream mirror -%>
-subscription-manager
-<% end -%>
 @Core
 <%= section_end -%>
 
@@ -104,12 +100,12 @@ exec < /dev/tty3 > /dev/tty3
 
 #update local time
 echo "updating system time"
-/usr/sbin/ntpdate -sub <%= @host.params['ntp-server'] || '0.fedora.pool.ntp.org' %>
+/usr/sbin/ntpdate -sub <%= host_param('ntp-server') || '0.fedora.pool.ntp.org' %>
 /usr/sbin/hwclock --systohc
 
 <%= snippet "subscription_manager_registration" %>
 
-<% if @host.info['parameters']['realm'] && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
+<% if host_param('realm') && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
 <%= snippet "freeipa_register" %>
 <% end -%>
 

data/app/views/foreman/unattended/snippets/_subscription_manager_registration.erb

@@ -1,4 +1,4 @@
-<% if @host.params['kt_activation_keys'] %>
+<% if host_param('kt_activation_keys') %>
   # add subscription manager
  <% if @host.operatingsystem.atomic? %>
   curl -s <%= subscription_manager_configuration_url(@host, false) %> | IS_ATOMIC=true bash
@@ -8,11 +8,11 @@
  <% end %>
 
   echo "Registering the System"
-  subscription-manager register --org="<%= @host.rhsm_organization_label %>" --name="<%= @host.name %>" --activationkey="<%= @host.params['kt_activation_keys'] %>"
+  subscription-manager register --org="<%= @host.rhsm_organization_label %>" --name="<%= @host.name %>" --activationkey="<%= host_param('kt_activation_keys') %>"
 
   <% unless @host.operatingsystem.atomic? %>
     echo "Installing Katello Agent"
     yum -t -y -e 0 install katello-agent
     chkconfig goferd on
   <% end %>
-<% end %>
+<% end %>

data/app/views/foreman/unattended/userdata-katello.erb

@@ -29,13 +29,13 @@ users:
    passwd: <%= @host.root_pass %>
 
 <%# Allow user to specify additional SSH key as host paramter -%>
-<% if @host.params['sshkey'].present? || @host.params['remote_execution_ssh_keys'].present? -%>
+<% if host_param('sshkey').present? || host_param('remote_execution_ssh_keys').present? -%>
 ssh_authorized_keys:
-<% if @host.params['sshkey'].present? -%>
-  - <%= @host.params['sshkey'] %>
+<% if host_param('sshkey').present? -%>
+  - <%= host_param('sshkey') %>
 <% end -%>
-<% if @host.params['remote_execution_ssh_keys'].present? -%>
-<% @host.params['remote_execution_ssh_keys'].each do |key| -%>
+<% if host_param('remote_execution_ssh_keys').present? -%>
+<% host_param('remote_execution_ssh_keys').each do |key| -%>
   - <%= key %>
 <% end -%>
 <% end -%>
@@ -48,7 +48,7 @@ write_files:
 <%= indent 4 do
       snippet 'subscription_manager_registration'
     end %>
-<% if @host.info['parameters']['realm'] && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
+<% if host_param('realm') && @host.realm && @host.realm.realm_type == 'FreeIPA' -%>
 <%= indent 4 do
       snippet 'freeipa_register'
     end %>
@@ -61,8 +61,8 @@ write_files:
   # safemode renderer does not support unary negation
   non_atomic = @host.operatingsystem.atomic? ? false : true
   pm_set = @host.puppetmaster.empty? ? false : true
-  puppet_enabled = non_atomic && (pm_set || @host.params['force-puppet'])
-  salt_enabled = non_atomic && (@host.params['salt_master'] ? true : false)
+  puppet_enabled = non_atomic && (pm_set || host_param('force-puppet'))
+  salt_enabled = non_atomic && (host_param('salt_master') ? true : false)
   chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
 %>
 <% if chef_enabled %>

data/app/views/katello/api/v2/activation_keys/product_content.json.rabl

@@ -8,8 +8,7 @@ child @collection[:results] => :results do
   end
 
   child :content => :content do
-    attributes :id, :name, :label
-    attribute :contentUrl => :content_url
+    attributes :id, :name, :label, :vendor, :content_type, :content_url, :gpg_url
   end
 
   node :override do |pc|