katello 3.4.5 → 3.5.0.rc1

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

@@ -14,7 +14,7 @@ timezone --utc <%= @host.params['time-zone'] || 'UTC' %>
 <% dhcp = !@static -%>
 <% end -%>
 
-network --bootproto <%= dhcp ? 'dhcp' : "static --ip=#{@host.ip} --netmask=#{subnet.mask} --gateway=#{subnet.gateway} --nameserver=#{[subnet.dns_primary, subnet.dns_secondary].select(&:present?).join(',')}" %> --hostname <%= @host %><%= " --device=#{@host.mac}" -%>
+network --bootproto <%= dhcp ? 'dhcp' : "static --ip=#{@host.ip} --netmask=#{subnet.mask} --gateway=#{subnet.gateway} --nameserver=#{[subnet.dns_primary, subnet.dns_secondary].select{ |item| item.present? }.join(',')}" %> --hostname <%= @host %><%= " --device=#{@host.mac}" -%>
 
 # Partition table should create /boot and a volume atomicos
 <% if @dynamic -%>

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

@@ -35,7 +35,7 @@ skipx
 <% dhcp = !@static -%>
 <% end -%>
 
-network --bootproto <%= dhcp ? 'dhcp' : "static --ip=#{@host.ip} --netmask=#{subnet.mask} --gateway=#{subnet.gateway} --nameserver=#{[subnet.dns_primary, subnet.dns_secondary].select(&:present?).join(',')}" %> --hostname <%= @host %><%= os_major >= 6 ? " --device=#{@host.mac}" : '' -%>
+network --bootproto <%= dhcp ? 'dhcp' : "static --ip=#{@host.ip} --netmask=#{subnet.mask} --gateway=#{subnet.gateway} --nameserver=#{[subnet.dns_primary, subnet.dns_secondary].select{ |item| item.present? }.join(',')}" %> --hostname <%= @host %><%= os_major >= 6 ? " --device=#{@host.mac}" : '' -%>
 
 rootpw --iscrypted <%= root_pass %>
 firewall --<%= os_major >= 6 ? 'service=' : '' %>ssh

data/app/views/katello/api/v2/common/_org_reference.json.rabl

@@ -1,3 +1,4 @@
+attribute :organization_id
 child :organization => :organization do |_r|
   attribute :name
   attribute :label

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

@@ -2,7 +2,9 @@ attributes :id, :uuid
 attributes :content_view_id, :content_view_name
 attributes :lifecycle_environment_id, :lifecycle_environment_name
 attributes :content_source_id, :content_source_name
-attributes :kickstart_repository_id
+attributes :kickstart_repository_id, :errata_counts
+attributes :applicable_rpm_count => :applicable_package_count
+attributes :upgradable_rpm_count => :upgradable_package_count
 
 child :content_view => :content_view do
   attributes :id, :name
@@ -15,16 +17,3 @@ end
 child :content_source => :content_source do
   attributes :id, :name, :url
 end
-
-node :errata_counts do |content_facet|
-  errata = content_facet.installable_errata
-  partial('katello/api/v2/errata/counts', :object => Katello::RelationPresenter.new(errata))
-end
-
-node :applicable_package_count do |facet|
-  facet.applicable_rpms.count
-end
-
-node :upgradable_package_count do |facet|
-  facet.installable_rpms.count
-end

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

@@ -13,7 +13,7 @@ attributes :gpg_key_id
 attributes :available_content => :available_content, :if => params[:include_available_content]
 
 child :sync_plan do
-  attributes :name, :description, :sync_date, :interval, :next_sync
+  attributes :id, :name, :description, :sync_date, :interval, :next_sync
 end
 
 node :repository_count do |product|

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

@@ -2,7 +2,7 @@ object @resource
 
 extends 'katello/api/v2/common/identifier'
 
-attributes :content_type, :url, :relative_path
+attributes :content_type, :url, :relative_path, :arch
 attributes :pulp_id => :backend_identifier
 
 child :product do |_product|

data/app/views/katello/api/v2/repository_sets/show.json.rabl

@@ -4,7 +4,14 @@ object @resource
 
 glue :content do
   extends 'katello/api/v2/common/identifier'
-  attributes :type, :updated, :vendor, :gpgUrl, :contentUrl
+  attributes :type, :updated, :vendor, :gpgUrl, :contentUrl, :label
+end
+attribute :enabled
+
+if @resource.product
+  child :product => :product do
+    attributes :id, :name
+  end
 end
 
 child @resource.repositories => :repositories do

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

@@ -16,10 +16,3 @@ attributes :name => :product_name
 attributes :unmapped_guest
 attributes :virt_only
 attributes :virt_who
-
-node :host, :if => lambda { |sub| sub && sub.hypervisor } do |subscription|
-  {
-    id: subscription.hypervisor.id,
-    name: subscription.hypervisor.name
-  }
-end

data/app/views/katello/api/v2/subscriptions/show.json.rabl

@@ -6,49 +6,16 @@ attributes :arch
 attributes :description
 attributes :support_type
 
+node(:host_count) do |subscription|
+  subscription.hosts.count
+end
+
 node :provided_products, :if => lambda { |sub| sub && !sub.products.blank? } do |subscription|
   subscription.products.map do |product|
     {id: product[:id], name: product[:name]}
   end
 end
 
-node :systems do |subscription|
-  subscription.hosts.map do |host|
-    facts = host.facts
-    {
-      uuid: host.subscription_facet.try(:uuid),
-      host_id: host.id,
-      name: host.name,
-      environment: { id: host.content_facet.try(:lifecycle_environment).try(:id),
-                     name: host.content_facet.try(:lifecycle_environment).try(:name) },
-      content_view: { id: host.content_facet.try(:content_view).try(:id),
-                      name: host.content_facet.try(:content_view).try(:name) },
-      created: host.subscription_facet.try(:registered_at),
-      checkin_time: host.subscription_facet.try(:last_checkin),
-      entitlement_status: host.subscription_status,
-      service_level: host.subscription_facet.try(:service_level),
-      autoheal: host.subscription_facet.try(:autoheal),
-      facts: {
-        dmi: {
-          memory: {
-            size: facts['dmi::memory::size']
-          }
-        },
-        memory: {
-          memtotal: facts['memory::memtotal']
-        },
-        cpu: {
-          'cpu_socket(s)' => facts['cpu::cpu_socket(s)'],
-          'core(s)_per_socket' => facts['cpu::core(s)_per_socket']
-        },
-        virt: {
-          is_guest: facts['virt::is_guest']
-        }
-      }
-    }
-  end
-end
-
 node :activation_keys do |subscription|
   subscription.activation_keys.readable.map do |key|
     {

data/config/routes/overrides.rb

@@ -23,6 +23,7 @@ Foreman::Application.routes.draw do
 
   resources :hosts, :only => [] do
     get 'puppet_environment_for_content_view', :on => :collection
+    get :content_hosts, :on => :collection
   end
 
   resources :smart_proxies, :only => [] do

data/db/migrate/20140422000001_update_products_add_organization.rb

@@ -1,5 +1,5 @@
 class UpdateProductsAddOrganization < ActiveRecord::Migration
-  class Katello::Product < ActiveRecord::Base
+  class Katello::Product < ApplicationRecord
     belongs_to :provider
     self.inheritance_column = nil
   end

data/db/migrate/20140610154745_content_view_puppet_environment_id.rb

@@ -1,5 +1,5 @@
 class ContentViewPuppetEnvironmentId < ActiveRecord::Migration
-  class ::Environment < ActiveRecord::Base
+  class ::Environment < ApplicationRecord
     def self.find_by_katello_id(org, env, content_view)
       katello_id = Environment.construct_katello_id(org, env, content_view)
       Environment.where(:katello_id => katello_id).first

data/db/migrate/20140626204657_add_unlimited_to_activation_keys.rb

@@ -1,5 +1,5 @@
 class AddUnlimitedToActivationKeys < ActiveRecord::Migration
-  class ::Katello::ActivationKeys < ActiveRecord::Base
+  class ::Katello::ActivationKeys < ApplicationRecord
   end
 
   def up

data/db/migrate/20140626204902_add_unlimited_to_host_collection.rb

@@ -1,5 +1,5 @@
 class AddUnlimitedToHostCollection < ActiveRecord::Migration
-  class ::Katello::HostCollections < ActiveRecord::Base
+  class ::Katello::HostCollections < ApplicationRecord
   end
 
   def up

data/db/migrate/20141209103005_disown_foreman_templates.rb

@@ -1,5 +1,5 @@
 class DisownForemanTemplates < ActiveRecord::Migration
-  class FakeConfigTemplate < ActiveRecord::Base
+  class FakeConfigTemplate < ApplicationRecord
     if ActiveRecord::Base.connection.table_exists?('config_templates')
       self.table_name = 'config_templates'
     else

data/db/migrate/20150901213759_remove_distributors.rb

@@ -1,5 +1,5 @@
 class RemoveDistributors < ActiveRecord::Migration
-  class Katello::Distributor < ActiveRecord::Base
+  class Katello::Distributor < ApplicationRecord
     self.table_name = 'katello_distributors'
   end
 

data/db/migrate/20150908222711_drop_marketing_engineering_products.rb

@@ -1,5 +1,5 @@
 class DropMarketingEngineeringProducts < ActiveRecord::Migration
-  class Katello::MarketingProduct < ActiveRecord::Base
+  class Katello::MarketingProduct < ApplicationRecord
     self.table_name = "katello_products"
   end
 

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -1,7 +1,7 @@
 class MigrateContentHosts < ActiveRecord::Migration
   HYPERVISOR_CLASS = 'Katello::Hypervisor'.freeze
 
-  class Location < ActiveRecord::Base
+  class Location < ApplicationRecord
     self.table_name = "taxonomies"
 
     def self.default_location
@@ -10,20 +10,20 @@ class MigrateContentHosts < ActiveRecord::Migration
     end
   end
 
-  class Organization < ActiveRecord::Base
+  class Organization < ApplicationRecord
     self.table_name = "taxonomies"
 
     has_many :kt_environments, :class_name => "MigrateContentHosts::KTEnvironment",
              :dependent => :restrict_with_exception, :inverse_of => :organization
   end
 
-  class SmartProxy < ActiveRecord::Base
+  class SmartProxy < ApplicationRecord
     self.table_name = "smart_proxies"
 
     belongs_to :content_host, :class_name => "MigrateContentHosts::System", :inverse_of => :capsule
   end
 
-  class KTEnvironment < ActiveRecord::Base
+  class KTEnvironment < ApplicationRecord
     self.table_name = "katello_environments"
 
     belongs_to :organization, :class_name => "MigrateContentHosts::Organization", :inverse_of => :kt_environments
@@ -34,7 +34,7 @@ class MigrateContentHosts < ActiveRecord::Migration
              :dependent => :restrict_with_exception, :foreign_key => :environment_id
   end
 
-  class ContentView < ActiveRecord::Base
+  class ContentView < ApplicationRecord
     self.table_name = "katello_content_views"
 
     has_many :systems, :class_name => "MigrateContentHosts::System", :dependent => :restrict_with_exception
@@ -42,7 +42,7 @@ class MigrateContentHosts < ActiveRecord::Migration
              :inverse_of => :content_view, :dependent => :restrict_with_exception
   end
 
-  class Repository < ActiveRecord::Base
+  class Repository < ApplicationRecord
     self.table_name = "katello_repositories"
 
     has_many :content_facet_repositories, :class_name => "MigrateContentHosts::ContentFacetRepository", :dependent => :destroy
@@ -52,41 +52,41 @@ class MigrateContentHosts < ActiveRecord::Migration
     has_many :systems, :through => :system_repositories
   end
 
-  class SystemRepository < ActiveRecord::Base
+  class SystemRepository < ApplicationRecord
     self.table_name = "katello_system_repositories"
     belongs_to :system, :inverse_of => :system_repositories, :class_name => 'MigrateContentHosts::System'
     belongs_to :repository, :inverse_of => :system_repositories, :class_name => 'MigrateContentHosts::Repository'
   end
 
-  class HostCollection < ActiveRecord::Base
+  class HostCollection < ApplicationRecord
     self.table_name = "katello_host_collection"
 
     has_many :system_host_collections, :class_name => "MigrateContentHosts::SystemHostCollection", :dependent => :destroy
     has_many :systems, :through => :system_host_collections, :class_name => "MigrateContentHosts::System"
   end
 
-  class SystemHostCollections < ActiveRecord::Base
+  class SystemHostCollections < ApplicationRecord
     self.table_name = "katello_system_host_collections"
 
     belongs_to :system, :inverse_of => :system_host_collections, :class_name => 'MigrateContentHosts::System'
     belongs_to :host_collection, :inverse_of => :system_host_collections
   end
 
-  class Erratum < ActiveRecord::Base
+  class Erratum < ApplicationRecord
     self.table_name = "katello_errata"
 
     has_many :systems_applicable, :through => :system_errata, :class_name => "MigrateContentHosts::System", :source => :system
     has_many :content_facet_errata, :class_name => "MigrateContentHosts::ContentFacetErratum", :source => :erratum
   end
 
-  class SystemErratum < ActiveRecord::Base
+  class SystemErratum < ApplicationRecord
     self.table_name = "katello_system_errata"
 
     belongs_to :system, :inverse_of => :system_errata, :class_name => 'MigrateContentHosts::System'
     belongs_to :erratum, :inverse_of => :system_errata, :class_name => 'MigrateContentHosts::Erratum'
   end
 
-  class ActivationKey < ActiveRecord::Base
+  class ActivationKey < ApplicationRecord
     self.table_name = "katello_activation_keys"
 
     has_many :system_activation_keys, :class_name => "MigrateContentHosts::SystemActivationKey", :dependent => :destroy
@@ -94,14 +94,14 @@ class MigrateContentHosts < ActiveRecord::Migration
     has_many :subscription_facets, :through => :subscription_facet_activation_keys
   end
 
-  class SystemActivationKey < ActiveRecord::Base
+  class SystemActivationKey < ApplicationRecord
     self.table_name = "katello_system_activation_keys"
 
     belongs_to :system, :inverse_of => :system_activation_keys
     belongs_to :activation_key, :inverse_of => :system_activation_keys
   end
 
-  class Host < ActiveRecord::Base
+  class Host < ApplicationRecord
     self.table_name = "hosts"
     self.inheritance_column = nil
 
@@ -112,7 +112,7 @@ class MigrateContentHosts < ActiveRecord::Migration
     belongs_to :location, :class_name => "MigrateContentHosts::Location"
   end
 
-  class System < ActiveRecord::Base
+  class System < ApplicationRecord
     self.table_name = "katello_systems"
     self.inheritance_column = nil
 
@@ -139,7 +139,7 @@ class MigrateContentHosts < ActiveRecord::Migration
     has_one :capsule, :class_name => "MigrateContentHosts::SmartProxy", :inverse_of => :content_host, :foreign_key => :content_host_id, :dependent => :nullify
   end
 
-  class ContentFacet < ActiveRecord::Base
+  class ContentFacet < ApplicationRecord
     self.table_name = "katello_content_facets"
 
     belongs_to :host, :inverse_of => :content_facet, :class_name => "MigrateContentHosts::Host"
@@ -152,21 +152,21 @@ class MigrateContentHosts < ActiveRecord::Migration
     has_many :content_facet_errata, :class_name => "MigrateContentHosts::ContentFacetErratum", :dependent => :destroy, :inverse_of => :content_facet
   end
 
-  class ContentFacetRepository < ActiveRecord::Base
+  class ContentFacetRepository < ApplicationRecord
     self.table_name = "katello_content_facet_repositories"
 
     belongs_to :content_facet, :inverse_of => :content_facet_repositories, :class_name => 'MigrateContentHosts::ContentFacet'
     belongs_to :repository, :inverse_of => :content_facet_repositories, :class_name => 'MigrateContentHosts::Repository'
   end
 
-  class ContentFacetErratum < ActiveRecord::Base
+  class ContentFacetErratum < ApplicationRecord
     self.table_name = "katello_content_facet_errata"
 
     belongs_to :content_facet, :inverse_of => :content_facet_errata, :class_name => 'MigrateContentHosts::ContentFacet'
     belongs_to :erratum, :inverse_of => :content_facet_errata, :class_name => 'MigrateContentHosts::Erratum'
   end
 
-  class SubscriptionFacet < ActiveRecord::Base
+  class SubscriptionFacet < ApplicationRecord
     self.table_name = "katello_subscription_facets"
 
     belongs_to :host, :inverse_of => :subscription_facet, :class_name => "MigrateContentHosts::Host"
@@ -174,7 +174,7 @@ class MigrateContentHosts < ActiveRecord::Migration
     has_many :subscription_facet_activation_keys, :class_name => "MigrateContentHosts::SubscriptionFacetActivationKey", :dependent => :destroy, :inverse_of => :subscription_facet
   end
 
-  class SubscriptionFacetActivationKey < ActiveRecord::Base
+  class SubscriptionFacetActivationKey < ApplicationRecord
     self.table_name = "katello_subscription_facet_activation_keys"
 
     belongs_to :subscription_facet, :inverse_of => :subscription_facet_activation_keys, :class_name => 'MigrateContentHosts::SubscriptionFacet'

data/db/migrate/20151014144004_host_collection_to_hosts.rb

@@ -1,21 +1,21 @@
 class HostCollectionToHosts < ActiveRecord::Migration
-  class Host < ActiveRecord::Base
+  class Host < ApplicationRecord
     self.table_name = "hosts"
   end
 
-  class System < ActiveRecord::Base
+  class System < ApplicationRecord
     self.table_name = "katello_systems"
   end
 
-  class HostCollection < ActiveRecord::Base
+  class HostCollection < ApplicationRecord
     self.table_name = "katello_host_collections"
   end
 
-  class SystemHostCollections < ActiveRecord::Base
+  class SystemHostCollections < ApplicationRecord
     self.table_name = "katello_system_host_collections"
   end
 
-  class HostCollectionHosts < ActiveRecord::Base
+  class HostCollectionHosts < ApplicationRecord
     self.table_name = "katello_host_collection_hosts"
   end
 

data/db/migrate/20160114200145_add_mirror_on_sync_to_repositories.rb

@@ -1,5 +1,5 @@
 class AddMirrorOnSyncToRepositories < ActiveRecord::Migration
-  class RepositoryMirrorOnSync < ActiveRecord::Base
+  class RepositoryMirrorOnSync < ApplicationRecord
     self.table_name = "katello_repositories"
   end
   def change

data/db/migrate/20160131182301_add_download_policy_to_katello_repositories.rb

@@ -1,5 +1,5 @@
 class AddDownloadPolicyToKatelloRepositories < ActiveRecord::Migration
-  class DownloadPolicyRepository < ActiveRecord::Base
+  class DownloadPolicyRepository < ApplicationRecord
     self.table_name = "katello_repositories"
   end
   def change

data/db/migrate/20160222143432_move_system_description_to_host.rb

@@ -1,9 +1,9 @@
 class MoveSystemDescriptionToHost < ActiveRecord::Migration
-  class Host < ActiveRecord::Base
+  class Host < ApplicationRecord
     self.table_name = "hosts"
   end
 
-  class System < ActiveRecord::Base
+  class System < ApplicationRecord
     self.table_name = "katello_systems"
   end
 

data/db/migrate/20160404132250_remove_katello_from_notification_name.rb

@@ -1,5 +1,5 @@
 class RemoveKatelloFromNotificationName < ActiveRecord::Migration
-  class FakeMailNotification < ActiveRecord::Base
+  class FakeMailNotification < ApplicationRecord
     self.table_name = 'mail_notifications'
   end