hammer_cli_katello 0.24.0 → 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,78 @@
+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(: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
+
+    class ListCommand < HammerCLIKatello::ListCommand
+      desc "View content view import histories"
+      output do
+        field :id, _('ID')
+        field :path, _('Path')
+        field :type, _('Type')
+        field :content_view_version, _('Content View Version')
+        field :content_view_version_id, _('Content View Version ID')
+        field :created_at, _('Created at')
+        field :updated_at, _('Updated at'), Fields::Field, :hide_blank => true
+      end
+
+      build_options
+    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|
@@ -278,285 +271,6 @@ module HammerCLIKatello
       end
     end
 
-    class ExportHistoriesCommand < HammerCLIKatello::ListCommand
-      desc "View content view export histories"
-      command_name "export-histories"
-      action :export_histories
-
-      output do
-        field :id, _('ID')
-        field :destination_server, _('Destination Server')
-        field :path, _('Path')
-        field :content_view_version, _('Content View Version')
-        field :content_view_version_id, _('Content View Version ID')
-        field :created_at, _('Created at')
-        field :updated_at, _('Updated at'), Fields::Field, :hide_blank => true
-      end
-
-      build_options
-    end
-
-    class ExportDefaultCommand < HammerCLIForeman::Command
-      include HammerCLIKatello::LocalHelper
-      include HammerCLIKatello::ApipieHelper
-
-      PUBLISHED_REPOS_DIR = "/var/lib/pulp/published/yum/https/repos/".freeze
-
-      desc _('Export the library default content view')
-
-      command_name "export-default"
-
-      option '--export-dir', 'EXPORT_DIR', _("Directory to put content view version export into.")
-
-      validate_options do
-        option(:option_export_dir).required
-      end
-
-      build_options
-
-      def execute
-        export_dir = options['option_export_dir']
-
-        Dir.mkdir(export_dir) unless Dir.exist?(export_dir)
-        result = Kernel.system("rsync -aL #{PUBLISHED_REPOS_DIR} #{export_dir}")
-        if result == true
-          output.print_message _("Default content view export is available at #{export_dir}")
-          HammerCLI::EX_OK
-        else
-          output.print_error _("Could not export the default content view at #{export_dir}")
-          HammerCLI::EX_CANTCREAT
-        end
-      end
-    end
-
-    class LegacyExportCommand < HammerCLIKatello::SingleResourceCommand
-      include HammerCLIForemanTasks::Async
-      include LifecycleEnvironmentNameMapping
-      desc _('Export a content view (legacy method)')
-
-      action :export
-      command_name "export-legacy"
-
-      success_message _("Content view is being exported in task %{id}.")
-      failure_message _("Could not export the content view")
-
-      build_options do |o|
-        o.expand(:all).including(:environments, :content_views, :organizations)
-      end
-
-      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
-    end
-
-    class ExportCommand < HammerCLIForeman::Command
-      include HammerCLIKatello::LocalHelper
-      include HammerCLIKatello::ApipieHelper
-      include HammerCLIKatello::CVImportExportHelper
-
-      PUBLISHED_REPOS_DIR = "/var/lib/pulp/published/yum/https/repos/".freeze
-
-      desc _('Export a content view version')
-
-      command_name "export"
-
-      success_message _("Content view export is available in %{directory}.")
-      failure_message _("Could not export the content view")
-
-      option "--id", "ID", _("Content View Version numeric identifier")
-      option '--export-dir', 'EXPORT_DIR', _("Directory to put content view version export into.")
-
-      validate_options do
-        option(:option_export_dir).required
-        option(:option_id).required
-      end
-
-      build_options
-
-      def execute
-        cvv = show(:content_view_versions, 'id' => options['option_id'])
-        cv = show(:content_views, 'id' => cvv['content_view_id'])
-
-        composite = cv["composite"]
-
-        export_json_options = { :cvv => cvv }
-
-        if composite
-          components = cv['components']
-          export_json_options[:component_cvvs] = components.collect do |component|
-            component['name']
-          end
-          export_json_options[:repositories] = []
-        else
-          repositories = fetch_exportable_cvv_repositories(cvv)
-          collect_packages(repositories)
-
-          export_json_options[:repositories] = repositories
-        end
-
-        json = export_json(export_json_options)
-        if repositories&.any? || cv['composite']
-          create_tar(cv, cvv, repositories, json)
-        else
-          msg = <<~MSG
-            Ensure the content view version '#{cvv['name']}' has at least one repository.
-          MSG
-          raise _(msg)
-        end
-        return HammerCLI::EX_OK
-      end
-
-      def create_tar(cv, cvv, repositories, json)
-        export_prefix = "export-#{cv['label']}-#{cvv['major']}.#{cvv['minor']}"
-        export_file = "#{export_prefix}.json"
-        export_repos_tar = "#{export_prefix}-repos.tar"
-        export_tar = "#{export_prefix}.tar"
-        export_dir = File.expand_path(options['option_export_dir'].to_s)
-
-        Dir.mkdir("#{export_dir}/#{export_prefix}")
-
-        if repositories&.any?
-
-          Dir.chdir(PUBLISHED_REPOS_DIR) do
-            repo_tar = "#{export_dir}/#{export_prefix}/#{export_repos_tar}"
-            repo_dirs = []
-
-            repositories.each do |repo|
-              repo_dirs.push(repo['relative_path'])
-            end
-
-            `tar cvfh #{repo_tar} #{repo_dirs.join(" ")}`
-          end
-        end
-
-        Dir.chdir("#{export_dir}/#{export_prefix}") do
-          File.open(export_file, 'w') do |file|
-            file.write(JSON.pretty_generate(json))
-          end
-        end
-
-        Dir.chdir(export_dir) do
-          `tar cf #{export_tar} #{export_prefix}`
-          FileUtils.rm_rf(export_prefix)
-        end
-      end
-    end
-
-    class ImportCommand < HammerCLIForeman::Command
-      include HammerCLIForemanTasks::Async
-      include HammerCLIKatello::LocalHelper
-      include HammerCLIKatello::ApipieHelper
-      include HammerCLIKatello::CVImportExportHelper
-
-      attr_accessor :export_tar_dir, :export_tar_file, :export_tar_prefix
-
-      desc _('Import a content view version')
-
-      command_name "import"
-
-      success_message _("Content view imported.")
-      failure_message _("Could not import the content view")
-
-      option "--organization-id", "ORGANIZATION_ID", _("Organization numeric identifier")
-      option(
-        '--export-tar', 'EXPORT_TAR',
-        _("Location of export tar on disk")
-      )
-
-      validate_options do
-        option(:option_export_tar).required
-        option(:option_organization_id).required
-      end
-
-      build_options
-
-      # rubocop:disable Metrics/AbcSize
-      def execute
-        unless File.exist?(options['option_export_tar'])
-          raise _("Export tar #{options['option_export_tar']} does not exist.")
-        end
-
-        import_tar_params = obtain_export_params(options['option_export_tar'])
-        untar_export(import_tar_params)
-
-        export_json = read_json(import_tar_params)
-        cv = content_view(export_json['name'], options['option_organization_id'])
-        major = export_json['major'].to_s
-        minor = export_json['minor'].to_s
-        import_checks(export_json, cv, major, minor)
-
-        if export_json['composite_components']
-          composite_version_ids = export_json['composite_components'].map do |component|
-            find_local_component_id(component)
-          end
-          update(:content_views, 'id' => cv['id'], 'component_ids' => composite_version_ids)
-          publish(cv['id'], export_json['major'], export_json['minor'])
-        else
-          sync_repositories(export_json['repositories'], options['option_organization_id'],
-            import_tar_params)
-
-          unless cv['default']
-            publish(
-              cv['id'], export_json['major'],
-              export_json['minor'], repos_units(export_json['repositories'])
-            )
-          end
-        end
-        return HammerCLI::EX_OK
-      end
-      # rubocop:enable Metrics/AbcSize
-
-      def sync_repositories(repositories, organization_id, options)
-        export_tar_dir =  options[:dirname]
-        export_tar_prefix = options[:prefix]
-
-        repositories.each do |repo|
-          library_repos = index(
-            :repositories,
-            'organization_id' => organization_id,
-            'library' => true
-          )
-
-          library_repo = library_repos.select do |candidate_repo|
-            candidate_repo['label'] == repo['label']
-          end
-
-          library_repo = library_repo.first
-
-          if library_repo.nil?
-            msg = _("Unable to sync repositories, no library repository found for %s")
-            raise msg % repo['label']
-          end
-
-          synchronize(
-            library_repo['id'],
-            "file://#{export_tar_dir}/#{export_tar_prefix}/#{repo['relative_path']}"
-          )
-        end
-      end
-
-      def repos_units(repositories)
-        repositories.collect do |repo|
-          {
-            'label' => repo['label'],
-            'rpm_filenames' => repo['rpm_filenames']
-          }
-        end
-      end
-
-      def content_view(name, organization_id)
-        index(:content_views, 'name' => name, 'organization_id' => organization_id).first
-      end
-
-      def synchronize(id, source_url)
-        task_progress(call(:sync, :repositories, 'id' => id, 'source_url' => source_url))
-      end
-
-      def publish(id, major, minor, repos_units = nil)
-        params = {'id' => id, 'major' => major, 'minor' => minor }
-        params['repos_units'] = repos_units if repos_units
-        task_progress(call(:publish, :content_views, params))
-      end
-    end
-
     autoload_subcommands
   end
 end