hammer_cli_katello 0.0.26 → 0.1.0

data/lib/hammer_cli_katello/host_collection.rb

@@ -1,5 +1,4 @@
 module HammerCLIKatello
-
   class HostCollection < HammerCLIKatello::Command
     resource :host_collections
 
@@ -48,42 +47,76 @@ module HammerCLIKatello
         field :total_hosts, _("Total Hosts")
       end
 
-      build_options
+      build_options { |o| o.expand(:all).including(:organizations) }
     end
 
     class HostsCommand < HammerCLIKatello::ListCommand
-      resource :host_collections, :hosts
+      resource :hosts, :index
       command_name "hosts"
 
+      option "--id", "HOST_COLLECTION_ID", _("Host Collection ID"),
+             :attribute_name => :option_host_collection_id
+      option "--name", "HOST_COLLECTION_NAME", _("Host Collection Name"),
+             :attribute_name => :option_host_collection_name
+
+      validate_options do
+        host_collection_options = [:option_host_collection_id, :option_host_collection_name]
+        any(*host_collection_options).required
+      end
+
+      def host_collection_options
+        {
+          "option_name" => option_host_collection_name,
+          "option_organization_name" => option_organization_name,
+          "option_organization_id" => option_organization_id,
+          "option_organization_label" => option_organization_label
+        }
+      end
+
+      def request_params
+        params = super
+        host_collection_id = option_host_collection_id
+        unless option_host_collection_name.nil?
+          host_collection_id = resolver.host_collection_id(
+            options.merge(resolver.scoped_options("host_collection", options)))
+        end
+        params['search'] = "host_collection_id=#{host_collection_id}"
+        params
+      end
+
       output do
         field :id, _("ID")
         field :name, _("Name")
       end
 
-      build_options
+      build_options { |o| o.expand(:all).including(:organizations) }
     end
 
     class CopyCommand < HammerCLIKatello::CreateCommand
-      resource :host_collections, :copy
-
       action :copy
       command_name "copy"
+      desc _("Copy a host collection")
 
-      success_message _("Host collection created")
-      failure_message _("Could not create the host collection")
+      option "--new-name", "NEW_NAME", _("New host collection name"), required: true
 
-      validate_options do
-        all(:option_name).required unless option(:option_id).exist?
+      success_message _("New host collection created")
+      failure_message _("Could not create the new host collection")
+
+      def request_params
+        params = super
+        # This is a hack to keep Hammer consistent without changing the inconsistent API V2
+        params['name'] = options[HammerCLI.option_accessor_name('new_name')] if params['id']
+        params
       end
 
-      build_options
+      build_options { |o| o.expand(:all).including(:organizations) }
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
       success_message _("Host collection updated")
       failure_message _("Could not update the the host collection")
 
-      build_options
+      build_options { |o| o.expand(:all).including(:organizations) }
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
@@ -92,7 +125,7 @@ module HammerCLIKatello
       success_message _("Host collection deleted")
       failure_message _("Could not delete the host collection")
 
-      build_options
+      build_options { |o| o.expand(:all).including(:organizations) }
     end
 
     class AddHostCommand < HammerCLIKatello::SingleResourceCommand
@@ -102,7 +135,7 @@ module HammerCLIKatello
       success_message _("The host(s) has been added")
       failure_message _("Could not add host(s)")
 
-      build_options
+      build_options { |o| o.expand(:all).including(:organizations) }
     end
 
     class RemoveHostCommand < HammerCLIKatello::SingleResourceCommand
@@ -112,7 +145,7 @@ module HammerCLIKatello
       success_message _("The host(s) has been removed")
       failure_message _("Could not remove host(s)")
 
-      build_options
+      build_options { |o| o.expand(:all).including(:organizations) }
     end
 
     autoload_subcommands
@@ -174,5 +207,4 @@ module HammerCLIKatello
                HammerCLIKatello::HostCollectionErratumCommand.desc,
                HammerCLIKatello::HostCollectionErratumCommand
   end
-
 end

data/lib/hammer_cli_katello/host_errata.rb

@@ -1,6 +1,5 @@
 module HammerCLIKatello
   class HostErrata < HammerCLIKatello::Command
-
     desc "Manage errata on your hosts"
 
     class ApplyCommand < HammerCLIKatello::SingleResourceCommand

data/lib/hammer_cli_katello/host_extensions.rb

@@ -0,0 +1,56 @@
+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'
+
+module HammerCLIKatello
+  module HostExtensions
+    ::HammerCLIForeman::Host::ListCommand.instance_eval do
+      output do
+        from :content_facet_attributes do
+          field :content_view_name, _('Content View')
+          field :lifecycle_environment_name, _('Lifecycle Environment')
+        end
+      end
+    end
+
+    ::HammerCLIForeman::Host::InfoCommand.instance_eval do
+      output do
+        label _('Content Information') do
+          from :content_facet_attributes do
+            field :content_view_name, _('Content View')
+            field :lifecycle_environment_name, _('Lifecycle Environment')
+
+            label _('Applicable Errata') do
+              from :errata_counts do
+                field :enhancement, _('Enhancement')
+                field :bugfix, _('Bug Fix')
+                field :security, _('Security')
+              end
+            end
+          end
+        end
+
+        label _('Subscription Information') do
+          from :subscription_facet_attributes do
+            field :uuid, _('UUID')
+            field :last_checkin, _('Last Checkin')
+            field :service_level, _('Service Level')
+            field :release_version, _('Release Version')
+            field :autoheal, _('Autoheal')
+            field :registered_at, _('Registered At')
+            collection :activation_keys, _('Registered by Activation Keys'), :hide_blank => true do
+              custom_field Fields::Reference
+            end
+          end
+        end
+
+        collection :host_collections, _('Host Collections') do
+          field :id, _('Id')
+          field :name, _('Name')
+        end
+      end
+    end
+  end
+end

data/lib/hammer_cli_katello/host_package.rb

@@ -1,7 +1,5 @@
 module HammerCLIKatello
-
   class HostPackage < HammerCLIKatello::Command
-
     desc "Manage packages on your hosts"
 
     class ListCommand < HammerCLIKatello::ListCommand
@@ -64,5 +62,4 @@ module HammerCLIKatello
 
     autoload_subcommands
   end
-
 end

data/lib/hammer_cli_katello/host_package_group.rb

@@ -1,7 +1,5 @@
 module HammerCLIKatello
-
   class HostPackageGroup < HammerCLIKatello::Command
-
     desc "Manage package-groups on your hosts"
 
     class InstallCommand < HammerCLIKatello::SingleResourceCommand
@@ -34,5 +32,4 @@ module HammerCLIKatello
 
     autoload_subcommands
   end
-
 end

data/lib/hammer_cli_katello/host_subscription.rb

@@ -1,6 +1,5 @@
 module HammerCLIKatello
   class HostSubscription < HammerCLIKatello::Command
-
     desc "Manage subscription information on your hosts"
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
@@ -15,6 +14,8 @@ module HammerCLIKatello
 
     class CreateCommand < HammerCLIKatello::SingleResourceCommand
       include LifecycleEnvironmentNameResolvable
+      include OrganizationOptions
+
       resource :host_subscriptions, :create
       command_name "register"
       success_message _("Host successfully registered")
@@ -26,6 +27,71 @@ module HammerCLIKatello
       end
     end
 
+    class AddSubscriptions < HammerCLIKatello::SingleResourceCommand
+      resource :host_subscriptions, :add_subscriptions
+      command_name "attach"
+      success_message _("Subscription attached to the host successfully")
+      failure_message _("Failed to attach subscriptions to the host")
+
+      option "--subscription-id", "SUBSCRIPTION_ID", _("ID of subscription"),
+             :attribute_name => :option_subscription_id, :required => true
+
+      option "--quantity", "Quantity", _("Quantity of this subscriptions to add. Defaults to 1"),
+             :attribute_name => :option_quantity, :required => false
+
+      def request_params
+        params = super
+        params[:subscriptions] = [
+          {
+            :id => option_subscription_id,
+            :quantity => option_quantity || 1
+          }
+        ]
+        params
+      end
+
+      build_options do |o|
+        o.expand.except(:subscriptions)
+        o.without(:subscriptions)
+      end
+    end
+
+    class AutoAttachSubscriptions < HammerCLIKatello::SingleResourceCommand
+      resource :host_subscriptions, :auto_attach
+      command_name "auto-attach"
+      success_message _("Auto attached subscriptions to the host successfully")
+      failure_message _("Failed to auto attach subscriptions to the host")
+
+      build_options
+    end
+
+    class RemoveSubscriptions < HammerCLIKatello::SingleResourceCommand
+      resource :host_subscriptions, :remove_subscriptions
+      command_name "remove"
+      success_message _("Subscription removed from the host successfully")
+      failure_message _("Failed to remove subscriptions from the host")
+
+      option "--subscription-id", "SUBSCRIPTION_ID", _("ID of subscription"),
+             :attribute_name => :option_subscription_id, :required => true
+
+      option "--quantity", "Quantity",
+             _("Remove the first instance of a subscription with matching id and quantity"),
+             :attribute_name => :option_quantity, :required => false
+
+      def request_params
+        params = super
+        subs = { :id => option_subscription_id }
+        subs[:quantity] = option_quantity if option_quantity
+        params[:subscriptions] = [subs]
+        params
+      end
+
+      build_options do |o|
+        o.expand.except(:subscriptions)
+        o.without(:subscriptions)
+      end
+    end
+
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/hostgroup.rb

@@ -0,0 +1,2 @@
+require 'hammer_cli_foreman/hostgroup'
+require 'hammer_cli_katello/hostgroup_extensions'

data/lib/hammer_cli_katello/hostgroup_extensions.rb

@@ -0,0 +1,48 @@
+require 'hammer_cli_foreman/hostgroup'
+
+module HammerCLIKatello
+  module PuppetEnvironmentNameResolvable
+    def all_options
+      options = super
+      if options['option_environment_name']
+        options['option_environment_id'] ||= resolver.puppet_environment_id(
+          resolver.scoped_options('environment', options))
+      end
+      options
+    end
+  end
+
+  module QueryOrganizationOptions
+    def self.included(base)
+      base.option '--query-organization-id', 'ORGANIZATION_ID',
+        _('Organization ID to search by'), attribute_name: :option_organization_id
+      base.option '--query-organization', 'ORGANIZATION_NAME',
+        _('Organization name to search by'), attribute_name: :option_organization_name
+      base.option '--query-organization-label', 'ORGANIZATION_LABEL',
+        _('Organization label to search by'), attribute_name: :option_organization_label
+    end
+  end
+
+  module HostgroupExtensions
+    ::HammerCLIForeman::Hostgroup::CreateCommand.instance_eval do
+      include HammerCLIKatello::ResolverCommons
+      include HammerCLIKatello::PuppetEnvironmentNameResolvable
+      include HammerCLIKatello::ContentViewNameResolvable
+      include HammerCLIKatello::QueryOrganizationOptions
+    end
+
+    ::HammerCLIForeman::Hostgroup::UpdateCommand.instance_eval do
+      include HammerCLIKatello::ResolverCommons
+      include HammerCLIKatello::PuppetEnvironmentNameResolvable
+      include HammerCLIKatello::ContentViewNameResolvable
+      include HammerCLIKatello::QueryOrganizationOptions
+    end
+
+    ::HammerCLIForeman::Hostgroup::InfoCommand.instance_eval do
+      output do
+        field :content_view_name, _('Content View')
+        field :lifecycle_environment_name, _('Lifecycle Environment')
+      end
+    end
+  end
+end

data/lib/hammer_cli_katello/i18n.rb

@@ -2,9 +2,7 @@ require 'hammer_cli/i18n'
 
 module HammerCLIKatello
   module I18n
-
     class LocaleDomain < HammerCLI::I18n::LocaleDomain
-
       def translated_files
         Dir.glob(File.join(File.dirname(__FILE__), '../**/*.rb'))
       end
@@ -17,7 +15,6 @@ module HammerCLIKatello
         'hammer-cli-katello'
       end
     end
-
   end
 end
 

data/lib/hammer_cli_katello/id_resolver.rb

@@ -1,13 +1,10 @@
 require 'hammer_cli_katello/search_options_creators'
 
 module HammerCLIKatello
-
   class Searchables < HammerCLIForeman::Searchables
-
     SEARCHABLES = {
       :activation_key =>        [s_name(_("Activation key name to search by"))],
       :capsule =>               [s_name(_("Capsule name to search by"))],
-      :content_host =>          [s_name(_("Content host name to search by"))],
       :content_view =>          [s_name(_("Content view name to search by"))],
       :gpg =>                   [s_name(_("Gpg key name to search by"))],
       :host_collection =>       [s_name(_("Host collection name to search by"))],
@@ -17,6 +14,7 @@ module HammerCLIKatello
                                    :editable => false)
                                 ],
       :product =>               [s_name(_("Product name to search by"))],
+      :operatingsystem =>       [s("title", _("Operating system title"), :editable => false)],
       :repository =>            [s_name(_("Repository name to search by"))],
       :repository_set =>        [s_name(_("Repository set name to search by"))],
       :subscription =>          [s_name(_("Subscription name to search by"))],
@@ -28,18 +26,19 @@ module HammerCLIKatello
         s("author", _("Puppet module's author to search by")),
         s("uuid", _("Puppet module's UUID to search by"))
       ],
-      :content_view_version => [s("version", _("Content view version number"))]
-    }
+      :content_view_version => [
+        s("version", _("Content view version number")),
+        s("content_view_id", _("Content view to search by"))
+      ]
+    }.freeze
 
-    DEFAULT_SEARCHABLES = [s_name(_("Name to search by"))]
+    DEFAULT_SEARCHABLES = [s_name(_("Name to search by"))].freeze
 
     def for(resource)
       SEARCHABLES[resource.singular_name.to_sym] || DEFAULT_SEARCHABLES
     end
-
   end
 
-  # rubocop:disable ClassLength
   class IdResolver < HammerCLIForeman::IdResolver
     include HammerCLIKatello::SearchOptionsCreators
 
@@ -51,8 +50,8 @@ module HammerCLIKatello
       smart_proxy_id(options)
     end
 
-    def system_id(options)
-      options[HammerCLI.option_accessor_name("id")] || find_resource(:systems, options)['uuid']
+    def puppet_environment_id(options)
+      get_id(:environments, options)
     end
 
     def environment_id(options)
@@ -66,7 +65,7 @@ module HammerCLIKatello
 
       key_names = HammerCLI.option_accessor_name 'lifecycle_environment_names'
       key_organization_id = HammerCLI.option_accessor_name 'organization_id'
-      options[key_organization_id] ||= organization_id(scoped_options 'organization', options)
+      options[key_organization_id] ||= organization_id(scoped_options('organization', options))
 
       find_resources(:lifecycle_environments, options)
         .select { |repo| options[key_names].include? repo['name'] }.map { |repo| repo['id'] }
@@ -75,10 +74,14 @@ module HammerCLIKatello
     def repository_id(options)
       key_id = HammerCLI.option_accessor_name("id")
       key_product_id = HammerCLI.option_accessor_name("product_id")
+      key_product_name = HammerCLI.option_accessor_name("product_name")
 
       return options[key_id] if options[key_id]
 
-      options[key_product_id] ||= product_id(scoped_options("product", options))
+      unless options[key_product_name].nil?
+        options[key_product_id] ||= product_id(scoped_options("product", options))
+      end
+
       find_resource(:repositories, options)['id']
     end
 
@@ -87,11 +90,17 @@ module HammerCLIKatello
 
       key_names = HammerCLI.option_accessor_name 'names'
       key_product_id = HammerCLI.option_accessor_name 'product_id'
+
+      options[key_names] ||= []
+
       unless options['option_product_name'].nil?
-        options[key_product_id] ||= product_id(scoped_options 'product', options)
+        options[key_product_id] ||= product_id(scoped_options('product', options))
+      end
+
+      if options[key_names].any?
+        find_resources(:repositories, options)
+          .select { |repo| options[key_names].include? repo['name'] }.map { |repo| repo['id'] }
       end
-      find_resources(:repositories, options)
-        .select { |repo| options[key_names].include? repo['name'] }.map { |repo| repo['id'] }
     end
 
     def content_view_version_id(options)
@@ -113,7 +122,7 @@ module HammerCLIKatello
       options[from_environment_id] ||= from_lifecycle_environment_id(options)
 
       if results.size > 1 && options[from_environment_id]
-        results_in_from_environment = results.select do  |version|
+        results_in_from_environment = results.select do |version|
           member_of_environment_ids = version['environments'].map { |env| env['id'].to_s }
           member_of_environment_ids.include? options[from_environment_id].to_s
         end

data/lib/hammer_cli_katello/katello_environment_name_resolvable.rb

@@ -23,9 +23,10 @@ module HammerCLIKatello
 
     def all_options
       result = super.clone
-      if result['option_environment_name']
-        result['option_environment_id'] =  resolver.lifecycle_environment_id(
-                                             lifecycle_environment_resolve_options(result))
+      if result['option_environment_name'] && result['option_environment_id'].nil?
+        result['option_environment_id'] = resolver.lifecycle_environment_id(
+          lifecycle_environment_resolve_options(result))
+        @all_options = result
       end
       result
     end

data/lib/hammer_cli_katello/lifecycle_environment.rb

@@ -1,10 +1,8 @@
 module HammerCLIKatello
-
   class LifecycleEnvironmentCommand < HammerCLIKatello::Command
     resource :lifecycle_environments
 
     module PriorIdResolvable
-
       def self.included(base)
         base.option(
           "--prior",
@@ -100,5 +98,4 @@ module HammerCLIKatello
 
     autoload_subcommands
   end
-
 end

data/lib/hammer_cli_katello/lifecycle_environment_name_resolvable.rb

@@ -11,9 +11,10 @@ module HammerCLIKatello
 
     def all_options
       result = super.clone
-      if result['option_environment_name']
-        result['option_environment_id'] =  resolver.lifecycle_environment_id(
-            lifecycle_environment_resolve_options(result))
+      if result['option_environment_name'] && result['option_environment_id'].nil?
+        result['option_environment_id'] = resolver.lifecycle_environment_id(
+          lifecycle_environment_resolve_options(result))
+        @all_options = result
       end
       result
     end

data/lib/hammer_cli_katello/organization.rb

@@ -1,9 +1,7 @@
 require 'hammer_cli_foreman/organization'
 
 module HammerCLIKatello
-
   class Organization < HammerCLIForeman::Organization
-
     class ListCommand < HammerCLIForeman::Organization::ListCommand
       include HammerCLIKatello::ResolverCommons
       resource :organizations, :index
@@ -61,5 +59,4 @@ module HammerCLIKatello
 
     autoload_subcommands
   end
-
 end

data/lib/hammer_cli_katello/organization_options.rb

@@ -0,0 +1,12 @@
+module HammerCLIKatello
+  module OrganizationOptions
+    def self.included(base)
+      base.option '--organization-id', 'ORGANIZATION_ID',
+        _('Organization ID to search by'), attribute_name: :option_organization_id
+      base.option '--organization', 'ORGANIZATION_NAME',
+        _('Organization name to search by'), attribute_name: :option_organization_name
+      base.option '--organization-label', 'ORGANIZATION_LABEL',
+        _('Organization label to search by'), attribute_name: :option_organization_label
+    end
+  end
+end

data/lib/hammer_cli_katello/ostree_branch.rb

@@ -1,5 +1,4 @@
 module HammerCLIKatello
-
   class OstreeBranchCommand < HammerCLIKatello::Command
     resource :ostree_branches
 

data/lib/hammer_cli_katello/output/fields.rb

@@ -3,13 +3,11 @@ require 'hammer_cli'
 module HammerCLIKatello
   module Output
     module Fields
-
       class ChecksumFilePair < ::Fields::Field
       end
 
       class Dependency < ::Fields::Field
       end
-
     end
   end
 end

data/lib/hammer_cli_katello/output/formatters.rb

@@ -1,9 +1,7 @@
 module HammerCLIKatello
   module Output
     module Formatters
-
       class ChecksumFormatter < HammerCLI::Output::Formatters::FieldFormatter
-
         def tags
           [:screen]
         end
@@ -14,7 +12,6 @@ module HammerCLIKatello
       end
 
       class DependencyFormatter < HammerCLI::Output::Formatters::FieldFormatter
-
         def format(dependency, _ = {})
           name = dependency[:name] || dependency['name']
           version = dependency[:version_requirement] || dependency['version_requirement']
@@ -28,7 +25,6 @@ module HammerCLIKatello
 
       HammerCLI::Output::Output.register_formatter(ChecksumFormatter.new, :ChecksumFilePair)
       HammerCLI::Output::Output.register_formatter(DependencyFormatter.new, :Dependency)
-
     end
   end
 end

data/lib/hammer_cli_katello/package.rb

@@ -1,5 +1,4 @@
 module HammerCLIKatello
-
   class PackageCommand < HammerCLIKatello::Command
     resource :packages
 

data/lib/hammer_cli_katello/package_group.rb

@@ -1,5 +1,4 @@
 module HammerCLIKatello
-
   class PackageGroupCommand < HammerCLIKatello::Command
     resource :package_groups
 

data/lib/hammer_cli_katello/ping.rb

@@ -1,12 +1,9 @@
 module HammerCLIKatello
-
   class PingCommand < HammerCLIKatello::Command
-
     resource :ping, :index
 
     output do
       from "services" do
-
         label "candlepin" do
           from "candlepin" do
             field "status", _("Status")
@@ -41,7 +38,6 @@ module HammerCLIKatello
             field "_response", _("Server Response")
           end
         end
-
       end # from "services"
     end # output do
 
@@ -72,7 +68,5 @@ module HammerCLIKatello
     def request_options
       { with_authentication: false }
     end
-
   end # class PingCommand
-
 end # module HammerCLIKatello