hammer_cli_katello 0.23.1 → 1.0

data/lib/hammer_cli_katello/content_export_incremental.rb

@@ -0,0 +1,25 @@
+module HammerCLIKatello
+  class ContentExportIncremental < HammerCLIKatello::Command
+    desc "Prepare content for an incremental export to a disconnected Katello"
+    resource :content_export_incrementals
+    command_name 'incremental'
+
+    class VersionCommand < HammerCLIKatello::SingleResourceCommand
+      desc _('Performs an incremental export of a content view version')
+      command_name "version"
+
+      include HammerCLIForemanTasks::Async
+      include ContentExportHelper
+    end
+
+    class LibraryCommand < HammerCLIKatello::SingleResourceCommand
+      desc _("Performs an incremental export of the organization's library environment")
+      command_name "library"
+
+      include HammerCLIForemanTasks::Async
+      include ContentExportHelper
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_katello/content_import.rb

@@ -0,0 +1,63 @@
+module HammerCLIKatello
+  class ContentImport < HammerCLIKatello::Command
+    desc "Import content from a content archive"
+    resource :content_imports
+
+    module ContentImportCommon
+      def self.included(base)
+        base.option "--metadata-file",
+                "METADATA_FILE", _("Location of the metadata.json file. "\
+                                   "This is not required if the metadata.json file"\
+                                   " is already in the archive directory."),
+                 :attribute_name => :option_metadata_file,
+                 :required => false
+
+        base.build_options do |o|
+          o.expand(:all).including(:content_views, :organizations).except(:metadata)
+        end
+
+        base.validate_options do
+          option(:option_path).required
+
+          metadata_file = option(:option_metadata_file).value ||
+                          File.join(option(:option_path).value, "metadata.json")
+          unless File.exist?(metadata_file)
+            msg = _("Unable to find '#{metadata_file}'. "\
+                     "If the metadata.json file is at a different location "\
+                     "provide it to the --metadata-file option ")
+            raise HammerCLI::Options::Validators::ValidationError, msg
+          end
+        end
+        base.success_message _("Archive is being imported in task %{id}.")
+        base.failure_message _("Could not import the archive.")
+      end
+
+      def request_params
+        super.tap do |opts|
+          metadata_file = option_metadata_file || File.join(option_path, "metadata.json")
+          opts["metadata"] = JSON.parse(File.read(metadata_file))
+        end
+      end
+    end
+
+    class VersionCommand < HammerCLIKatello::SingleResourceCommand
+      desc _('Imports a content archive to a content view version')
+      action :version
+      command_name "version"
+
+      include HammerCLIForemanTasks::Async
+      include ContentImportCommon
+    end
+
+    class LibraryCommand < HammerCLIKatello::SingleResourceCommand
+      desc _("Imports a content archive to an organization's library lifecycle environment")
+      action :library
+      command_name "library"
+
+      include HammerCLIForemanTasks::Async
+      include ContentImportCommon
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_katello/content_view.rb

@@ -1,4 +1,3 @@
-require 'hammer_cli_katello/content_view_puppet_module'
 require 'hammer_cli_katello/content_view_purge'
 require 'hammer_cli_katello/filter'
 require 'hammer_cli_katello/content_view_version'
@@ -29,13 +28,12 @@ module HammerCLIKatello
       include OrganizationOptions
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :label, _("Label")
         field :composite, _("Composite")
         field :description, _("Description")
         field :content_host_count, _("Content Host Count")
-        field :force_puppet_environment, _("Force Puppet")
         field :solve_dependencies, _("Solve Dependencies")
 
         from :organization do
@@ -43,43 +41,36 @@ module HammerCLIKatello
         end
 
         collection :_yum_repositories, _("Yum Repositories") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
         collection :_docker_repositories, _("Container Image Repositories") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
         collection :_ostree_repositories, _("OSTree Repositories") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
-        collection :puppet_modules, _("Puppet Modules") do
-          field :id, _("ID")
-          field :uuid, _("UUID"), Fields::Field, :hide_blank => true
-          field :name, _("Name")
-          field :author, _("Author")
-        end
-
         collection :environments, _("Lifecycle Environments") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
         end
 
         collection :versions, _("Versions") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :version, _("Version")
           field :published, _("Published"), Fields::Date
         end
 
         collection :components, _("Components") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
         end
 
@@ -106,10 +97,12 @@ module HammerCLIKatello
       failure_message _("Could not create the content view")
 
       option ["--composite"], :flag, _("Create a composite content view")
-
+      option ["--import-only"], :flag, _("Designate this Content View for "\
+                                         "importing from upstream servers only.")
       def request_params
         super.tap do |opts|
           opts['composite'] = option_composite? || false
+          opts['import_only'] = option_import_only? || false
         end
       end
 
@@ -244,13 +237,6 @@ module HammerCLIKatello
       action :remove
       command_name "remove"
 
-      option ["--content-view-version-ids"], "VERSION_IDS",
-             _("Version ids to remove"),
-            :format => HammerCLI::Options::Normalizers::List.new
-      option ["--lifecycle-environment-ids"], "LIFECYCLE_ENVIRONMENT_IDS",
-             _("Environment ids to remove"),
-            :format => HammerCLI::Options::Normalizers::List.new
-
       def option_sources
         sources = super
         sources.find_by_name('IdResolution').insert_relative(
@@ -283,10 +269,15 @@ module HammerCLIKatello
       command_name 'add-version'
       desc _('Add a content view version to a composite view')
 
-      option "--content-view-id", "CONTENT_VIEW_ID",
-        _("Content view numeric identifier to search by"),
-        attribute_name: :option_content_view_id,
-        format: HammerCLI::Options::Normalizers::Number.new
+      option_family do
+        parent "--content-view-id", "CONTENT_VIEW_ID",
+               _("Content view id to search by"),
+               attribute_name: :option_content_view_id,
+               format: HammerCLI::Options::Normalizers::Number.new
+        child "--content-view", "CONTENT_VIEW_NAME",
+              _("Content view name to search by"),
+              attribute_name: :option_content_view_name
+      end
 
       validate_options :before, 'IdResolution' do
         if option(:option_content_view_version_version).exist?
@@ -356,10 +347,6 @@ module HammerCLIKatello
 
     autoload_subcommands
 
-    subcommand 'puppet-module',
-               HammerCLIKatello::ContentViewPuppetModule.desc,
-               HammerCLIKatello::ContentViewPuppetModule
-
     subcommand HammerCLIKatello::Filter.command_name,
                HammerCLIKatello::Filter.desc,
                HammerCLIKatello::Filter

data/lib/hammer_cli_katello/content_view_version.rb

@@ -10,7 +10,7 @@ module HammerCLIKatello
       include LifecycleEnvironmentNameMapping
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :version, _("Version")
         field :description, _("Description")
@@ -35,7 +35,7 @@ module HammerCLIKatello
       resource :content_view_versions, :show
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :version, _("Version")
         field :description, _("Description")
@@ -47,23 +47,16 @@ module HammerCLIKatello
         end
 
         collection :environments, _("Lifecycle Environments") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
         collection :repositories, _("Repositories") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
-
-        collection :puppet_modules, _("Puppet Modules") do
-          field :id, _("ID")
-          field :name, _("Name")
-          field :author, _("Author")
-          field :version, _("Version")
-        end
       end
 
       build_options do |o|

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