katello 3.0.2 → 3.1.0.rc1

data/app/models/katello/pulp_sync_status.rb

@@ -107,13 +107,13 @@ end
 
 module Katello
   class PulpSyncStatus < PulpTaskStatus
-    HISTORY_ERROR = 'failed'
-    HISTORY_SUCCESS = 'success'
-    FINISHED  = "finished"
-    ERROR     = "error"
-    RUNNING   = "running"
-    WAITING   = "waiting"
-    CANCELED  = "canceled"
+    HISTORY_ERROR = 'failed'.freeze
+    HISTORY_SUCCESS = 'success'.freeze
+    FINISHED  = "finished".freeze
+    ERROR     = "error".freeze
+    RUNNING   = "running".freeze
+    WAITING   = "waiting".freeze
+    CANCELED  = "canceled".freeze
 
     class Status < TaskStatus::Status
       NOT_SYNCED = :not_synced

data/app/models/katello/pulp_task_status.rb

@@ -1,6 +1,6 @@
 module Katello
   class PulpTaskStatus < TaskStatus
-    WAIT_TIMES = [0.5, 1, 2, 4, 8, 16]
+    WAIT_TIMES = [0.5, 1, 2, 4, 8, 16].freeze
     WAIT_TIME_STEP = 5
 
     validates_lengths_from_database

data/app/models/katello/repository.rb

@@ -17,13 +17,13 @@ module Katello
     include Ext::LabelFromName
     include Katello::Engine.routes.url_helpers
 
-    YUM_TYPE = 'yum'
-    FILE_TYPE = 'file'
-    PUPPET_TYPE = 'puppet'
-    DOCKER_TYPE = 'docker'
-    OSTREE_TYPE = 'ostree'
+    YUM_TYPE = 'yum'.freeze
+    FILE_TYPE = 'file'.freeze
+    PUPPET_TYPE = 'puppet'.freeze
+    DOCKER_TYPE = 'docker'.freeze
+    OSTREE_TYPE = 'ostree'.freeze
 
-    CHECKSUM_TYPES = %w(sha1 sha256)
+    CHECKSUM_TYPES = %w(sha1 sha256).freeze
 
     belongs_to :environment, :inverse_of => :repositories, :class_name => "Katello::KTEnvironment"
     belongs_to :product, :inverse_of => :repositories

data/app/models/katello/rhsm_fact_parser.rb

@@ -27,15 +27,6 @@ module Katello
       }
     end
 
-    def interfaces
-      virtual_interface_regexp = /\A([^.]*?)\.(\d+)\z/
-      super.tap do |interfaces|
-        interfaces.each do |name, attributes|
-          attributes[:virtual] = true if name =~ virtual_interface_regexp
-        end
-      end
-    end
-
     # rubocop:disable Style/AccessorMethodName:
     def get_interfaces
       mac_keys = facts.keys.select { |f| f =~ /net\.interface\..*\.mac_address/ }

data/app/models/katello/sync_plan.rb

@@ -8,11 +8,11 @@ module Katello
     include Katello::Authorization::SyncPlan
     include ForemanTasks::Concerns::ActionSubject
 
-    HOURLY = 'hourly'
-    DAILY = 'daily'
-    WEEKLY = 'weekly'
-    TYPES = [HOURLY, DAILY, WEEKLY]
-    DURATION = {HOURLY => 'T1H', DAILY => 'T24H', WEEKLY => '7D' }
+    HOURLY = 'hourly'.freeze
+    DAILY = 'daily'.freeze
+    WEEKLY = 'weekly'.freeze
+    TYPES = [HOURLY, DAILY, WEEKLY].freeze
+    DURATION = {HOURLY => 'T1H', DAILY => 'T24H', WEEKLY => '7D' }.freeze
     WEEK_DAYS = (%w(Sunday Monday Tuesday Wednesday Thursday Friday)).collect { |d| N_(d) }
 
     belongs_to :organization, :inverse_of => :sync_plans
@@ -34,28 +34,20 @@ module Katello
       errors.add :base, _("Start Date and Time can't be blank") if self.sync_date.nil?
     end
 
-    def zone_converted
-      #convert time to local timezone
-      self.sync_date.localtime.to_datetime
-    end
-
     def plan_day
       WEEK_DAYS[self.sync_date.strftime('%A').to_i]
     end
 
-    def plan_date(localtime = true)
-      date_obj = localtime ? self.zone_converted : self.sync_date
-      date_obj.strftime('%m/%d/%Y')
+    def plan_date
+      self.sync_date.strftime('%m/%d/%Y')
     end
 
-    def plan_time(localtime = true)
-      date_obj = localtime ? self.zone_converted : self.sync_date
-      date_obj.strftime('%I:%M %p')
+    def plan_time
+      self.sync_date.strftime('%I:%M %p')
     end
 
-    def plan_date_time(localtime = true)
-      date_obj = localtime ? self.zone_converted : self.sync_date
-      date_obj.strftime('%m/%d/%Y %I:%M:%p')
+    def plan_date_time
+      self.sync_date.strftime('%Y/%m/%d %H:%M:%S %Z')
     end
 
     def schedule_format
@@ -77,8 +69,7 @@ module Katello
 
     def next_sync
       return nil unless self.enabled
-
-      now = Time.now.utc
+      now = Time.current
       next_sync = self.sync_date
 
       if self.sync_date < now
@@ -107,6 +98,8 @@ module Katello
                                  :sec => self.sync_date.sec).advance(:days => days)
         end
       end
+
+      next_sync = next_sync.strftime('%Y/%m/%d %H:%M:%S %Z') if next_sync
       next_sync
     end
 

data/app/models/katello/system.rb

@@ -28,12 +28,6 @@ module Katello
 
     belongs_to :content_view, :inverse_of => :systems
 
-    has_one :capsule,
-            :class_name => "::SmartProxy",
-            :inverse_of => :content_host,
-            :foreign_key => :content_host_id,
-            :dependent => :nullify
-
     validates_lengths_from_database
     before_validation :set_default_content_view, :unless => :persisted?
     validates :environment, :presence => true
@@ -228,8 +222,6 @@ module Katello
       self.products.flat_map(&:available_content)
     end
 
-    private
-
     def self.search_host_collections(_key, operator, value)
       conditions = sanitize_sql_for_conditions(["#{Katello::HostCollection.table_name}.name #{operator} '#{value}'"])
       systems_matching_query = Katello::System.joins("INNER JOIN #{Katello::HostCollectionHosts.table_name} ON \
@@ -261,6 +253,12 @@ module Katello
       casted
     end
 
+    def self.humanize_class_name(_name = nil)
+      _('Content Host')
+    end
+
+    private
+
     def refresh_running_tasks
       ids = self.task_statuses.where(:state => [:waiting, :running]).pluck(:id)
       TaskStatus.refresh(ids)
@@ -281,9 +279,5 @@ module Katello
     def collect_installed_product_names
       self.installedProducts ? self.installedProducts.map { |p| p[:productName] } : []
     end
-
-    def self.humanize_class_name(_name = nil)
-      _('Content Host')
-    end
   end
 end

data/app/models/katello/task_status.rb

@@ -26,11 +26,6 @@ module Katello
     # needed to delete providers w/ task status
     has_one :provider, :class_name => "Katello::Provider", :dependent => :nullify
 
-    # a task may be optionally associated with a job, but it is not required
-    # an example scenario would be a job that is created by performing an action on a system group
-    has_one :job_task,  :class_name => "Katello::JobTask", :dependent => :destroy
-    has_one :job, :through => :job_task
-
     validates_lengths_from_database
     before_save :setup_task_type
 
@@ -60,8 +55,6 @@ module Katello
       end
     end
 
-    after_destroy :destroy_job
-
     def initialize(attrs = nil, _options = {})
       unless attrs.nil?
         # only keep keys for which we have db columns
@@ -160,21 +153,21 @@ module Katello
         if p.length == 1
           return p.first
         else
-          return  _("%{package} (%{total} other packages)") % {:package => p.first, :total => p.length - 1}
+          return _("%{package} (%{total} other packages)") % {:package => p.first, :total => p.length - 1}
         end
       when :package_group
         p = self.parameters[:groups]
         if p.length == 1
           return p.first
         else
-          return  _("%{group} (%{total} other package groups)") % {:group => p.first, :total => p.length - 1}
+          return _("%{group} (%{total} other package groups)") % {:group => p.first, :total => p.length - 1}
         end
       when :errata
         p = self.parameters[:errata_ids]
         if p.length == 1
           return p.first
         else
-          return  _("%{errata} (%{total} other errata)") % {:errata => p.first, :total => p.length - 1}
+          return _("%{errata} (%{total} other errata)") % {:errata => p.first, :total => p.length - 1}
         end
       end
     end
@@ -336,20 +329,6 @@ module Katello
       end
     end
 
-    # If the task is associated with a job and this is the last task associated with
-    # the job, destroy the job.
-    def destroy_job
-      # is this task associated with a job?
-      job_id = self.job_task.job_id unless self.job_task.nil?
-      if job_id
-        job = Job.find(job_id)
-        # is this the last task associated with the job?
-        if job && job.task_statuses.length == 0
-          job.destroy
-        end
-      end
-    end
-
     def packages_change_description(data, action)
       ret = []
 

data/app/models/setting/{katello.rb → content.rb}

@@ -1,4 +1,4 @@
-class Setting::Katello < Setting
+class Setting::Content < Setting
   def self.load_defaults
     return unless super
 
@@ -27,8 +27,16 @@ class Setting::Katello < Setting
         self.set('pulp_client_cert', N_("Path for ssl cert used for pulp server auth"), "/etc/pki/katello/certs/pulp-client.crt"),
         self.set('remote_execution_by_default', N_("If set to true, use the remote execution over katello-agent for remote actions"), false),
         self.set('use_pulp_oauth', N_("use oauth authentication for pulp instead of the default cert based authentication"), false)
-      ].each { |s| self.create! s.update(:category => "Setting::Katello") }
+      ].each { |s| self.create! s.update(:category => "Setting::Content") }
     end
     true
   end
 end
+
+# If the database is not migrated yet, the system will not be able to load
+# since setting initializers will try to load old class. Let it have the class and remove it
+# later.
+if Setting.where(category: 'Setting::Katello').count > 0
+  class Setting::Katello < Setting
+  end
+end

data/app/overrides/add_about_page.rb

@@ -3,18 +3,18 @@ Deface::Override.new(:virtual_path => "about/index",
                      :name => "add_system_status_to_about",
                      :insert_bottom => '#about',
                      :partial => 'overrides/about/system_status'
-                     )
+                    )
 
 # Add Installed Packages to About page
 Deface::Override.new(:virtual_path => "about/index",
                      :name => "add_installed_packages_to_about",
                      :insert_bottom => '#about',
                      :partial => 'overrides/about/installed_packages'
-                     )
+                    )
 
 # Add Katello Support information to About page
 Deface::Override.new(:virtual_path => "about/index",
                      :name => "add_support_documentation",
                      :insert_bottom => '.col-md-5 .stats-well:first-child',
                      :partial => 'overrides/about/support_documentation'
-                     )
+                    )

data/app/overrides/add_organization_attributes.rb

@@ -3,13 +3,13 @@ Deface::Override.new(:virtual_path => "taxonomies/_step1",
                      :name => "remove_parent_organization_on_create",
                      :surround => 'erb[loud]:contains("select_f"):contains(":parent")',
                      :text => '<% if taxonomy.is_a?(Location) %><%= render_original %><% end %>'
-                     )
+                    )
 
 Deface::Override.new(:virtual_path => "taxonomies/_form",
                      :name => "remove_parent_organization_on_edit",
                      :surround => 'erb[loud]:contains("select_f"):contains(":parent")',
                      :text => '<% if taxonomy.is_a?(Location) %><%= render_original %><% end %>'
-                     )
+                    )
 
 # Add organization attributes to org creation
 Deface::Override.new(:virtual_path => "taxonomies/_step1",

data/app/overrides/add_subscription_status.rb

@@ -3,4 +3,4 @@ Deface::Override.new(:virtual_path => "hosts/show",
                      :name => "add_system_link_to_host",
                      :insert_bottom => 'td:first',
                      :partial => 'overrides/hosts/subscription_link'
-)
+                    )

data/app/services/katello/candlepin/consumer.rb

@@ -3,14 +3,14 @@ module Katello
     class Consumer
       include LazyAccessor
 
-      ENTITLEMENTS_VALID = 'valid'
-      ENTITLEMENTS_PARTIAL = 'partial'
-      ENTITLEMENTS_INVALID = 'invalid'
-
-      SYSTEM = "system"
-      HYPERVISOR = "hypervisor"
-      CANDLEPIN = "candlepin"
-      CP_TYPES = [SYSTEM, HYPERVISOR, CANDLEPIN]
+      ENTITLEMENTS_VALID = 'valid'.freeze
+      ENTITLEMENTS_PARTIAL = 'partial'.freeze
+      ENTITLEMENTS_INVALID = 'invalid'.freeze
+
+      SYSTEM = "system".freeze
+      HYPERVISOR = "hypervisor".freeze
+      CANDLEPIN = "candlepin".freeze
+      CP_TYPES = [SYSTEM, HYPERVISOR, CANDLEPIN].freeze
 
       lazy_accessor :entitlements, :initializer => lambda { |_s| Resources::Candlepin::Consumer.entitlements(uuid) }
       lazy_accessor :events, :initializer => lambda { |_s| Resources::Candlepin::Consumer.events(uuid) }

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

@@ -54,7 +54,7 @@ module Katello
       def unbind_repo_ids(repo_ids, distributor_type)
         repo_ids.each do |repo_id|
           begin
-            Katello.pulp_server.extensions.consumer.unbind_all(uuid,  repo_id, distributor_type)
+            Katello.pulp_server.extensions.consumer.unbind_all(uuid, repo_id, distributor_type)
           rescue => e
             Rails.logger.error "Failed to unbind repo #{repo_id}: #{e}, #{e.backtrace.join("\n")}"
           end

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

@@ -42,11 +42,11 @@ module Katello
         raise e
       end
 
-      def update_package(packages)
+      def update_package(packages, options = {})
         Rails.logger.debug "Scheduling package update for consumer group #{self.pulp_id}"
 
-        options = {"importkeys" => true}
-        options[:all] = true if packages.blank?
+        options.merge!(:importkeys => true)
+        options[:all] = true if options[:update_all]
         Katello.pulp_server.extensions.consumer_group.update_content(self.pulp_id,
                                                                        'rpm',
                                                                        packages,

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

@@ -1,7 +1,7 @@
 module Katello
   module Pulp
     class DockerManifest < PulpContentUnit
-      CONTENT_TYPE = "docker_manifest"
+      CONTENT_TYPE = "docker_manifest".freeze
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Katello
   module Pulp
     class Erratum < PulpContentUnit
-      CONTENT_TYPE = "erratum"
+      CONTENT_TYPE = "erratum".freeze
 
       def self.unit_handler
         Katello.pulp_server.extensions.errata

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

@@ -1,7 +1,7 @@
 module Katello
   module Pulp
     class OstreeBranch < PulpContentUnit
-      CONTENT_TYPE = "ostree"
+      CONTENT_TYPE = "ostree".freeze
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Katello
     class PackageGroup < PulpContentUnit
       include LazyAccessor
 
-      CONTENT_TYPE = 'package_group'
+      CONTENT_TYPE = 'package_group'.freeze
 
       lazy_accessor :pulp_facts, :initializer => :backend_data
 

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

@@ -3,7 +3,7 @@ module Katello
     class PuppetModule < PulpContentUnit
       include LazyAccessor
 
-      CONTENT_TYPE = "puppet_module"
+      CONTENT_TYPE = "puppet_module".freeze
 
       lazy_accessor :pulp_facts, :initializer => :backend_data
 

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

@@ -3,9 +3,9 @@ module Katello
     class Rpm < PulpContentUnit
       include LazyAccessor
 
-      PULP_SELECT_FIELDS = %w(name epoch version release arch checksumtype checksum)
-      PULP_INDEXED_FIELDS = %w(name version release arch epoch summary sourcerpm checksum filename _id)
-      CONTENT_TYPE = "rpm"
+      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 = "rpm".freeze
 
       lazy_accessor :pulp_facts, :initializer => :backend_data
 

data/app/services/katello/puppet_class_importer_extensions.rb

@@ -6,7 +6,7 @@ module Katello
       included do
         def update_environment
           change_types = %w(new obsolete updated)
-          changed  = self.changes
+          changed = self.changes
 
           change_types.each do |kind|
             changed[kind].slice!(@environment) unless changed[kind].empty?