hammer_cli_katello 1.4.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d1ff46aa39c3547dea6343f671d10d5ae603ecee1d4e2c416ddea5b1884de3e0
-  data.tar.gz: 5c3a848bcf07dba7d725a882a8a5e667841327f08ec738c100375c910466bfef
+SHA1:
+  metadata.gz: 205cdd68504c1fc4b0111f38b2dde15896040933
+  data.tar.gz: bf97773c38919f14834c35e32906c19d3cd1b606
 SHA512:
-  metadata.gz: 2fe7eddfe5ec1ebb616afeadd16c57ccba45100997b00dd69912284c27fc94467d22bc2d0023685237e7c744f3eb257a2c8d92d31a5589eb520a3f2e5fb2c484
-  data.tar.gz: 615ed4f84b86117d9b78543c1d8b5a09b9e21240d4f2fa9d5c2899c5a0d229e4ea1da2d008b03095473c90f9ea5cb43a024d122168a0b29a3578affd0d62b040
+  metadata.gz: 59f72d7ce8ac083a712dfa10fa9038b636b57bb48b3dbfdbfa691dace6ff7b501495d9b56fb3d8b97e97d90645efa7396f4384afad83eee634270ceaa77274f9
+  data.tar.gz: 295e9ea4da56c338d39eb6b3bfb5e3bbab96661fd5d40770a033590e787339f4bb0353a3e49f906a918c253bb63b4c77c9fba1e826074ee84ec12dd50f6c5475

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/activation_key.rb

@@ -54,10 +54,10 @@ module HammerCLIKatello
       output do
         field :name, _("Name")
         field :id, _("Id")
-        field :description, _("Description")
+        field :description, _("Description"), Fields::Field, :hide_blank => true
         field :format_limit, _("Host Limit")
         field :auto_attach, _("Auto Attach")
-        field :release_version, _("Release Version")
+        field :release_version, _("Release Version"), Fields::Field, :hide_blank => true
 
         from :environment do
           field :name, _("Lifecycle Environment")
@@ -71,6 +71,12 @@ module HammerCLIKatello
           field :name, _("Name")
         end
 
+        collection :content_overrides, _("Content Overrides") do
+          field :content_label, _("Content Label")
+          field :name, _("Name")
+          field :value, _("Value")
+        end
+
         label _("System Purpose") do
           field :service_level, _('Service Level')
           field :purpose_usage, _('Purpose Usage')

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,9 +24,14 @@ 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
+            field :upstream_lifecycle_environment_label,
+                  _("Upstream Lifecycle Environment"), Fields::Field, hide_blank: true
+            field :upstream_content_view_label, _("Upstream Content View"),
+                  Fields::Field, hide_blank: true
             field :username, _("Username"), Fields::Field, hide_blank: true
             field :ssl_ca_credential_id, _("SSL CA Credential ID"), Fields::Field, hide_blank: true
           end
@@ -39,9 +44,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")
@@ -86,7 +86,7 @@ module HammerCLIKatello
         end
 
         label _("GPG Key") do
-          from :content_credential do
+          from :gpg_key do
             field :id, _("Id"), Fields::Field, :hide_blank => true
             field :name, _("Name"), Fields::Field, :hide_blank => true
           end
@@ -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)
@@ -557,6 +567,33 @@ 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

data/lib/hammer_cli_katello/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('1.4.1')
+    @version ||= Gem::Version.new('1.5.2')
   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',