hammer_cli_katello 0.24.1 → 1.0.1

data/lib/hammer_cli_katello/cv_import_export_helper.rb

@@ -162,5 +162,26 @@ module HammerCLIKatello
       end
       json
     end
+
+    def fail_msg_import
+      _("This command is not supported with Pulp 3. Use `hammer content-import` instead.")
+    end
+
+    def fail_msg_export
+      _("This command is not supported with Pulp 3. Use `hammer content-export` instead.")
+    end
+
+    def validate_pulp3_not_enabled(failure_message)
+      pulp3_enabled = HammerCLIForeman
+                      .foreman_api_connection
+                      .resource(:content_exports)
+                      .call(:api_status)['api_usable']
+      if pulp3_enabled
+        raise failure_message
+      end
+    rescue NoMethodError
+      # if the api endpoint isn't there, the validation passes
+      true
+    end
   end
 end

data/lib/hammer_cli_katello/deb_package.rb

@@ -7,7 +7,7 @@ module HammerCLIKatello
       include LifecycleEnvironmentNameMapping
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :filename, _("Filename")
       end
 
@@ -43,9 +43,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 :checksum, _("checksum")

data/lib/hammer_cli_katello/erratum.rb

@@ -10,7 +10,7 @@ module HammerCLIKatello
       validate_repo_name_requires_product_options(:option_repository_name)
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :errata_id, _("Errata ID")
         field :type, _("Type")
         field :title, _("Title")

data/lib/hammer_cli_katello/erratum_info_command.rb

@@ -7,7 +7,7 @@ module HammerCLIKatello
       field :version, _("Version")
       field :description, _("Description")
       field :status, _("Status")
-      field :id, _("ID")
+      field :id, _("Id")
       field :errata_id, _("Errata ID")
       field :reboot_suggested, _("Reboot Suggested")
       field :updated, _("Updated")

data/lib/hammer_cli_katello/file.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 :path, _("Path")
       end
@@ -28,10 +28,10 @@ module HammerCLIKatello
 
     class InfoCommand < HammerCLIKatello::InfoCommand
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :path, _("Path")
-        field :uuid, _("UUID")
+        field :uuid, _("Uuid")
         field :checksum, _("Checksum")
       end
 

data/lib/hammer_cli_katello/filter.rb

@@ -34,13 +34,13 @@ module HammerCLIKatello
         field :description, _("Description")
 
         collection :repositories, _("Repositories") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
         collection :rules, _("Rules") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name"), Fields::Field, :hide_blank => true
           field :version, _("Version"), Fields::Field, :hide_blank => true
           field :min_version, _("Minimum Version"), Fields::Field, :hide_blank => true

data/lib/hammer_cli_katello/foreman_search_options_creators.rb

@@ -48,18 +48,6 @@ module HammerCLIKatello
       create_search_options_without_katello_api(options, api.resource(:ptables), mode)
     end
 
-    def create_puppet_ca_proxies_search_options(options, mode = nil)
-      create_search_options_without_katello_api(options, api.resource(:puppet_ca_proxies), mode)
-    end
-
-    def create_puppet_proxies_search_options(options, mode = nil)
-      create_search_options_without_katello_api(options, api.resource(:puppet_proxies), mode)
-    end
-
-    def create_puppetclasses_search_options(options, mode = nil)
-      create_search_options_without_katello_api(options, api.resource(:puppetclasses), mode)
-    end
-
     def create_subnets_search_options(options, mode = nil)
       create_search_options_without_katello_api(options, api.resource(:subnets), mode)
     end

data/lib/hammer_cli_katello/host_collection.rb

@@ -28,7 +28,7 @@ module HammerCLIKatello
       resource :host_collections, :index
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :_limit, _("Limit")
         field :description, _("Description")
@@ -99,7 +99,7 @@ module HammerCLIKatello
       end
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         from :content_facet_attributes do
           from :errata_counts do

data/lib/hammer_cli_katello/host_deb.rb

@@ -6,7 +6,7 @@ module HammerCLIKatello
       resource :host_debs, :index
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :version, _("Version")
         field :architecture, _("Arch")

data/lib/hammer_cli_katello/host_errata.rb

@@ -21,7 +21,7 @@ module HammerCLIKatello
       command_name "list"
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :errata_id, _("Erratum ID")
         field :type, _("Type")
         field :title, _("Title")

data/lib/hammer_cli_katello/host_extensions.rb

@@ -41,22 +41,22 @@ module HammerCLIKatello
         label _('Content Information') do
           from :content_facet_attributes 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
 
@@ -75,7 +75,7 @@ module HammerCLIKatello
 
         label _('Subscription Information') do
           from :subscription_facet_attributes do
-            field :uuid, _('UUID')
+            field :uuid, _('Uuid')
             field :last_checkin, _('Last Checkin')
             field :release_version, _('Release Version')
             field :autoheal, _('Autoheal')

data/lib/hammer_cli_katello/host_package.rb

@@ -6,7 +6,7 @@ module HammerCLIKatello
       resource :host_packages, :index
 
       output do
-        field :nvra, _("NVRA")
+        field :nvra, _("Nvra")
       end
 
       build_options

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,11 +28,6 @@ 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"))]
     }.freeze
 
@@ -117,6 +112,7 @@ module HammerCLIKatello
       end
     end
 
+    # rubocop:disable Style/EmptyElse
     def content_view_version_id(options)
       key_id = HammerCLI.option_accessor_name("id")
       key_content_view_id = HammerCLI.option_accessor_name("content_view_id")
@@ -129,6 +125,8 @@ module HammerCLIKatello
       results = find_resources(:content_view_versions, options)
       options[from_environment_id] ||= from_lifecycle_environment_id(options)
 
+      return pick_result(results, @api.resource(:content_view_versions))['id'] if results.size == 1
+
       if results.size > 1 && options[from_environment_id]
         results_in_from_environment = results.select do |version|
           member_of_environment_ids = version['environments'].map { |env| env['id'].to_s }
@@ -137,9 +135,10 @@ module HammerCLIKatello
         results_in_from_environment
           .sort { |a, b| a['version'].to_f <=> b['version'].to_f }.last['id']
       else
-        pick_result(results, @api.resource(:content_view_versions))['id']
+        nil
       end
     end
+    # rubocop:enable Style/EmptyElse
 
     private
 

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_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