hammer_cli_katello 0.24.4 → 1.1.2

data/lib/hammer_cli_katello/host_package_group.rb

@@ -14,6 +14,14 @@ module HammerCLIKatello
       end
 
       build_options :without => [:packages]
+
+      def execute
+        warn "This command uses katello agent and will be removed in favor of remote execution " \
+          "in a future release."
+        warn "The remote execution equivalent is `hammer job-invocation create --feature " \
+          "katello_group_install`."
+        super
+      end
     end
 
     class RemoveCommand < HammerCLIKatello::SingleResourceCommand
@@ -28,6 +36,14 @@ module HammerCLIKatello
       end
 
       build_options :without => [:packages]
+
+      def execute
+        warn "This command uses katello agent and will be removed in favor of remote execution " \
+          "in a future release."
+        warn "The remote execution equivalent is `hammer job-invocation create --feature " \
+          "katello_group_remove`."
+        super
+      end
     end
 
     autoload_subcommands

data/lib/hammer_cli_katello/hostgroup_extensions.rb

@@ -45,22 +45,22 @@ module HammerCLIKatello
     ::HammerCLIForeman::Hostgroup::InfoCommand.instance_eval do
       output do
         label _("Content View") do
-          field :content_view_id, _("ID")
+          field :content_view_id, _("Id")
           field :content_view_name, _("Name")
         end
 
         label _("Lifecycle Environment") do
-          field :lifecycle_environment_id, _("ID")
+          field :lifecycle_environment_id, _("Id")
           field :lifecycle_environment_name, _("Name")
         end
 
         label _("Content Source") do
-          field :content_source_id, _("ID")
+          field :content_source_id, _("Id")
           field :content_source_name, _("Name")
         end
 
         label _("Kickstart Repository") do
-          field :kickstart_repository_id, _("ID")
+          field :kickstart_repository_id, _("Id")
           field :kickstart_repository_name, _("Name")
         end
       end

data/lib/hammer_cli_katello/id_resolver.rb

@@ -28,12 +28,9 @@ module HammerCLIKatello
       :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"))],
-      :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_version => [s("version", _("Content view version number"))]
+      :content_view_version => [s("version", _("Content view version number"))],
+      :content_export       => [],
+      :content_import       => []
     }.freeze
 
     DEFAULT_SEARCHABLES = [s_name(_("Name to search by"))].freeze

data/lib/hammer_cli_katello/lifecycle_environment.rb

@@ -29,7 +29,7 @@ module HammerCLIKatello
 
     class ListCommand < HammerCLIKatello::ListCommand
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         from :prior do
           field :name, _("Prior")
@@ -57,7 +57,7 @@ module HammerCLIKatello
 
     class InfoCommand < HammerCLIKatello::InfoCommand
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :label, _("Label")
         field :description, _("Description")

data/lib/hammer_cli_katello/module_stream.rb

@@ -10,10 +10,10 @@ module HammerCLIKatello
       validate_repo_name_requires_product_options(:option_repository_name)
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Module Stream Name")
         field :stream, _("Stream")
-        field :uuid, _("UUID")
+        field :uuid, _("Uuid")
         field :version, _("Version")
         field :arch, _("Architecture")
         field :context, _("Context")
@@ -30,30 +30,30 @@ module HammerCLIKatello
       validate_repo_name_requires_product_options(:option_repository_name)
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Module Stream Name")
         field :stream, _("Stream")
-        field :uuid, _("UUID")
+        field :uuid, _("Uuid")
         field :version, _("Version")
         field :arch, _("Architecture")
         field :context, _("Context")
 
         collection :repositories, _("Repositories") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
         collection :artifacts, _("Artifacts") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
         end
 
         collection :profiles, _("Profiles") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           collection :rpms, _("RPMs") do
-            field :id, _("ID")
+            field :id, _("Id")
             field :name, _("Name")
           end
         end

data/lib/hammer_cli_katello/organization.rb

@@ -21,9 +21,19 @@ module HammerCLIKatello
         field :label, _("Label")
         field :description, _("Description")
         field :redhat_repository_url, _("Red Hat Repository URL")
+        field :simple_content_access_label, _("Simple Content Access")
         field :service_levels, _("Service Levels"), Fields::List
       end
 
+      def extend_data(data)
+        data["simple_content_access_label"] = if data["simple_content_access"]
+                                                _("Enabled")
+                                              else
+                                                _("Disabled")
+                                              end
+        data
+      end
+
       build_options
     end
 

data/lib/hammer_cli_katello/organization_options.rb

@@ -1,12 +1,14 @@
 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
+      base.option_family do
+        parent '--organization-id', 'ORGANIZATION_ID',
+               _('Organization ID to search by'), attribute_name: :option_organization_id
+        child '--organization', 'ORGANIZATION_NAME',
+              _('Organization name to search by'), attribute_name: :option_organization_name
+        child '--organization-label', 'ORGANIZATION_LABEL',
+              _('Organization label to search by'), attribute_name: :option_organization_label
+      end
     end
 
     def org_options

data/lib/hammer_cli_katello/ostree_branch.rb

@@ -8,7 +8,7 @@ module HammerCLIKatello
       validate_repo_name_requires_product_options(:option_repository_name)
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :version, _("version")
       end
@@ -20,7 +20,7 @@ module HammerCLIKatello
 
     class InfoCommand < HammerCLIKatello::InfoCommand
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :version, _("Version")
         field :commit, _("Commit")

data/lib/hammer_cli_katello/package.rb

@@ -7,7 +7,7 @@ module HammerCLIKatello
       include LifecycleEnvironmentNameMapping
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :filename, _("Filename")
         field :sourcerpm, _("Source RPM")
       end
@@ -44,9 +44,9 @@ module HammerCLIKatello
 
     class InfoCommand < HammerCLIKatello::InfoCommand
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :pulp_id, _("Pulp ID")
-        field :uuid, _("UUID")
+        field :uuid, _("Uuid")
         field :name, _("Name")
         field :version, _("Version")
         field :arch, _("Architecture")
@@ -55,7 +55,7 @@ module HammerCLIKatello
         field :author, _("Author")
         field :filename, _("Filename")
         field :sourcerpm, _("Source rpm")
-        field :nvrea, _("nvrea")
+        field :nvrea, _("Nvrea")
         field :buildhost, _("Build Host")
         field :hosts_available_count, _("Available Host Count")
         field :hosts_applicable_count, _("Applicable Host Count")
@@ -65,7 +65,7 @@ module HammerCLIKatello
         field :relativepath, _("Relative Path")
         field :description, _("Description")
         field :summary, _("Summary")
-        field :url, _("URL")
+        field :url, _("Url")
         field :build_time, _("Build Time")
         field :group, _("Group")
         field :requires, _("Requires")

data/lib/hammer_cli_katello/package_group.rb

@@ -8,10 +8,10 @@ module HammerCLIKatello
       validate_repo_name_requires_product_options(:option_repository_name)
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Package Group Name")
         field :repo_name, _("Repository Name")
-        field :uuid, _("UUID")
+        field :uuid, _("Uuid")
       end
 
       def extend_data(data)
@@ -26,10 +26,10 @@ module HammerCLIKatello
 
     class InfoCommand < HammerCLIKatello::InfoCommand
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Package Group Name")
         field :repo_name, _("Repository Name")
-        field :uuid, _("UUID")
+        field :uuid, _("Uuid")
         field :description, _("Description")
         field :default_package_names, _("Default Packages"), Fields::List
         field :mandatory_package_names, _("Mandatory Packages"), Fields::List

data/lib/hammer_cli_katello/ping.rb

@@ -6,6 +6,14 @@ module HammerCLIKatello
 
     output do
       from "services" do
+        label "katello_agent", hide_blank: true do
+          from "katello_agent" do
+            field "status", _("Status"), Fields::Field, hide_blank: true
+            field "message", _("message"), Fields::Field, hide_blank: true
+            field "_response", _("Server Response"), Fields::Field, hide_blank: true
+          end
+        end
+
         label "candlepin" do
           from "candlepin" do
             field "status", _("Status")
@@ -13,17 +21,17 @@ module HammerCLIKatello
           end
         end
 
-        label "candlepin_events" do
-          from "candlepin_events" do
+        label "candlepin_auth" do
+          from "candlepin_auth" do
             field "status", _("Status")
-            field "message", _("message")
             field "_response", _("Server Response")
           end
         end
 
-        label "candlepin_auth" do
-          from "candlepin_auth" do
+        label "candlepin_events" do
+          from "candlepin_events" do
             field "status", _("Status")
+            field "message", _("message")
             field "_response", _("Server Response")
           end
         end
@@ -36,20 +44,6 @@ module HammerCLIKatello
           end
         end
 
-        label "pulp", :hide_blank => true do
-          from "pulp" do
-            field "status", _("Status"), Fields::Field, :hide_blank => true
-            field "_response", _("Server Response"), Fields::Field, :hide_blank => true
-          end
-        end
-
-        label "pulp_auth", :hide_blank => true do
-          from "pulp_auth" do
-            field "status", _("Status"), Fields::Field, :hide_blank => true
-            field "_response", _("Server Response"), Fields::Field, :hide_blank => true
-          end
-        end
-
         label "pulp3", :hide_blank => true do
           from "pulp3" do
             field "status", _("Status"), Fields::Field, :hide_blank => true

data/lib/hammer_cli_katello/product.rb

@@ -4,7 +4,7 @@ module HammerCLIKatello
 
     class ListCommand < HammerCLIKatello::ListCommand
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :description, _("Description")
 
@@ -28,7 +28,7 @@ module HammerCLIKatello
 
     class InfoCommand < HammerCLIKatello::InfoCommand
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :label, _("Label")
         field :description, _("Description")
@@ -61,7 +61,7 @@ module HammerCLIKatello
         collection :product_content, _("Content") do
           from :content do
             field :name, _("Repo Name")
-            field :contentUrl, _("URL")
+            field :contentUrl, _("Url")
             field :type, _("Content Type")
           end
         end

data/lib/hammer_cli_katello/product_content.rb

@@ -7,10 +7,10 @@ module HammerCLIKatello
 
         output do
           from :content do
-            field :id, _("ID")
+            field :id, _("Id")
             field :name, _("Name")
             field :type, _("Type")
-            field :contentUrl, _("URL")
+            field :contentUrl, _("Url")
             field :gpgUrl, _("GPG Key")
             field :label, _("Label")
           end

data/lib/hammer_cli_katello/repository.rb

@@ -2,6 +2,25 @@ module HammerCLIKatello
   class Repository < HammerCLIKatello::Command
     resource :repositories
 
+    module AnsibleCollectionRequirementsHelper
+      def self.included(base)
+        base.option "--ansible-collection-requirements-file",
+                    "REQUIREMENTS_FILE", _("Location of the ansible collections "\
+                                         "requirements.yml file. "),
+                    :attribute_name => :option_ansible_collection_requirements_file,
+                    :required => false
+      end
+
+      def request_params
+        super.tap do |opts|
+          requirements_file = option_ansible_collection_requirements_file
+          if requirements_file
+            opts["ansible_collection_requirements"] = File.read(requirements_file)
+          end
+        end
+      end
+    end
+
     class ListCommand < HammerCLIKatello::ListCommand
       include LifecycleEnvironmentNameMapping
 
@@ -12,7 +31,7 @@ module HammerCLIKatello
           field :name, _("Product")
         end
         field :content_type, _("Content Type")
-        field :url, _("URL")
+        field :url, _("Url")
       end
 
       build_options
@@ -27,7 +46,7 @@ module HammerCLIKatello
       validate_repo_name_requires_product_options
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :label, _("Label")
         field :description, _("Description")
@@ -38,7 +57,7 @@ module HammerCLIKatello
         field :content_type, _("Content Type")
         field :checksum_type, _("Checksum Type"), Fields::Field, :hide_blank => true
         field :_mirror_on_sync, _("Mirror on Sync")
-        field :url, _("URL")
+        field :url, _("Url")
         field :_publish_via_http, _("Publish Via HTTP")
         field :full_path, _("Published At")
         field :relative_path, _("Relative Path")
@@ -57,7 +76,7 @@ module HammerCLIKatello
 
         label _("HTTP Proxy") do
           from :http_proxy do
-            field :id, _("ID"), Fields::Field, :hide_blank => true
+            field :id, _("Id"), Fields::Field, :hide_blank => true
             field :name, _("Name"), Fields::Field, :hide_blank => true
             field :policy, _("HTTP Proxy Policy"), Fields::Field, :hide_blank => true
           end
@@ -65,14 +84,14 @@ module HammerCLIKatello
 
         label _("Product") do
           from :product do
-            field :id, _("ID")
+            field :id, _("Id")
             field :name, _("Name")
           end
         end
 
         label _("GPG Key") do
           from :gpg_key do
-            field :id, _("ID"), Fields::Field, :hide_blank => true
+            field :id, _("Id"), Fields::Field, :hide_blank => true
             field :name, _("Name"), Fields::Field, :hide_blank => true
           end
         end
@@ -90,7 +109,6 @@ module HammerCLIKatello
           field :srpm_total, _("Source RPMS"), Fields::Field, :hide_blank => true
           field :package_group_total, _("Package Groups"), Fields::Field, :hide_blank => true
           field :errata_total, _("Errata"), Fields::Field, :hide_blank => true
-          field :puppet_total, _("Puppet Modules"), Fields::Field, :hide_blank => true
           field :docker_manifest_list_total, _("Container Image Manifest Lists"),
                                            Fields::Field, :hide_blank => true
           field :docker_manifest_total, _("Container Image Manifests"), Fields::Field,
@@ -145,8 +163,6 @@ module HammerCLIKatello
           data["docker_manifest_list_total"] = content_counts["docker_manifest_list"]
           data["docker_manifest_total"] = content_counts["docker_manifest"]
           data["docker_tag_total"] = content_counts["docker_tag"]
-        when "puppet"
-          data["puppet_total"] = content_counts["puppet_module"]
         when "ostree"
           setup_ostree(data)
         when "file"
@@ -195,6 +211,7 @@ module HammerCLIKatello
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
+      include AnsibleCollectionRequirementsHelper
       success_message _("Repository created.")
       failure_message _("Could not create the repository")
 
@@ -202,39 +219,12 @@ module HammerCLIKatello
              :attribute_name => :option_unprotected,
              :format => HammerCLI::Options::Normalizers::Bool.new
 
-      option "--ssl-client-cert", "SSL_CLIENT_CERT",
-             _("Name of content credential containing client certificate"),
-             :attribute_name => :option_ssl_client_cert
-
-      option "--ssl-client-key", "SSL_CLIENT_KEY",
-             _("Name of content credential containing client key"),
-             :attribute_name => :option_ssl_client_key
-
-      option "--ssl-ca-cert", "SSL_CA_CERT",
-             _("Name of content credential containing CA certificate"),
-             :attribute_name => :option_ssl_ca_cert
-
       build_options :without => [:unprotected]
-
-      def request_params
-        params = super
-
-        params["ssl_client_cert_id"] ||= get_gpg_key_id("ssl_client_cert") if option_ssl_client_cert
-        params["ssl_client_key_id"] ||= get_gpg_key_id("ssl_client_key") if option_ssl_client_key
-        params["ssl_ca_cert_id"] ||= get_gpg_key_id("ssl_ca_cert") if option_ssl_ca_cert
-
-        params
-      end
-
-      def get_gpg_key_id(ssl_type)
-        options_clone = options.clone
-        options_clone["option_gpg_key_name"] = self.send("option_#{ssl_type}")
-        resolver.gpg_key_id(resolver.scoped_options("gpg_key", options_clone))
-      end
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
       extend RepositoryScopedToProduct
+      include AnsibleCollectionRequirementsHelper
 
       validate_repo_name_requires_product_options
       include OrganizationOptions