hammer_cli_katello 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b5a3be27eb8f7e7652ea66673432162879a55d9
-  data.tar.gz: a6205c061e84fca880057d9369650271300dad5b
+  metadata.gz: 479861dfdbc99ab869476405b911f43cd02672ac
+  data.tar.gz: d7497c5d258268d20a953ae4a0690d9d74b5014e
 SHA512:
-  metadata.gz: ca9eb16c655bff58be0162b0933bf50fe2ed3361bc79c429aa2001550564dee28bff7e8344f31fd1196b2843b9d4eb8f1124bd22f76a92f69332eefb561a00a6
-  data.tar.gz: bb7008968db6aec201bf65774fd4882664ced950ce8a36941e6622e1b89264c0bb1dcbe11142ce31f179e8c97c6bf7afc2ba18df43dc08087eda4b2bdedc5da6
+  metadata.gz: 92377f9a91f074f9bed31e5b6c4b239eee4b841ed69a801bbd5d6d49b1fcd666507dfe25cd07d781f01f910880d7cfbcda5f2e988f321e67f5da5a9694baab5b
+  data.tar.gz: bf30d08e52fbe4a85162b695c7e48a81f688d1a14859125a8a0bd24e27aeb5c85721a417589e42b31297be6e77d56c7ddf0a1170253346df97a57d49db7869ae

data/lib/hammer_cli_katello.rb

@@ -13,6 +13,7 @@ module HammerCLIKatello
 
   require 'hammer_cli_katello/output/fields'
   require 'hammer_cli_katello/output/formatters'
+  require 'hammer_cli_katello/katello_environment_name_resolvable'
   require 'hammer_cli_katello/lifecycle_environment_name_resolvable'
   require 'hammer_cli_katello/repository_scoped_to_product'
   require "hammer_cli_katello/commands"

data/lib/hammer_cli_katello/activation_key.rb

@@ -4,7 +4,7 @@ module HammerCLIKatello
     resource :activation_keys
 
     class ListCommand < HammerCLIKatello::ListCommand
-      include LifecycleEnvironmentNameResolvable
+      include KatelloEnvironmentNameResolvable
       action :index
 
       output do
@@ -32,7 +32,7 @@ module HammerCLIKatello
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
-      include LifecycleEnvironmentNameResolvable
+      include KatelloEnvironmentNameResolvable
       action :show
 
       def request_params
@@ -73,7 +73,7 @@ module HammerCLIKatello
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
-      include LifecycleEnvironmentNameResolvable
+      include KatelloEnvironmentNameResolvable
       action :create
       success_message _("Activation key created")
       failure_message _("Could not create the activation key")
@@ -88,7 +88,7 @@ module HammerCLIKatello
     end
 
     class CopyCommand < HammerCLIKatello::CreateCommand
-      include LifecycleEnvironmentNameResolvable
+      include KatelloEnvironmentNameResolvable
       action :copy
 
       desc _("Copy an activation key")
@@ -101,11 +101,13 @@ module HammerCLIKatello
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
-      include LifecycleEnvironmentNameResolvable
+      include KatelloEnvironmentNameResolvable
       action :update
       success_message _("Activation key updated")
       failure_message _("Could not update the activation key")
 
+      option "--unlimited-hosts", :flag, "set hosts max to unlimited"
+
       validate_options do
         all(:option_unlimited_hosts, :option_max_hosts).rejected
       end
@@ -114,7 +116,7 @@ module HammerCLIKatello
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
-      include LifecycleEnvironmentNameResolvable
+      include KatelloEnvironmentNameResolvable
       action :destroy
       success_message _("Activation key deleted")
       failure_message _("Could not delete the activation key")

data/lib/hammer_cli_katello/capsule.rb

@@ -2,26 +2,6 @@ require 'hammer_cli_foreman/smart_proxy'
 
 module HammerCLIKatello
   module Capsule
-    module LifecycleEnvironmentNameResolvable
-      def lifecycle_environment_resolve_options(options)
-        {
-          HammerCLI.option_accessor_name("name") => options['option_environment_name'],
-          HammerCLI.option_accessor_name("id") => options['option_environment_id'],
-          HammerCLI.option_accessor_name("organization_id") => options["option_organization_id"],
-          HammerCLI.option_accessor_name("organization_name") => options["option_organization_name"]
-        }
-      end
-
-      def all_options
-        result = super.clone
-        if result['option_environment_name']
-          result['option_environment_id'] =  resolver.lifecycle_environment_id(
-              lifecycle_environment_resolve_options(result))
-        end
-        result
-      end
-    end
-
     class Content < HammerCLIKatello::Command
       command_name 'content'
       desc _('Manage the capsule content')
@@ -90,7 +70,8 @@ module HammerCLIKatello
         build_options
       end
 
-      class SyncCommand < HammerCLIForemanTasks::AsyncCommand
+      class SyncCommand < HammerCLIKatello::SingleResourceCommand
+        include HammerCLIForemanTasks::Async
         include LifecycleEnvironmentNameResolvable
         resource :capsule_content, :sync
         command_name "synchronize"

data/lib/hammer_cli_katello/commands.rb

@@ -2,7 +2,7 @@ module HammerCLIKatello
 
   RESOURCE_NAME_MAPPING = {
     :system => :content_host
-  }
+  }.freeze
 
   module ResolverCommons
 
@@ -23,7 +23,7 @@ module HammerCLIKatello
       end
 
       def resource_name_mapping
-        HammerCLIKatello::RESOURCE_NAME_MAPPING
+        HammerCLIKatello::RESOURCE_NAME_MAPPING.dup
       end
 
     end

data/lib/hammer_cli_katello/content_host.rb

@@ -9,7 +9,7 @@ module HammerCLIKatello
     end
 
     class ListCommand < HammerCLIKatello::ListCommand
-      include LifecycleEnvironmentNameResolvable
+      include KatelloEnvironmentNameResolvable
       resource :systems, :index
 
       output do
@@ -24,7 +24,7 @@ module HammerCLIKatello
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
-      include LifecycleEnvironmentNameResolvable
+      include KatelloEnvironmentNameResolvable
       include IdDescriptionOverridable
       resource :systems, :show
 
@@ -32,7 +32,6 @@ module HammerCLIKatello
         field :name, _("Name")
         field :uuid, _("ID")
         field :katello_agent_installed, _("Katello Agent Installed"), Fields::Boolean
-        field :description, _("Description")
         field :location, _("Location")
         from :environment do
           field :name, _("Lifecycle Environment")
@@ -53,34 +52,9 @@ module HammerCLIKatello
       build_options
     end
 
-    class CreateCommand < HammerCLIKatello::CreateCommand
-      include LifecycleEnvironmentNameResolvable
-      resource :systems, :create
-
-      output InfoCommand.output_definition
-
-      success_message _("Content host created")
-      failure_message _("Could not create content host")
-
-      def request_params
-        super.tap do |params|
-          params['type'] = "system"
-          params['facts'] = {"uname.machine" => "unknown"}
-        end
-      end
-
-      validate_options do
-        if any(:option_environment_id, :option_environment_name).exist?
-          any(:option_content_view_name, :option_content_view_id).required
-        end
-      end
-
-      build_options :without => [:facts, :type, :installed_products]
-    end
-
     class UpdateCommand < HammerCLIKatello::UpdateCommand
       include IdDescriptionOverridable
-      include LifecycleEnvironmentNameResolvable
+      include KatelloEnvironmentNameResolvable
       resource :systems, :update
 
       success_message _("Content host updated")
@@ -95,26 +69,6 @@ module HammerCLIKatello
       build_options :without => [:facts, :type, :installed_products]
     end
 
-    class DeleteCommand < HammerCLIKatello::DeleteCommand
-      include IdDescriptionOverridable
-      include LifecycleEnvironmentNameResolvable
-      resource :systems, :destroy
-
-      success_message _("Content host deleted")
-      failure_message _("Could not delete content host")
-
-      build_options
-    end
-
-    class TasksCommand < HammerCLIKatello::ListCommand
-      include IdDescriptionOverridable
-      resource :systems, :tasks
-
-      command_name "tasks"
-
-      build_options
-    end
-
     class AvailableIncrementalUpdates < HammerCLIKatello::ListCommand
       resource :systems_bulk_actions, :available_incremental_updates
       command_name 'available-incremental-updates'

data/lib/hammer_cli_katello/content_view.rb

@@ -8,7 +8,7 @@ module HammerCLIKatello
     resource :content_views
 
     class ListCommand < HammerCLIKatello::ListCommand
-      include LifecycleEnvironmentNameResolvable
+      include KatelloEnvironmentNameResolvable
       output do
         field :id, _("Content View ID")
         field :name, _("Name")
@@ -106,7 +106,21 @@ module HammerCLIKatello
         end
       end
 
-      build_options
+      validate_options do
+        product_options = [:option_product_id, :option_product_name]
+        if option(:option_repository_ids).exist?
+          any(*product_options).rejected
+          option(:option_repository_names).rejected
+        end
+
+        if option(:option_repository_names).exist?
+          any(*product_options).required
+        end
+      end
+
+      build_options do |o|
+        o.expand.including(:products)
+      end
     end
 
     class CopyCommand < HammerCLIKatello::CreateCommand
@@ -154,7 +168,7 @@ module HammerCLIKatello
     end
 
     class RemoveFromEnvironmentCommand < HammerCLIKatello::SingleResourceCommand
-      include LifecycleEnvironmentNameResolvable
+      include KatelloEnvironmentNameResolvable
       include HammerCLIForemanTasks::Async
 
       action :remove_from_environment
@@ -195,6 +209,7 @@ module HammerCLIKatello
 
     class AddContentViewVersionCommand < HammerCLIKatello::AddAssociatedCommand
       command_name 'add-version'
+      desc _('Add a content view version to a composite view')
 
       def association_name(plural = false)
         plural ? "components" : "component"
@@ -209,7 +224,7 @@ module HammerCLIKatello
 
     class RemoveContentViewVersionCommand < HammerCLIKatello::RemoveAssociatedCommand
       command_name 'remove-version'
-      desc _('Remove a version of a content view')
+      desc _('Remove a content view version from a composite view')
 
       def association_name(plural = false)
         plural ? "components" : "component"

data/lib/hammer_cli_katello/content_view_puppet_module.rb

@@ -33,6 +33,14 @@ module HammerCLIKatello
       failure_message _("Could not add the puppet module")
 
       build_options
+
+      # rubocop:disable Style/AccessorMethodName:
+      def get_identifier
+        # This will intentionally disable the id resolver.  Without it, if the user were to
+        # execute the 'add' command specifying a 'name', the id resolver will attempt to
+        # translate the 'name' to an 'id'.  That is not desirable for this command.
+        nil
+      end
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand

data/lib/hammer_cli_katello/content_view_version.rb

@@ -132,33 +132,68 @@ module HammerCLIKatello
       success_message _("Incremental update is being performed with task %{id}")
       failure_message _("An error occurred incrementally updating the content view")
 
-      option('--environment-ids',
-        'ENVIRONMENTS',
-        _("list of environment IDs to update the content view version in"),
-        :required => true,
+      option('--lifecycle-environment-ids',
+        'ENVIRONMENT_IDS',
+        _("list of lifecycle environment IDs to update the content view version in"),
         :format => HammerCLI::Options::Normalizers::List.new
       )
 
-      option('--content-host-ids',
-        'CONTENT_HOST_IDS',
-        _("IDs of content hosts to update"),
+      option('--lifecycle-environments',
+        'ENVIRONMENTS',
+        _("list of lifecycle environment names to update the content view version in"),
+        :format => HammerCLI::Options::Normalizers::List.new,
+        :attribute_name => :option_lifecycle_environment_names
+      )
+
+      option('--organization',
+        'ORGANIZATION_NAME',
+        _("Organization name for resolving lifecycle environment names"),
+        :attribute_name => :option_organization_name
+      )
+
+      option('--organization-id',
+        'ORGANIZATION_ID',
+        _("Organization id for resolving lifecycle environment names")
+      )
+
+      option('--update-all-hosts',
+        'UPDATE',
+        _('Update all editable and applicable hosts within the specified Content View and \
+          Lifecycle Environments'),
+        :format => HammerCLI::Options::Normalizers::Bool.new
+      )
+
+      option('--host-ids',
+        'HOST_IDS',
+        _("IDs of hosts to update"),
         :format => HammerCLI::Options::Normalizers::List.new
       )
 
+      validate_options do
+        organization_options = [:option_organization_id, :option_organization_name]
+
+        if option(:option_lifecycle_environment_ids).exist?
+          any(*organization_options).rejected
+          option(:option_lifecycle_environment_names).rejected
+        end
+
+        if option(:option_lifecycle_environment_names).exist?
+          any(*organization_options).required
+        end
+      end
+
       def request_params
         params = super
-
         params[:content_view_version_environments] = [
           {
-            :environment_ids => option_environment_ids,
             :content_view_version_id => option_content_view_version_id
           }
         ]
 
-        if params['update_systems']['included'].key?('ids')
-          params['update_systems'].delete('excluded')
-        else
-          params.delete('update_systems')
+        if options.key?(HammerCLI.option_accessor_name(:lifecycle_environment_names)) ||
+            options.key?(HammerCLI.option_accessor_name(:lifecycle_environment_ids))
+          params[:content_view_version_environments][0][:environment_ids] =
+              resolver.environment_ids(options)
         end
 
         add_content = {}
@@ -166,19 +201,33 @@ module HammerCLIKatello
           add_content[key] = value if options.key?(HammerCLI.option_accessor_name(key))
         end
 
-        if option_content_host_ids
-          params['update_systems'] = {'included' => {'ids' => option_content_host_ids}}
-        end
-
+        params = request_params_hosts(params)
         params['add_content'] = add_content
 
         params.delete('id')
         params
       end
 
-      build_options do |opt|
-        opt.expand(:all)
-        opt.without(:content_view_version_environments, :ids)
+      def request_params_hosts(params)
+        if params['update_hosts'] && params['update_hosts']['included'] &&
+             params['update_hosts']['included'].key?('ids')
+          params['update_hosts'].delete('excluded')
+        else
+          params.delete('update_hosts')
+        end
+
+        if option_host_ids
+          params['update_hosts'] = {'included' => {'ids' => option_host_ids}}
+        elsif option_update_all_hosts
+          params['update_hosts'] = { 'included' => {:search => ''}}
+        end
+
+        params
+      end
+
+      build_options do |o|
+        o.expand(:all).except(:environments)
+        o.without(:content_view_version_environments, :ids, :update_hosts, :update_hosts_included)
       end
     end
 

data/lib/hammer_cli_katello/host.rb

@@ -1,5 +1,6 @@
 require 'hammer_cli_foreman/host'
 require 'hammer_cli_katello/host_errata'
+require 'hammer_cli_katello/host_subscription'
 require 'hammer_cli_katello/host_package'
 require 'hammer_cli_katello/host_package_group'
 
@@ -16,4 +17,7 @@ module HammerCLIKatello
                                     HammerCLIKatello::HostPackageGroup.desc,
                                     HammerCLIKatello::HostPackageGroup
 
+  HammerCLIForeman::Host.subcommand "subscription",
+                                    HammerCLIKatello::HostSubscription.desc,
+                                    HammerCLIKatello::HostSubscription
 end

data/lib/hammer_cli_katello/host_collection.rb

@@ -3,22 +3,6 @@ module HammerCLIKatello
   class HostCollection < HammerCLIKatello::Command
     resource :host_collections
 
-    module UuidRequestable
-      def self.included(base)
-        base.option("--host-collection-ids",
-          "HOST_COLLECTION_IDS",
-          _("Array of host ids to replace the hosts in host collection"),
-          :format => HammerCLI::Options::Normalizers::List.new)
-      end
-
-      def request_params
-        params = super
-        params['host_ids'] = option_host_ids unless option_host_ids.nil?
-        params.delete('host_ids') if params.keys.include? 'host_ids'
-        params
-      end
-    end
-
     module LimitFieldDataExtension
       def extend_data(data)
         data['_limit'] = data['unlimited_hosts'] ? 'None' : data['max_hosts']
@@ -52,10 +36,8 @@ module HammerCLIKatello
 
       success_message _("Host collection created")
       failure_message _("Could not create the host collection")
-      build_options do |o|
-        o.expand.except(:hosts)
-        o.without(:host_ids)
-      end
+
+      build_options
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
@@ -98,11 +80,10 @@ module HammerCLIKatello
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
-      include UuidRequestable
       success_message _("Host collection updated")
       failure_message _("Could not update the the host collection")
 
-      build_options :without => [:host_ids]
+      build_options
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand