hammer_cli_katello 0.0.4 → 0.0.5

data/lib/hammer_cli_katello/content_host_package_group.rb

@@ -0,0 +1,38 @@
+module HammerCLIKatello
+
+  class ContentHostPackageGroup < HammerCLIKatello::Command
+
+    desc "Manage package-groups on your content hosts"
+
+    class InstallCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+      resource :system_packages, :install
+      command_name "install"
+      success_message "Package-groups installed successfully"
+      failure_message "Could not install package-groups"
+
+      validate_options do
+        option(:option_groups).required
+      end
+
+      build_options :without => [:packages]
+    end
+
+    class RemoveCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+      resource :system_packages, :remove
+      command_name "remove"
+      success_message "Package-groups removed successfully"
+      failure_message "Could not remove package-groups"
+
+      validate_options do
+        option(:option_groups).required
+      end
+
+      build_options :without => [:packages]
+    end
+
+    autoload_subcommands
+  end
+
+end

data/lib/hammer_cli_katello/content_view.rb

@@ -8,6 +8,7 @@ module HammerCLIKatello
     resource :content_views
 
     class ListCommand < HammerCLIKatello::ListCommand
+      include LifecycleEnvironmentNameResolvable
       output do
         field :id, _("Content View ID")
         field :name, _("Name")
@@ -26,6 +27,7 @@ module HammerCLIKatello
         field :label, _("Label")
         field :composite, _("Composite")
         field :description, _("Description")
+        field :content_host_count, _("Content Host Count")
 
         from :organization do
           field :name, _("Organization")
@@ -61,6 +63,10 @@ module HammerCLIKatello
           field :id, _("ID")
           field :name, _("Name")
         end
+
+        collection :activation_keys, _("Activation Keys") do
+          custom_field Fields::Reference
+        end
       end
 
       build_options
@@ -88,7 +94,9 @@ module HammerCLIKatello
       build_options
     end
 
-    class DeleteCommand < HammerCLIForemanTasks::AsyncCommand
+    class DeleteCommand < HammerCLIKatello::DeleteCommand
+      include HammerCLIForemanTasks::Async
+
       action :destroy
       command_name "delete"
 
@@ -98,7 +106,9 @@ module HammerCLIKatello
       build_options
     end
 
-    class PublishCommand < HammerCLIForemanTasks::AsyncCommand
+    class PublishCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+
       action :publish
       command_name "publish"
 
@@ -108,7 +118,10 @@ module HammerCLIKatello
       build_options
     end
 
-    class RemoveFromEnvironmentCommand < HammerCLIForemanTasks::AsyncCommand
+    class RemoveFromEnvironmentCommand < HammerCLIKatello::SingleResourceCommand
+      include LifecycleEnvironmentNameResolvable
+      include HammerCLIForemanTasks::Async
+
       action :remove_from_environment
       command_name "remove-from-environment"
 
@@ -118,7 +131,9 @@ module HammerCLIKatello
       build_options
     end
 
-    class RemoveCommand < HammerCLIForemanTasks::AsyncCommand
+    class RemoveCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+
       # command to remove content view environments and versions from a content view.
       # corresponds to the UI screen.
       action :remove
@@ -188,6 +203,3 @@ module HammerCLIKatello
                HammerCLIKatello::ContentViewVersion
   end
 end
-
-HammerCLI::MainCommand.subcommand "content-view", _("Manipulate content views."),
-                                  HammerCLIKatello::ContentView

data/lib/hammer_cli_katello/content_view_puppet_module.rb

@@ -12,30 +12,22 @@ module HammerCLIKatello
         field :uuid, _("UUID")
         field :name, _("Name")
         field :author, _("Author")
+        field :version, _("Version")
       end
 
-      build_options
-    end
-
-    class InfoCommand < HammerCLIKatello::InfoCommand
-      output do
-        field :id, _("ID")
-        field :uuid, _("UUID"), Fields::Field, :hide_blank => true
-        field :name, _("Name")
-        field :author, _("Author")
-        field :created_at, _("Created"), Fields::Date
-        field :updated_at, _("Updated"), Fields::Date
-      end
-
-      def request_params
-        super.merge(method_options)
+      def extend_data(mod)
+        if mod['uuid']
+          mod['version'] = mod['computed_version']
+        else
+          mod['version'] = _("Latest(Currently %s)") % mod['computed_version']
+        end
+        mod
       end
 
       build_options
     end
 
-    class CreateCommand < HammerCLIKatello::Command
-      action :create
+    class CreateCommand < HammerCLIKatello::CreateCommand
       command_name "add"
 
       success_message _("Puppet module added to content view")
@@ -44,27 +36,11 @@ module HammerCLIKatello
       build_options
     end
 
-    class UpdateCommand < HammerCLIKatello::UpdateCommand
-      success_message _("Puppet module updated for content view")
-      failure_message _("Could not update the puppet module")
-
-      def request_params
-        super.merge(method_options)
-      end
-
-      build_options
-    end
-
-    class DeleteCommand < HammerCLIKatello::Command
-      action :destroy
+    class DeleteCommand < HammerCLIKatello::DeleteCommand
       command_name "remove"
 
       success_message _("Puppet module removed from content view")
-      failure_message _("Could not delete the filter")
-
-      def request_params
-        super.merge(method_options)
-      end
+      failure_message _("Couldn't remove puppet module from the content view")
 
       build_options
     end

data/lib/hammer_cli_katello/content_view_version.rb

@@ -10,12 +10,12 @@ module HammerCLIKatello
         field :id, _("ID")
         field :name, _("Name")
         field :version, _("Version")
+        field :environments, _("Lifecycle Environments"), Fields::List
+      end
 
-        from :content_view do
-          field :id, _("Content View ID")
-          field :name, _("Content View Name")
-          field :label, _("Content View Label")
-        end
+      def extend_data(version)
+        version['environments'] = version['environments'].map { |e| e["name"] }
+        version
       end
 
       build_options
@@ -33,7 +33,7 @@ module HammerCLIKatello
           field :label, _("Content View Label")
         end
 
-        collection :environments, _("Environments") do
+        collection :environments, _("Lifecycle Environments") do
           field :id, _("ID")
           field :name, _("Name")
           field :label, _("Label")
@@ -53,27 +53,62 @@ module HammerCLIKatello
         end
       end
 
-      build_options
+      build_options do |o|
+        o.expand(:all).including(:environments)
+      end
     end
 
-    class PromoteCommand < HammerCLIForemanTasks::AsyncCommand
+    class PromoteCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+
       action :promote
       command_name "promote"
 
       success_message _("Content view is being promoted with task %{id}")
       failure_message _("Could not promote the content view")
 
-      build_options
+      option "--from-lifecycle-environment", "FROM_ENVIRONMENT",
+             _("Name of the source environment"), :attribute_name => :option_environment_name
+      option "--from-lifecycle-environment-id", "FROM_ENVIRONMENT_ID",
+             _("Id of the source environment"), :attribute_name => :option_environment_id
+      option "--to-lifecycle-environment", "TO_ENVIRONMENT",
+             _("Name of the target environment"), :attribute_name => :option_to_environment_name
+      option "--to-lifecycle-environment-id", "TO_ENVIRONMENT_ID",
+             _("Id of the target environment"), :attribute_name => :option_to_environment_id
+
+      def request_params
+        params = super
+
+        env_search_opts = {
+          "option_id" => options["option_to_environment_id"],
+          "option_name" => options["option_to_environment_name"],
+          "option_organization_id" => options["option_organization_id"],
+          "option_organization_name" => options["option_organization_name"],
+          "option_organization_label" => options["option_organization_label"]
+        }
+
+        params['environment_id'] = resolver.lifecycle_environment_id(env_search_opts)
+        params
+      end
+
+      build_options do |o|
+        o.expand(:all).except(:environments)
+        o.without(:environment_id)
+      end
     end
 
-    class DeleteCommand < HammerCLIForemanTasks::AsyncCommand
+    class DeleteCommand < HammerCLIKatello::DeleteCommand
+      include HammerCLIForemanTasks::Async
+
       action :destroy
       command_name "delete"
 
       success_message _("Content view is being deleted with task %{id}")
       failure_message _("Could not delete the content view")
 
-      build_options
+      build_options do |o|
+        o.expand(:all).including(:environments)
+      end
     end
 
     autoload_subcommands

data/lib/hammer_cli_katello/exception_handler.rb

@@ -4,7 +4,8 @@ module HammerCLIKatello
 
     def mappings
       super + [
-        [RestClient::InternalServerError, :handle_internal_error]
+        [RestClient::InternalServerError, :handle_internal_error],
+        [RestClient::BadRequest, :handle_bad_request]
       ]
     end
 
@@ -25,6 +26,11 @@ module HammerCLIKatello
       HammerCLI::EX_NOT_FOUND
     end
 
+    def handle_bad_request(e)
+      handle_katello_error(e)
+      HammerCLI::EX_NOT_FOUND
+    end
+
     def handle_katello_error(e)
       response = JSON.parse(e.response)
       response = HammerCLIForeman.record_to_common_format(response)

data/lib/hammer_cli_katello/filter_rule.rb

@@ -61,10 +61,6 @@ module HammerCLIKatello
       success_message _("Filter rule deleted")
       failure_message _("Could not delete the filter rule")
 
-      def request_params
-        super.merge(method_options)
-      end
-
       build_options
     end
 

data/lib/hammer_cli_katello/gpg_key.rb

@@ -42,7 +42,7 @@ module HammerCLIKatello
       success_message _("GPG Key created")
       failure_message _("Could not create GPG Key")
 
-      build_options  :without => [:content]
+      build_options :without => [:content]
       option "--key", "GPG_KEY_FILE", _("GPG Key file"),
              :attribute_name => :option_content,
              :required => true,
@@ -69,7 +69,4 @@ module HammerCLIKatello
     autoload_subcommands
   end
 
-  HammerCLI::MainCommand.subcommand("gpg",
-                                    _("manipulate GPG Key actions on the server"),
-                                    HammerCLIKatello::GpgKeyCommand)
 end

data/lib/hammer_cli_katello/host_collection.rb

@@ -3,6 +3,22 @@ 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 content host ids to replace the content hosts in host collection"),
+                    :format => HammerCLI::Options::Normalizers::List.new
+      end
+
+      def request_params
+        params = super
+        params['system_uuids'] = option_system_ids unless option_system_ids.nil?
+        params.delete('system_ids') if params.keys.include? 'system_ids'
+        params
+      end
+    end
+
     class ListCommand < HammerCLIKatello::ListCommand
       resource :host_collections, :index
 
@@ -17,12 +33,19 @@ module HammerCLIKatello
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
+      include UuidRequestable
       resource :host_collections, :create
+      def request_params
+        super.tap do |params|
+          if params['max_content_hosts'] && params['unlimited_content_hosts'].nil?
+            params['unlimited_content_hosts'] = false
+          end
+        end
+      end
 
       success_message _("Host collection created")
       failure_message _("Could not create the host collection")
-
-      build_options
+      build_options :without => [:system_uuids]
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
@@ -41,8 +64,7 @@ module HammerCLIKatello
       command_name "content-hosts"
 
       output do
-        field :id, _("ID")
-        field :uuid, _("UUID")
+        field :uuid, _("ID")
         field :name, _("Name")
       end
 
@@ -66,10 +88,11 @@ 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
+      build_options :without => [:system_uuids]
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
@@ -81,11 +104,26 @@ module HammerCLIKatello
       build_options
     end
 
-    HammerCLIKatello::AssociatingCommands::ContentHost.extend_command(self)
+    class AddContentHostCommand < HammerCLIKatello::SingleResourceCommand
+      command_name 'add-content-host'
+      action :add_systems
+
+      success_message _("The content host(s) has been added")
+      failure_message _("Could not add content host(s)")
+
+      build_options
+    end
+
+    class RemoveContentHostCommand < HammerCLIKatello::SingleResourceCommand
+      command_name 'remove-content-host'
+      action :remove_systems
+
+      success_message _("The content host(s) has been removed")
+      failure_message _("Could not remove content host(s)")
+
+      build_options
+    end
 
     autoload_subcommands
   end
 end
-
-HammerCLI::MainCommand.subcommand 'host-collection', _("Manipulate host collections"),
-                                  HammerCLIKatello::HostCollection

data/lib/hammer_cli_katello/id_resolver.rb

@@ -1,15 +1,36 @@
 module HammerCLIKatello
 
-  class Searchables
+  class Searchables < HammerCLIForeman::Searchables
 
     SEARCHABLES = {
-      :organization => [
-        HammerCLIForeman::Searchable.new("name", _("Name to search by")),
-        HammerCLIForeman::Searchable.new("label", _("Label to search by"), :editable => false)
-      ]
+      :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"))],
+      :lifecycle_environment => [s_name(_("Lifecycle environment name to search by"))],
+      :organization =>          [s_name(_("Organization name to search by")),
+                                 s("label", _("Organization label to search by"),
+                                   :editable => false)
+                                ],
+      :product =>               [s_name(_("Product name to search by"))],
+      :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"))],
+      :sync_plan =>             [s_name(_("Sync plan name to search by"))],
+      :task =>                  [s_name(_("Task name to search by"))],
+      :user =>                  [s_name(_("User name to search by"))],
+      :content_view_puppet_module => [
+        s_name(_("Puppet module name to search by")),
+        s("author", _("Puppet module's author to search by")),
+        s("uuid", _("Puppet module's UUID to search by"))
+      ],
+      :content_view =>         [s_name(_("Content view name"))],
+      :content_view_version => [s("version", _("Content view version number"))]
     }
 
-    DEFAULT_SEARCHABLES = [HammerCLIForeman::Searchable.new("name", _("Name to search by"))]
+    DEFAULT_SEARCHABLES = [s_name(_("Name to search by"))]
 
     def for(resource)
       SEARCHABLES[resource.singular_name.to_sym] || DEFAULT_SEARCHABLES
@@ -23,17 +44,71 @@ module HammerCLIKatello
       options[HammerCLI.option_accessor_name("id")] || find_resource(:systems, options)['uuid']
     end
 
-    def create_search_options(options, resource)
-      return super if resource.name == :organizations
+    def environment_id(options)
+      lifecycle_environment_id(options)
+    end
+
+    def repository_id(options)
+      key_id = HammerCLI.option_accessor_name("id")
+      key_product_id = HammerCLI.option_accessor_name("product_id")
+
+      return options[key_id] if options[key_id]
+
+      options[key_product_id] ||= product_id(scoped_options("product", options))
+      find_resource(:repositories, options)['id']
+    end
+
+    def content_view_version_id(options)
+      key_id = HammerCLI.option_accessor_name("id")
+      key_environment_id = HammerCLI.option_accessor_name("environment_id")
+
+      return options[key_id] if options[key_id]
+
+      begin
+        options[key_environment_id] ||= lifecycle_environment_id(
+          scoped_options("environment", options)
+        )
+      rescue HammerCLIForeman::MissingSeachOptions # rubocop:disable HandleExceptions
+        # Intentionally suppressing the exception,
+        # environment is not always required.
+      end
+      find_resource(:content_view_versions, options)['id']
+    end
+
+    def create_repositories_search_options(options)
+      search_options = {}
+      search_options['name'] = options[HammerCLI.option_accessor_name("name")]
+      search_options['product_id'] = options[HammerCLI.option_accessor_name("product_id")]
+      search_options
+    end
+
+    def create_content_view_versions_search_options(options)
+      environment_id = options[HammerCLI.option_accessor_name("environment_id")]
+      version = options[HammerCLI.option_accessor_name("version")]
+
+      search_options = {}
+      search_options['environment_id'] = environment_id if environment_id
+      search_options['version'] = version if version
+      search_options
+    end
+
+    def create_organizations_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:organizations))
+    end
 
+    def create_search_options_with_katello_api(options, resource)
+      search_options = {}
       searchables(resource).each do |s|
         value = options[HammerCLI.option_accessor_name(s.name.to_s)]
         if value
-          return {"#{s.name}" => "#{value}"}
+          search_options.update("#{s.name}" => "#{value}")
         end
       end
-      {}
+      search_options
     end
+    # alias_method_chain :create_search_options, :katello_api
+    alias_method :create_search_options_without_katello_api, :create_search_options
+    alias_method :create_search_options, :create_search_options_with_katello_api
 
   end
 end