hammer_cli_katello 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a00c7f5dd067ab0cc8203da1989be46411dc15ed1079442b38bf27e4c1c5eef
-  data.tar.gz: 4088650b9e19e79031e912cfc1f3c49ec11ef448e41c5c97cb41820fe5474bcc
+  metadata.gz: dfdda5a90efeac9e7d47035405683e52b32e23ae72b3a328cdd538f7e88cda8d
+  data.tar.gz: 635453faff97d59d798cd9fab861ef470b046752277ee5d533d34e3729b5b345
 SHA512:
-  metadata.gz: 0b638de29d5f9ebf39fa1962ec41d316f23579c64f9b0bd387bc3bd0323d447368fb9dacf283ea8e10d898e1d2bd4e6956c99f435080f38c835092c154e85f03
-  data.tar.gz: 8c59ab30460634b1098d74933284052ee98492897a04d17358166597fb2d53e2412e521228486b5df37c8d8cb2f254565eb79ccb3cc29e5dfd8cfc9b42b4e399
+  metadata.gz: bd86eedc7a1bdd74530697770c9fd1b028e17f82429a5fa092f4886fa553069ba3c35f3b540d6eefeb72ccb398797c4fe9f97d3a4957742a9e93cc1725c0ecfb
+  data.tar.gz: 06b29a389f4cca7a3165b6dbadb29d7ed4301974b3ff62f299a569c94526adb91a1697ab388e11dd024f734202cb58a5b035cc45e0fba772f25c690d7a8bfd3e

data/lib/hammer_cli_katello/acs.rb

@@ -0,0 +1,79 @@
+module HammerCLIKatello
+  class AcsCommand < HammerCLIKatello::Command
+    resource :alternate_content_sources
+
+    class ListCommand < HammerCLIKatello::ListCommand
+      output do
+        field :id, _('ID')
+        field :name, _('Name')
+        field :alternate_content_source_type, _('Type')
+      end
+
+      build_options
+    end
+
+    class CreateCommand < HammerCLIKatello::CreateCommand
+      success_message _('Alternate Content Source created.')
+      failure_message _('Could not create the Alternate Content Source.')
+
+      build_options
+    end
+
+    class InfoCommand < HammerCLIKatello::InfoCommand
+      output do
+        field :id, _('ID')
+        field :name, _('Name')
+        field :label, _('Label')
+        field :description, _('Description'), Fields::Field, :hide_blank => true
+        field :base_url, _('Base URL')
+        field :content_type, _('Content type')
+        field :alternate_content_source_type, _('Alternate content source type')
+        field :upstream_username, _('Upstream username'), Fields::Field, :hide_blank => true
+
+        collection :subpaths, _('Subpaths') do
+          field nil, _('')
+        end
+
+        collection :smart_proxies, _('Smart proxies') do
+          field :id, _('Id')
+          field :name, _('Name')
+          field :url, _('URL')
+          field :created_at, _('Created at')
+          field :updated_at, _('Updated at')
+          field :expired_logs, _('Expired logs')
+          field :puppet_path, _('Puppet path'), Fields::Field, :hide_blank => true
+          field :download_policy, _('Download policy')
+        end
+      end
+
+      build_options
+    end
+
+    class UpdateCommand < HammerCLIKatello::UpdateCommand
+      success_message _('Alternate Content Source updated.')
+      failure_message _('Could not update the Alternate Content Source.')
+
+      build_options
+    end
+
+    class DeleteCommand < HammerCLIKatello::DeleteCommand
+      success_message _('Alternate Content Source deleted.')
+      failure_message _('Could not delete the Alternate Content Source.')
+
+      build_options
+    end
+
+    class RefreshCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+
+      action :refresh
+      command_name 'refresh'
+
+      success_message _("Alternate content source is being refreshed in task %{id}.")
+      failure_message _('Could not refresh the alternate content source')
+
+      build_options
+    end
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_katello/content_export_complete.rb

@@ -20,6 +20,14 @@ module HammerCLIKatello
       include ContentExportHelper
     end
 
+    class RepositoryCommand < HammerCLIKatello::SingleResourceCommand
+      desc _("Performs a full export of a repository")
+      command_name "repository"
+
+      include HammerCLIForemanTasks::Async
+      include ContentExportHelper
+    end
+
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/content_export_helper.rb

@@ -1,4 +1,5 @@
 require 'hammer_cli_katello/repository'
+
 # rubocop:disable ModuleLength
 module HammerCLIKatello
   module ContentExportHelper
@@ -40,7 +41,8 @@ module HammerCLIKatello
     end
 
     def fetch_export_history(export_history_id)
-      index(:content_exports, :id => export_history_id).first if export_history_id
+      return unless export_history_id
+      index(:content_exports, :id => export_history_id).first
     end
 
     def fetch_export_history_from_task(task)
@@ -48,7 +50,6 @@ module HammerCLIKatello
       if %w(error warning).include?(task['result'])
         raise _("Can not fetch export history from an unfinished task")
       end
-
       export_history_id = task.dig('output', 'export_history_id')
       fetch_export_history(export_history_id)
     end
@@ -72,7 +73,16 @@ module HammerCLIKatello
       self.class.command_name.first.to_sym == :version
     end
 
+    def repository_command?
+      self.class.command_name.first.to_sym == :repository
+    end
+
     def fetch_repositories
+      if repository_command?
+        resp = show(:repositories, id: resolver.repository_id(options))
+        return resp["download_policy"] == "immediate" ? [] : [resp]
+      end
+
       repo_options = {
         library: true,
         content_type: 'yum',
@@ -95,6 +105,10 @@ module HammerCLIKatello
             " Update the download policy and sync affected repositories."\
             " Once synced republish the content view"\
             " and export the generated version.")
+        elsif repository_command?
+          output.print_message _("NOTE: Unable to fully export this repository because"\
+            " it does not have the 'immediate' download policy."\
+            " Update the download policy, sync the repository and export.")
         else
           output.print_message _("NOTE: Unable to fully export this organization's library because"\
             " it contains repositories without the 'immediate' download policy."\
@@ -107,7 +121,7 @@ module HammerCLIKatello
           "--download-policy='immediate'"
         output.print_message ""
         print_record(::HammerCLIKatello::Repository::ListCommand.output_definition, repos)
-        exit(HammerCLI::EX_SOFTWARE) if option_fail_on_missing_content?
+        exit(HammerCLI::EX_SOFTWARE) if repository_command? || option_fail_on_missing_content?
       end
     end
 
@@ -116,6 +130,44 @@ module HammerCLIKatello
         setup_version(base)
       elsif base.command_name.first.to_sym == :library
         setup_library(base)
+      elsif base.command_name.first.to_sym == :repository
+        setup_repository(base)
+      end
+    end
+
+    def self.setup_repository(base)
+      base.action(:repository)
+      base.success_message _("Repository is being exported in task %{id}.")
+      base.failure_message _("Could not export the repository")
+
+      base.option "--name", "NAME", _("Filter repositories by name."),
+                 :attribute_name => :option_name,
+                 :required => false
+
+      base.build_options do |o|
+        o.expand(:all).including(:products, :organizations)
+      end
+
+      base.validate_options do
+        any(:option_id, :option_name).required
+        unless option(:option_id).exist?
+          any(
+            :option_product_id,
+            :option_product_name
+          ).required
+          unless option(:option_product_id).exist?
+            any(:option_organization_id, :option_organization_name, \
+                                :option_organization_label).required
+          end
+        end
+      end
+
+      base.class_eval do
+        def request_params
+          super.tap do |opts|
+            opts["id"] = resolver.repository_id(options)
+          end
+        end
       end
     end
 

data/lib/hammer_cli_katello/content_export_incremental.rb

@@ -20,6 +20,14 @@ module HammerCLIKatello
       include ContentExportHelper
     end
 
+    class RepositoryCommand < HammerCLIKatello::SingleResourceCommand
+      desc _("Performs an incremental export of a repository")
+      command_name "repository"
+
+      include HammerCLIForemanTasks::Async
+      include ContentExportHelper
+    end
+
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/content_import.rb

@@ -58,6 +58,15 @@ module HammerCLIKatello
       include ContentImportCommon
     end
 
+    class RepositoryCommand < HammerCLIKatello::SingleResourceCommand
+      desc _("Imports a repository")
+      action :repository
+      command_name "repository"
+
+      include HammerCLIForemanTasks::Async
+      include ContentImportCommon
+    end
+
     class ListCommand < HammerCLIKatello::ListCommand
       desc "View content view import histories"
       output do

data/lib/hammer_cli_katello/host_collection.rb

@@ -143,6 +143,8 @@ module HammerCLIKatello
       success_message _("Host collection updated.")
       failure_message _("Could not update the the host collection")
 
+      option "--unlimited-hosts", :flag, "Set hosts max to unlimited"
+
       build_options { |o| o.expand(:all).including(:organizations) }
     end
 

data/lib/hammer_cli_katello/id_resolver.rb

@@ -29,8 +29,9 @@ module HammerCLIKatello
       :sync_plan =>             [s_name(_("Sync plan name to search by"))],
       :task =>                  [s_name(_("Task name to search by"))],
       :content_view_version => [s("version", _("Content view version number"))],
-      :content_export       => [],
-      :content_import       => []
+      :content_export => [],
+      :content_export_incremental => [],
+      :content_import => []
     }.freeze
 
     DEFAULT_SEARCHABLES = [s_name(_("Name to search by"))].freeze

data/lib/hammer_cli_katello/organization.rb

@@ -24,6 +24,7 @@ module HammerCLIKatello
         field :service_levels, _("Service Levels"), Fields::List
         from :cdn_configuration do
           label "CDN configuration", hide_blank: true do
+            field :type_label, _("Type"), Fields::Field
             field :url, _("URL"), Fields::Field, hide_blank: true
             field :upstream_organization_label, _("Upstream Organization"),
                                                Fields::Field, hide_blank: true
@@ -39,9 +40,19 @@ module HammerCLIKatello
                                               else
                                                 _("Disabled")
                                               end
+        setup_cdn_type(data)
         data
       end
 
+      def setup_cdn_type(data)
+        types = {
+          'export_sync' => _("Export Sync"),
+          'network_sync' => _("Network Sync"),
+          'redhat_cdn' => _("Red Hat CDN")
+        }
+        data["cdn_configuration"].merge!("type_label" => types[data["cdn_configuration"]["type"]])
+      end
+
       build_options
     end
 

data/lib/hammer_cli_katello/repository.rb

@@ -56,7 +56,7 @@ module HammerCLIKatello
         field :_redhat_repo, _("Red Hat Repository")
         field :content_type, _("Content Type")
         field :checksum_type, _("Checksum Type"), Fields::Field, :hide_blank => true
-        field :_mirror_on_sync, _("Mirror on Sync")
+        field :_mirroring_policy, _("Mirroring Policy"), Fields::Field, :hide_blank => true
         field :url, _("Url")
         field :_publish_via_http, _("Publish Via HTTP")
         field :full_path, _("Published At")
@@ -126,6 +126,7 @@ module HammerCLIKatello
 
         setup_sync_state(data)
         setup_booleans(data)
+        setup_mirroring_policy(data)
         setup_content_counts(data) if data["content_counts"]
         data
       end
@@ -133,7 +134,16 @@ module HammerCLIKatello
       def setup_booleans(data)
         data["_redhat_repo"] = data.dig("product", "redhat") ? _("yes") : _("no")
         data["_publish_via_http"] = data["unprotected"] ? _("yes") : _("no")
-        data["_mirror_on_sync"] = data["mirror_on_sync"] ? _("yes") : _("no")
+      end
+
+      def setup_mirroring_policy(data)
+        policies = {
+          'additive' => _("Additive"),
+          'mirror_content_only' => _("Content Only"),
+          'mirror_complete' => _("Complete Mirroring")
+        }
+        mirroring_policy = data["mirroring_policy"]
+        data["_mirroring_policy"] = policies[mirroring_policy]
       end
 
       def setup_sync_state(data)
@@ -530,7 +540,6 @@ module HammerCLIKatello
         end
       end
     end
-    # rubocop:enable ClassLength
 
     class RemoveContentCommand < HammerCLIKatello::SingleResourceCommand
       extend RepositoryScopedToProduct
@@ -558,6 +567,59 @@ module HammerCLIKatello
       end
     end
 
+    class RepublishCommand < HammerCLIKatello::SingleResourceCommand
+      extend RepositoryScopedToProduct
+      include HammerCLIForemanTasks::Async
+      include OrganizationOptions
+
+      validate_repo_name_requires_product_options
+      action :republish
+      command_name "republish"
+      desc _("Forces a republish of the specified repository.")
+
+      success_message _("Repository republished.")
+      failure_message _("Could not republish the repository.")
+
+      validate_options :before, 'IdResolution' do
+        organization_options = [:option_organization_id, :option_organization_name, \
+                                :option_organization_label]
+
+        if option(:option_product_name).exist?
+          any(*organization_options).required
+        end
+      end
+
+      build_options do |o|
+        o.expand.including(:products)
+      end
+    end
+
+    class ReclaimSpaceCommand < HammerCLIKatello::SingleResourceCommand
+      extend RepositoryScopedToProduct
+      include HammerCLIForemanTasks::Async
+      include OrganizationOptions
+      validate_repo_name_requires_product_options
+      action :reclaim_space
+      command_name "reclaim-space"
+      desc _("Reclaim space from an On Demand repository")
+
+      success_message _("Repository space reclaimed.")
+      failure_message _("Could not reclaim the repository")
+
+      validate_options :before, 'IdResolution' do
+        organization_options = [:option_organization_id, :option_organization_name, \
+                                :option_organization_label]
+
+        if option(:option_product_name).exist?
+          any(*organization_options).required
+        end
+      end
+
+      build_options do |o|
+        o.expand.including(:products)
+      end
+    end
+    # rubocop:enable ClassLength
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('1.4.0')
+    @version ||= Gem::Version.new('1.5.1')
   end
 end

data/lib/hammer_cli_katello.rb

@@ -43,6 +43,11 @@ module HammerCLIKatello
                                           'hammer_cli_katello/organization'
                                          )
 
+  HammerCLI::MainCommand.lazy_subcommand!("alternate-content-sources", _("Manipulate alternate content sources"), # rubocop:disable LineLength
+                                         'HammerCLIKatello::AcsCommand',
+                                         'hammer_cli_katello/acs'
+                                         )
+
   HammerCLI::MainCommand.lazy_subcommand("content-credentials",
                                          _("Manipulate content credentials on the server"),
                                          'HammerCLIKatello::ContentCredentialCommand',