katello 3.16.2 → 3.17.0.rc1

data/app/lib/actions/pulp3/repository/upload_file.rb

@@ -25,7 +25,7 @@ module Actions
                 filechunk.flush
                 actual_chunk_size = File.size(filechunk)
                 response = uploads_api.update(upload_href, content_range(offset, offset + actual_chunk_size - 1, total_size), filechunk)
-                offset += actual_chunk_size
+                offset += actual_chunk_size - 1
               ensure
                 filechunk.close
                 filechunk.unlink

data/app/lib/katello/resources/candlepin/product.rb

@@ -66,6 +66,17 @@ module Katello
             self.post(join_path(path(owner_label, product_id), "content/#{content_id}?enabled=#{enabled}"), nil, self.default_headers).code.to_i
           end
 
+          def update_enabled(owner_label, product_id, contents)
+            options = { id: product_id }
+            options[:productContent] = contents.map do |content|
+              ret = { content: { id: content[:id] } }
+              ret[:enabled] = content[:enabled] if content.key?(:enabled)
+              ret
+            end
+
+            update(owner_label, options)
+          end
+
           def remove_content(owner_label, product_id, content_id)
             self.delete(join_path(path(owner_label, product_id), "content/#{content_id}"), self.default_headers).code.to_i
           end

data/app/lib/katello/resources/cdn.rb

@@ -18,7 +18,7 @@ module Katello
       class CdnResource
         CDN_DOCKER_CONTAINER_LISTING = "CONTAINER_REGISTRY_LISTING".freeze
 
-        attr_reader :url, :product, :options, :proxy
+        attr_reader :url, :product, :options
 
         def substitutor(logger = nil)
           @logger = logger
@@ -26,7 +26,6 @@ module Katello
         end
 
         def initialize(url, options = {})
-          @proxy = ::HttpProxy.default_global_content_proxy
           @ssl_version = Setting[:cdn_ssl_version]
           if @ssl_version && !SUPPORTED_SSL_VERSIONS.include?(@ssl_version)
             fail("Invalid SSL version specified. Check the 'CDN SSL Version' setting")
@@ -141,7 +140,7 @@ module Katello
         end
 
         def net_http_class
-          if self.proxy
+          if (proxy = ::HttpProxy.default_global_content_proxy)
             uri = URI(proxy.url) #Net::HTTP::Proxy ignores port as part of the url
             Net::HTTP::Proxy("#{uri.host}#{uri.path}", uri.port, proxy.username, proxy.password)
           else

data/app/lib/katello/util/cdn_var_substitutor.rb

@@ -59,17 +59,15 @@ module Katello
 
         return resolved if to_resolve.empty?
 
-        to_resolve.in_groups_of(8) do |group|
-          futures = group.map do |path_with_substitution|
-            Concurrent::Promises.future do
-              path_with_substitution.resolve_substitutions(@resource)
-            end
+        futures = to_resolve.map do |path_with_substitution|
+          Concurrent::Promises.future do
+            path_with_substitution.resolve_substitutions(@resource)
           end
+        end
 
-          futures.each do |future|
-            resolved << future.value
-            Rails.logger.error("Failed at scanning for repository: #{future.reason}") if future.rejected?
-          end
+        futures.each do |future|
+          resolved << future.value
+          Rails.logger.error("Failed at scanning for repository: #{future.reason}") if future.rejected?
         end
 
         find_substitutions(resolved.compact.flatten)

data/app/lib/katello/validators/hostgroup_kickstart_repository_validator.rb

@@ -1,29 +1,29 @@
 module Katello
   module Validators
     class HostgroupKickstartRepositoryValidator < ActiveModel::Validator
-      def validate(hostgroup)
+      def validate(facet)
         # check content source first, otherwise it's meaningless to proceed
-        if hostgroup.content_source && hostgroup.lifecycle_environment
-          valid = hostgroup.content_source.lifecycle_environments.include?(hostgroup.lifecycle_environment)
-          hostgroup.errors.add(:base, _("The selected content source and lifecycle environment do not match")) && return unless valid
+        if facet.content_source && facet.lifecycle_environment
+          valid = facet.content_source.lifecycle_environments.include?(facet.lifecycle_environment)
+          facet.errors.add(:base, _("The selected content source and lifecycle environment do not match")) && return unless valid
         end
 
-        return unless hostgroup.kickstart_repository_id
+        return unless facet.kickstart_repository_id
 
-        msg = if hostgroup.content_source.blank?
+        msg = if facet.content_source.blank?
                 _("Please select a content source before assigning a kickstart repository")
-              elsif hostgroup.operatingsystem.blank?
+              elsif facet.hostgroup.operatingsystem.blank?
                 _("Please select an operating system before assigning a kickstart repository")
-              elsif !hostgroup.operatingsystem.is_a?(Redhat)
+              elsif !facet.hostgroup.operatingsystem.is_a?(Redhat)
                 _("Kickstart repositories can only be assigned to hosts in the Red Hat family")
-              elsif hostgroup.architecture.blank?
+              elsif facet.hostgroup.architecture.blank?
                 _("Please select an architecture before assigning a kickstart repository")
-              elsif !hostgroup.matching_kickstart_repository?
+              elsif !facet.hostgroup.matching_kickstart_repository?(facet)
                 _("The selected kickstart repository is not part of the assigned content view, lifecycle environment,
                   content source, operating system, and architecture")
               end
 
-        hostgroup.errors.add(:base, msg) if msg
+        facet.errors.add(:base, msg) if msg
       end
     end
   end

data/app/models/katello/activation_key.rb

@@ -104,7 +104,7 @@ module Katello
     end
 
     def products
-      Katello::Product.joins(:pools => :activation_keys).where("#{Katello::ActivationKey.table_name}.id" => self.id).enabled.uniq
+      Katello::Product.distinct.joins(:pools => :activation_keys).where("#{Katello::ActivationKey.table_name}.id" => self.id).enabled.sort
     end
 
     def valid_content_override_label?(content_label)

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

@@ -57,6 +57,13 @@ module Katello
             attributes['lifecycle_environment_id'].blank?
           )
         end
+
+        apipie :class do
+          property :content_view, 'ContentView', desc: 'Returns content view associated with the host'
+          property :lifecycle_environment, 'KTEnvironment', desc: 'Returns lifecycle environment object associated with the host'
+          property :content_source, 'SmartProxy', desc: 'Returns Smart Proxy object as the content source for the host'
+          property :applicable_errata, array_of: 'Erratum', desc: 'Returns Smart Proxy object as the content source for the host'
+        end
       end
 
       module ClassMethods

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

@@ -52,6 +52,9 @@ module Katello
         before_validation :correct_kickstart_repository
         before_update :check_host_registration, :if => proc { organization_id_changed? }
 
+        after_validation :queue_reset_content_host_status
+        register_rebuild(:queue_reset_content_host_status, N_("Content_Host_Status"))
+
         scope :with_pools_expiring_in_days, ->(days) { joins(:pools).merge(Katello::Pool.expiring_in_days(days)).distinct }
 
         scoped_search :relation => :host_collections, :on => :id, :complete_value => false, :rename => :host_collection_id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
@@ -75,6 +78,19 @@ module Katello
             { :conditions => "1=0" }
           end
         end
+
+        apipie :class do
+          property :content_source, 'SmartProxy', desc: 'Returns Smart Proxy object as the content source for the host'
+          property :subscription_manager_configuration_url, String, desc: 'Returns URL for subscription manager configuration'
+          property :rhsm_organization_label, String, desc: 'Returns label of the Red Hat Subscription Manager organization'
+          property :host_collections, array_of: 'HostCollection', desc: 'Returns list of the host collections the host belongs to'
+          property :comment, String, desc: 'Returns comment given to the host'
+          property :pools, array_of: 'Pool', desc: 'Returns subscription pool objects associated with the host'
+          property :hypervisor_host, 'Host', desc: 'Returns hypervisor host object of this host'
+          property :lifecycle_environment, 'KTEnvironment', desc: 'Returns lifecycle environment object associated with the host'
+          property :content_view, 'ContentView', desc: 'Returns content view associated with the host'
+          property :installed_packages, array_of: 'InstalledPackage', desc: 'Returns a list of packages installed on the host'
+        end
       end
 
       def check_host_registration
@@ -83,6 +99,29 @@ module Katello
         end
       end
 
+      def reset_katello_status
+        self.host_statuses.where(type: ::Katello::HostStatusManager::STATUSES.map(&:name)).each do |status|
+          status.update!(:status => status.class.const_get(:UNKNOWN))
+        end
+        self.host_statuses.reload
+        true
+      end
+
+      def reset_content_host_status
+        logger.debug "Scheduling host status cleanup"
+        queue.create(id: "reset_content_host_status_#{id}", name: _("Mark Content Host Statuses as Unknown for %s") % self,
+          priority: 200, action: [self, :reset_katello_status])
+      end
+
+      def queue_reset_content_host_status
+        should_reset_content_host_status? && reset_content_host_status
+      end
+
+      def should_reset_content_host_status?
+        return false unless self.is_a?(::Host::Base)
+        !new_record? && build && self.changes.key?('build')
+      end
+
       def correct_kickstart_repository
         return unless content_facet
 

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

@@ -5,35 +5,43 @@ module Katello
 
       included do
         before_save :add_organization_for_environment
-        belongs_to :kickstart_repository, :class_name => "::Katello::Repository",
-                   :foreign_key => :kickstart_repository_id, :inverse_of => :kickstart_hostgroups
-        belongs_to :content_source, :class_name => "::SmartProxy", :foreign_key => :content_source_id, :inverse_of => :hostgroups
-        belongs_to :content_view, :inverse_of => :hostgroups, :class_name => "::Katello::ContentView"
-        belongs_to :lifecycle_environment, :inverse_of => :hostgroups, :class_name => "::Katello::KTEnvironment"
 
-        validates_with Katello::Validators::ContentViewEnvironmentValidator
-        validates_with Katello::Validators::HostgroupKickstartRepositoryValidator
-        validates_with ::AssociationExistsValidator, attributes: [:content_source]
+        has_one :kickstart_repository, :through => :content_facet
+        has_one :content_source, :through => :content_facet
+        has_one :content_view, :through => :content_facet
+        has_one :lifecycle_environment, :through => :content_facet
 
         scoped_search :relation => :content_source, :on => :name, :complete_value => true, :rename => :content_source, :only_explicit => true
         scoped_search :relation => :content_view, :on => :name, :complete_value => true, :rename => :content_view, :only_explicit => true
         scoped_search :relation => :lifecycle_environment, :on => :name, :complete_value => true, :rename => :lifecycle_environment, :only_explicit => true
 
         before_validation :correct_kickstart_repository
+
+        delegate :content_source_name, :content_view_name, :lifecycle_environment_name, to: :content_facet, allow_nil: true
+        delegate :content_source_id, :content_view_id, :lifecycle_environment_id, :kickstart_repository_id, to: :content_facet, allow_nil: true
+        delegate :'content_source_id=', :'content_view_id=', :'lifecycle_environment_id=', :'kickstart_repository_id=', to: :safe_content_facet, allow_nil: true
+
+        apipie :class do
+          property :content_source, 'SmartProxy', desc: 'Returns Smart Proxy object as the content source for the host group'
+          property :subscription_manager_configuration_url, String, desc: 'Returns URL for subscription manager configuration'
+          property :rhsm_organization_label, String, desc: 'Returns label of the Red Hat Subscription Manager organization'
+        end
       end
 
       def correct_kickstart_repository
         # If switched from ks repo to install media:
-        if medium_id_changed? && medium && kickstart_repository_id
-          self.kickstart_repository_id = nil
+        if medium_id_changed? && medium && content_facet&.kickstart_repository_id
+          # since it's :through association, nullify both the actual data source and delegate
+          self.content_facet.kickstart_repository = nil
+          self.kickstart_repository = nil
         # If switched from install media to ks repo:
-        elsif kickstart_repository && medium
+        elsif content_facet&.kickstart_repository && medium
           self.medium = nil
         end
 
-        unless matching_kickstart_repository?
+        unless matching_kickstart_repository?(content_facet)
           if (equivalent = equivalent_kickstart_repository)
-            self.kickstart_repository_id = equivalent[:id]
+            self.content_facet.kickstart_repository_id = equivalent[:id]
           end
         end
       end
@@ -55,19 +63,19 @@ module Katello
       end
 
       def inherited_content_source_id
-        inherited_ancestry_attribute(:content_source_id)
+        inherited_ancestry_attribute(:content_source_id, :content_facet)
       end
 
       def inherited_content_view_id
-        inherited_ancestry_attribute(:content_view_id)
+        inherited_ancestry_attribute(:content_view_id, :content_facet)
       end
 
       def inherited_lifecycle_environment_id
-        inherited_ancestry_attribute(:lifecycle_environment_id)
+        inherited_ancestry_attribute(:lifecycle_environment_id, :content_facet)
       end
 
       def inherited_kickstart_repository_id
-        inherited_ancestry_attribute(:kickstart_repository_id)
+        inherited_ancestry_attribute(:kickstart_repository_id, :content_facet)
       end
 
       def rhsm_organization_label
@@ -95,22 +103,36 @@ module Katello
         ks_repos.find { |repo| repo[:name] == kickstart_repository.label }
       end
 
-      def matching_kickstart_repository?
+      def matching_kickstart_repository?(content_facet)
         return true unless operatingsystem
 
         if operatingsystem.respond_to? :kickstart_repos
-          return operatingsystem.kickstart_repos(self).any? { |repo| repo[:id] == kickstart_repository_id }
+          return operatingsystem.kickstart_repos(self).any? { |repo| repo[:id] == (content_facet&.kickstart_repository_id || content_facet&.kickstart_repository&.id) }
         end
       end
 
       private
 
-      def inherited_ancestry_attribute(attribute)
-        if ancestry.present?
-          self[attribute] || self.class.sort_by_ancestry(ancestors.where("#{attribute.to_s} is not NULL")).last.try(attribute)
-        else
-          self.send(attribute)
+      def inherited_ancestry_attribute(attribute, facet)
+        value = self.send(facet)&.send(attribute)
+
+        if value.nil? && ancestry.present?
+          # take first non-null value for the attribute going up the ancestry tree.
+          # example: you have hg1 -> hg11 -> hg111 -> hg1111 hostgroups.
+          # given we are querying hg1111 (the leaf), and a value is set on:
+          # hg1: 1
+          # hg11: 2
+          # it will return the value 2.
+          facet_model = Facets.registered_facets[facet].hostgroup_configuration.model
+          value = facet_model.where.not(attribute => nil).joins(:hostgroup).merge(
+            ::Hostgroup.where(id: self.ancestor_ids).reorder(ancestry: :desc)
+          ).limit(1).pluck(attribute)
         end
+        value
+      end
+
+      def safe_content_facet
+        content_facet || build_content_facet
       end
     end
   end

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

@@ -49,8 +49,9 @@ module Katello
         has_many :content_facets, :class_name => "::Katello::Host::ContentFacet", :foreign_key => :content_source_id,
                                   :inverse_of => :content_source, :dependent => :nullify
 
-        has_many :hostgroups, :class_name => "::Hostgroup", :foreign_key => :content_source_id,
+        has_many :hostgroup_content_facets, :class_name => "::Katello::Hostgroup::ContentFacet", :foreign_key => :content_source_id,
                               :inverse_of => :content_source, :dependent => :nullify
+        has_many :hostgroups, :class_name => "::Hostgroup", :through => :hostgroup_content_facets
 
         validates :download_policy, inclusion: {
           :in => DOWNLOAD_POLICIES,
@@ -120,7 +121,8 @@ module Katello
           uri = pulp3_uri!
           config.host = uri.host
           config.scheme = uri.scheme
-          pulp3_ssl_configuration(config)
+          config.ssl_client_cert = ::Cert::Certs.ssl_client_cert
+          config.ssl_client_key = ::Cert::Certs.ssl_client_key
           config.debugging = true
           config.logger = ::Foreman::Logging.logger('katello/pulp_rest')
           config.username = self.setting(PULP3_FEATURE, 'username')
@@ -128,18 +130,6 @@ module Katello
         end
       end
 
-      def pulp3_ssl_configuration(config)
-        if Faraday.default_adapter == :excon
-          config.ssl_client_cert = ::Cert::Certs.ssl_client_cert_filename
-          config.ssl_client_key = ::Cert::Certs.ssl_client_key_filename
-        elsif Faraday.default_adapter == :net_http
-          config.ssl_client_cert = ::Cert::Certs.ssl_client_cert
-          config.ssl_client_key = ::Cert::Certs.ssl_client_key
-        else
-          fail "Unexpected faraday default_adapter #{Faraday.default_adapter}!  Cannot continue, this is likely a bug."
-        end
-      end
-
       def backend_service_type(repository)
         if pulp3_support?(repository)
           Actions::Pulp3::Abstract::BACKEND_SERVICE_TYPE
@@ -153,7 +143,7 @@ module Katello
       end
 
       def pulp3_support?(repository)
-        repository ? pulp3_repository_type_support?(repository.try(:content_type)) : false
+        pulp3_repository_type_support?(repository.content_type)
       end
 
       def pulp2_preferred_for_type?(repository_type)
@@ -343,7 +333,3 @@ module Katello
     end
   end
 end
-
-class ::SmartProxy::Jail < Safemode::Jail
-  allow :hostname
-end

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

@@ -0,0 +1,23 @@
+module Katello
+  module Concerns
+    module WidgetExtensions
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        SUBSCRIPTION_TEMPLATES = %w[subscription_status_widget subscription_widget].freeze
+
+        def without_subscription_widgets
+          where.not(template: ::Widget.singleton_class::SUBSCRIPTION_TEMPLATES)
+        end
+
+        def available
+          if Organization.current&.simple_content_access?
+            super.without_subscription_widgets
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/katello/content_view.rb

@@ -46,8 +46,10 @@ module Katello
                           :inverse_of => :content_view, :dependent => :restrict_with_exception
     has_many :hosts,      :class_name => "::Host::Managed", :through => :content_facets,
                           :inverse_of => :content_view
-    has_many :hostgroups, :class_name => "::Hostgroup", :foreign_key => :content_view_id,
+    has_many :hostgroup_content_facets, :class_name => "Katello::Hostgroup::ContentFacet", :foreign_key => :content_view_id,
                           :inverse_of => :content_view, :dependent => :nullify
+    has_many :hostgroups, :class_name => "::Hostgroup", :through => :hostgroup_content_facets,
+                          :inverse_of => :content_view
 
     has_many :repository_references, :class_name => 'Katello::Pulp3::RepositoryReference', :foreign_key => :content_view_id,
              :dependent => :destroy, :inverse_of => :content_view
@@ -719,6 +721,12 @@ module Katello
       self.organization
     end
 
+    apipie :class, desc: "A class representing #{model_name.human} object" do
+      name 'Content View'
+      refs 'ContentView'
+      sections only: %w[all additional]
+      prop_group :katello_basic_props, Katello::Model, meta: { friendly_name: 'Content View' }
+    end
     class Jail < ::Safemode::Jail
       allow :name, :label
     end

data/app/models/katello/content_view_package_filter.rb

@@ -37,7 +37,7 @@ module Katello
       self.package_rules.each do |rule|
         package_filenames.concat(query_rpms(repo, rule))
       end
-      package_filenames.concat(repo.packages_without_errata.map(&:filename)) if self.original_packages
+
       rpms = Rpm.in_repositories(repo)
       rpms.where(filename: package_filenames).where(:modular => false).pluck(:pulp_id).flatten.uniq
     end

data/app/models/katello/content_view_version.rb

@@ -383,6 +383,13 @@ module Katello
       [self.content_view]
     end
 
+    apipie :class, desc: "A class representing #{model_name.human} object" do
+      name 'Content View Version'
+      refs 'ContentViewVersion'
+      sections only: %w[all additional]
+      prop_group :katello_basic_props, Katello::Model, meta: { friendly_name: 'Content View Version' }
+      property :version, String, desc: 'Returns version of this content view'
+    end
     class Jail < ::Safemode::Jail
       allow :name, :label, :version
     end

data/app/models/katello/erratum.rb

@@ -161,6 +161,19 @@ module Katello
       { :conditions => conditions }
     end
 
+    apipie :class, desc: "A class representing #{model_name.human} object" do
+      name 'Erratum'
+      refs 'Erratum'
+      sections only: %w[all additional]
+      property :errata_id, String, desc: 'Returns errata identifier, e.g. "RHSA-1999-1231"'
+      property :errata_type, String, desc: 'Returns errata type, e.g. "security"'
+      property :issued, Date, desc: 'Returns the date of issue for the errata'
+      property :created_at, ActiveSupport::TimeWithZone, desc: 'Returns the time when the errata was created'
+      property :severity, String, desc: 'Returns severity of the errata, e.g. "Critical"'
+      property :package_names, array_of: String, desc: 'Returns names of packages the errata can be applied to'
+      property :cves, array_of: 'ErratumCve', desc: 'Returns CVEs associated with the errata'
+      property :reboot_suggested, one_of: [true, false], desc: 'Returns true if reboot is suggested after errata applying, false otherwise'
+    end
     class Jail < ::Safemode::Jail
       allow :errata_id, :errata_type, :issued, :created_at, :severity, :package_names, :cves, :reboot_suggested
     end

data/app/models/katello/erratum_cve.rb

@@ -2,6 +2,14 @@ module Katello
   class ErratumCve < Katello::Model
     belongs_to :erratum, :inverse_of => :cves, :class_name => 'Katello::Erratum'
 
+    apipie :class, desc: 'A class representing Erratum CVE object' do
+      name 'Erratum CVE'
+      refs 'ErratumCve'
+      sections only: %w[all additional]
+      property :erratum, 'Erratum', desc: 'Returns Erratum object associated with this CVE'
+      property :cve_id, String, desc: 'Returns CVE identifier, e.g. "CVE-2223-0322"'
+      property :href, String, desc: 'Returns link to the CVE, e.g. https://www.redhat.com/security/data/cve/CVE-2233-0322.html'
+    end
     class Jail < ::Safemode::Jail
       allow :erratum, :cve_id, :href
     end

data/app/models/katello/glue/pulp/repo.rb

@@ -367,7 +367,7 @@ module Katello
       pulp_uri = URI.parse(smart_proxy ? smart_proxy.url : SETTINGS[:katello][:pulp][:url])
       scheme   = (self.unprotected && !force_https) ? 'http' : 'https'
       if docker?
-        "#{pulp_uri.host.downcase}/#{container_repository_name}"
+        "#{pulp_uri.host.downcase}:#{Setting['pulp_docker_registry_port']}/#{container_repository_name}"
       elsif file?
         "#{scheme}://#{pulp_uri.host.downcase}/pulp/isos/#{relative_path}/"
       elsif puppet?

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

@@ -126,7 +126,6 @@ module Katello
         ::Katello::Applicability::ApplicableContentHelper.new(self, ::Katello::Erratum, bound_repos).calculate_and_import
         ::Katello::Applicability::ApplicableContentHelper.new(self, ::Katello::ModuleStream, bound_repos).calculate_and_import
         update_applicability_counts
-        self.update_errata_status
       end
 
       def import_applicability(partial = false)
@@ -253,6 +252,24 @@ module Katello
         facet_attributes
       end
 
+      apipie :class, desc: "A class representing #{model_name.human} object" do
+        name 'Content Facet'
+        refs 'ContentFacet'
+        sections only: %w[all additional]
+        property :id, Integer, desc: 'Returns ID of the facet'
+        property :uuid, String, desc: 'Returns UUID of the facet'
+        property :applicable_module_stream_count, Integer, desc: 'Returns applicable Module Stream count'
+        property :upgradable_module_stream_count, Integer, desc: 'Returns upgradable Module Stream count'
+        property :applicable_rpm_count, Integer, desc: 'Returns applicable RPM count'
+        property :upgradable_rpm_count, Integer, desc: 'Returns upgradable RPM count'
+        property :content_source, 'SmartProxy', desc: 'Returns Smart Proxy object as the content source'
+        prop_group :katello_idname_props, Katello::Model, meta: { resource: 'content_source' }
+        prop_group :katello_idname_props, Katello::Model, meta: { resource: 'content_view' }
+        property :errata_counts, Hash, desc: 'Returns key=value object with errata counts, e.g. {security: 0, bugfix: 0, enhancement: 0, total: 0}'
+        property :kickstart_repository, 'Repository', desc: 'Returns Kickstart repository object'
+        prop_group :katello_idname_props, Katello::Model, meta: { resource: 'kickstart_repository' }
+        prop_group :katello_idname_props, Katello::Model, meta: { resource: 'lifecycle_environment' }
+      end
       class Jail < ::Safemode::Jail
         allow :applicable_module_stream_count, :applicable_rpm_count, :content_source, :content_source_id, :content_source_name, :content_view_id,
               :content_view_name, :errata_counts, :id, :kickstart_repository, :kickstart_repository_id, :kickstart_repository_name,

data/app/models/katello/host_collection.rb

@@ -102,6 +102,12 @@ module Katello
       _("Host Collections")
     end
 
+    apipie :class, desc: "A class representing #{model_name.human} object" do
+      name 'Host Collection'
+      refs 'HostCollection'
+      sections only: %w[all additional]
+      property :name, String, desc: 'Returns name of the host collection'
+    end
     class Jail < ::Safemode::Jail
       allow :name
     end

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

@@ -0,0 +1,18 @@
+module Katello
+  module Hostgroup
+    class ContentFacet < Katello::Model
+      audited :associated_with => :lifecycle_environment
+      self.table_name = 'katello_hostgroup_content_facets'
+      include Facets::HostgroupFacet
+
+      belongs_to :kickstart_repository, :class_name => "::Katello::Repository", :foreign_key => :kickstart_repository_id, :inverse_of => :kickstart_hostgroup_content_facets
+      belongs_to :content_view, :inverse_of => :hostgroup_content_facets, :class_name => "Katello::ContentView"
+      belongs_to :lifecycle_environment, :inverse_of => :hostgroup_content_facets, :class_name => "Katello::KTEnvironment"
+      belongs_to :content_source, :class_name => "::SmartProxy", :foreign_key => :content_source_id, :inverse_of => :hostgroup_content_facets
+
+      validates_with Katello::Validators::ContentViewEnvironmentValidator
+      validates_with Katello::Validators::HostgroupKickstartRepositoryValidator
+      validates_with ::AssociationExistsValidator, attributes: [:content_source]
+    end
+  end
+end

data/app/models/katello/installed_package.rb

@@ -1,5 +1,13 @@
 module Katello
   class InstalledPackage < Katello::Model
+    apipie :class, desc: "A class representing #{model_name.human} object" do
+      name 'Installed Package'
+      refs 'InstalledPackage'
+      sections only: %w[all additional]
+      property :name, String, desc: 'Returns name of the package'
+      property :nvra, String, desc: 'Returns package name with version, release and architecture'
+      property :nvrea, String, desc: 'Returns package name with version, release, epoch and architecture'
+    end
     class Jail < Safemode::Jail
       allow :nvra, :nvrea, :name
     end

data/app/models/katello/kt_environment.rb

@@ -31,8 +31,10 @@ module Katello
                           :inverse_of => :lifecycle_environment, :dependent => :restrict_with_exception
     has_many :hosts,      :class_name => "::Host::Managed", :through => :content_facets,
                           :inverse_of => :lifecycle_environment
-    has_many :hostgroups, :class_name => "::Hostgroup",     :foreign_key => :lifecycle_environment_id,
+    has_many :hostgroup_content_facets, :class_name => "Katello::Hostgroup::ContentFacet", :foreign_key => :lifecycle_environment_id,
                           :inverse_of => :lifecycle_environment, :dependent => :restrict_with_exception
+    has_many :hostgroups, :class_name => "::Hostgroup", :through => :hostgroup_content_facets,
+                          :inverse_of => :lifecycle_environment
 
     scope :completer_scope, ->(options = nil) { where('organization_id = ?', options[:organization_id]) if options[:organization_id].present? }
     scope :non_library, -> { where(library: false) }
@@ -259,6 +261,12 @@ module Katello
       'lifecycle_environments'
     end
 
+    apipie :class, desc: "A class representing #{model_name.human} object" do
+      name 'Katello Environment'
+      refs 'KTEnvironment'
+      sections only: %w[all additional]
+      prop_group :katello_basic_props, Katello::Model, meta: { friendly_name: 'Katello Environment' }
+    end
     class Jail < ::Safemode::Jail
       allow :name, :label
     end

data/app/models/katello/model.rb

@@ -3,6 +3,22 @@ module Katello
     include ActiveModel::ForbiddenAttributesProtection
     self.abstract_class = true
 
+    apipie :prop_group, name: :katello_basic_props do
+      meta_example = ", e.g. #{@meta[:example]}" if @meta[:example]
+      name_desc = @meta[:name_desc] || "Name of the #{@meta[:friendly_name] || @meta[:class_scope]}#{meta_example}"
+      property :name, String, desc: name_desc
+      property :label, String, desc: "Label of the #{@meta[:friendly_name] || @meta[:class_scope]}"
+    end
+
+    apipie :prop_group, name: :katello_idname_props do
+      if @meta[:resource]
+        resource = @meta[:resource].humanize(capitalize: false)
+        prefix = "#{resource}_"
+      end
+      property "#{prefix}id".to_sym, Integer, desc: "Returns ID of the #{@meta[:friendly_name] || resource}"
+      property "#{prefix}name".to_sym, String, desc: "Returns name of the #{@meta[:friendly_name] || resource}"
+    end
+
     def destroy!
       unless destroy
         fail self.errors.full_messages.join('; ')