hammer_cli_katello 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 81a158e8e77bef73123e89992746c3b24f9689ef
-  data.tar.gz: 417e144685491e014455d2c1eacb1d8caaba7d40
+SHA256:
+  metadata.gz: a5a0c1942a467a8de0c6ed9e0ea81e682488d7885bfe49f2921e9a2a6fd7e99f
+  data.tar.gz: c92458aa1299e5c707323fd9ad96422149400f676002fdd6497e2f171799caef
 SHA512:
-  metadata.gz: 3c53985e39d45ba73ac11d19e1cf4ea3c40f60204ac98d9f86f01cb8d69c556df92889fd89965b35b93500a7d4a93b5123b48790ea3575a8f57866765b79d7ad
-  data.tar.gz: 64a6b70c343bafd39bb7bce8db5bd1b029a9bdb13769befb5ddd0441c33b3fdd443779a3859f8b9c1b1dc0e5f0c4db28b7c1a351f5a82103cd936a1e4a878c06
+  metadata.gz: '0044948e47d6ada111b0cabb37a925d754b1b4b2e1b38519804886a1c6ebd593a847b429916c2c780efb86d95f4a653399738142b27117c8ce40d4abc20ea33d'
+  data.tar.gz: 3c363f5ddeba819dfc7b4fc3d531583b5c8c5f12d151147e3bd2addc65cd4fbf31b065c4bb6971a824c362092d1cbd79ee1588e1c717b2f5461d0b86f5708558

data/lib/hammer_cli_katello.rb

@@ -29,6 +29,7 @@ module HammerCLIKatello
   require 'hammer_cli_katello/id_name_options_validator'
   require 'hammer_cli_katello/local_helper'
   require 'hammer_cli_katello/apipie_helper'
+  require 'hammer_cli_katello/cv_import_export_helper'
 
   # commands
   HammerCLI::MainCommand.lazy_subcommand("activation-key", _("Manipulate activation keys"),

data/lib/hammer_cli_katello/activation_key.rb

@@ -146,7 +146,7 @@ module HammerCLIKatello
         field :id, _("ID")
         field :product_name, _("Name")
         field :format_consumed, _("Attached")
-        field :amount, _("Quantity")
+        field :quantity_attached, _("Quantity")
         field :start_date, _("Start Date"), Fields::Date
         field :end_date, _("End Date"), Fields::Date
         field :support_level, _("Support")
@@ -154,6 +154,12 @@ module HammerCLIKatello
         field :account_number, _("Account")
       end
 
+      def extend_data(data)
+        data["format_consumed"] = _("#{data['consumed']} out of "\
+				    "#{data['quantity'] == -1 ? 'Unlimited' : data['quantity']}")
+        data
+      end
+
       option '--id', "ACTIVATION_KEY_ID", _("ID of the activation key"),
         attribute_name: :option_activation_key_id
       option '--name', "ACTIVATION_KEY_NAME", _("Activation key name to search by"),

data/lib/hammer_cli_katello/apipie_helper.rb

@@ -8,6 +8,14 @@ module HammerCLIKatello
       call(:index, resource, options)['results']
     end
 
+    def update(resource, options = {})
+      call(:update, resource, options)['results']
+    end
+
+    def destroy(resource, options = {})
+      call(:destroy, resource, options)
+    end
+
     def call(action, resource, options = {})
       HammerCLIForeman.foreman_resource(resource).call(action, options)
     end

data/lib/hammer_cli_katello/content_view_purge.rb

@@ -1,6 +1,7 @@
 module HammerCLIKatello
   class ContentViewPurgeCommand < HammerCLIKatello::Command
     include HammerCLIForemanTasks::Async
+    include HammerCLIKatello::ApipieHelper
     include OrganizationOptions
 
     command_name "purge"
@@ -24,14 +25,6 @@ module HammerCLIKatello
 
     build_options
 
-    def resource_content_views
-      HammerCLIForeman.foreman_resource(:content_views)
-    end
-
-    def resource_content_view_versions
-      HammerCLIForeman.foreman_resource(:content_view_versions)
-    end
-
     class ContentViewIdParamSource
       def initialize(command)
         @command = command
@@ -74,31 +67,26 @@ module HammerCLIKatello
 
     private def purge_version(v)
       if option_async?
-        task = resource_content_view_versions.call(:destroy, 'id' => v["id"])
+        task = destroy(:content_view_versions, 'id' => v["id"])
         print_message _("Version '%{version}' of content view '%{view}' scheduled "\
                         "for deletion in task '%{task_id}'.") %
-                      {version: v["version"], view: content_view["name"], task_id: task['id']}
+                      {version: v["version"], view: v["content_view"]["name"], task_id: task['id']}
       else
-        task_progress(resource_content_view_versions.call(:destroy, 'id' => v["id"]))
+        task_progress(call(:destroy, :content_view_versions, 'id' => v["id"]))
         print_message _("Version '%{version}' of content view '%{view}' deleted.") %
-                      {version: v["version"], view: content_view["name"]}
+                      {version: v["version"], view: v["content_view"]["name"]}
       end
     end
 
-    private def content_view
-      @content_view ||= resource_content_views.call(:show, 'id' => options['option_id'])
-    end
-
     private def old_unused_versions
       return @old_unused_versions if @old_unused_versions
 
-      all_versions = content_view['versions'].sort_by do |version|
-        [version[:major], version[:minor]]
-      end
-
-      # Keep only versions which are not used
+      all_versions = index(:content_view_versions, :content_view_id => options['option_id'])
+      all_versions.sort_by! { |v| [v['major'], v['minor']] }
       @old_unused_versions = all_versions.select do |v|
-        v["environment_ids"].empty?
+        v["environments"].empty? &&
+          v["composite_content_views"].empty? &&
+          v["composite_content_view_versions"].empty?
       end
     end
   end

data/lib/hammer_cli_katello/content_view_version.rb

@@ -265,6 +265,7 @@ module HammerCLIKatello
     class ExportCommand < HammerCLIForeman::Command
       include HammerCLIKatello::LocalHelper
       include HammerCLIKatello::ApipieHelper
+      include HammerCLIKatello::CVImportExportHelper
 
       PUBLISHED_REPOS_DIR = "/var/lib/pulp/published/yum/https/repos/".freeze
 
@@ -287,18 +288,29 @@ module HammerCLIKatello
 
       def execute
         cvv = show(:content_view_versions, 'id' => options['option_id'])
-        repositories = cvv['repositories'].collect do |repo|
-          show(:repositories, 'id' => repo['id'], :full_result => true)
-        end
+        cv = show(:content_views, 'id' => cvv['content_view_id'])
 
-        check_repo_download_policy(repositories)
+        composite = cv["composite"]
+        export_json_options = { :cvv => cvv }
 
-        repositories.each do |repo|
-          repo['packages'] = index(:packages, 'repository_id' => repo['id'], :full_result => true)
-          repo['errata'] = index(:errata, 'repository_id' => repo['id'], :full_result => true)
+        if composite
+          components = cv['components']
+          export_json_options[:component_cvvs] = components.collect do |component|
+            component['name']
+          end
+          export_json_options[:repositories] = []
+        else
+          repositories = fetch_cvv_repositories(cvv)
+          check_repo_download_policy(repositories)
+
+          repositories.each do |repo|
+            repo['packages'] = index(:packages, 'repository_id' => repo['id'], :full_result => true)
+            repo['errata'] = index(:errata, 'repository_id' => repo['id'], :full_result => true)
+          end
+          export_json_options[:repositories] = repositories
         end
 
-        json = export_json(cvv, repositories)
+        json = export_json(export_json_options)
         create_tar(cvv, repositories, json)
         return HammerCLI::EX_OK
       end
@@ -311,15 +323,17 @@ module HammerCLIKatello
 
         Dir.mkdir("#{options['option_export_dir']}/#{export_prefix}")
 
-        Dir.chdir(PUBLISHED_REPOS_DIR) do
-          repo_tar = "#{options['option_export_dir']}/#{export_prefix}/#{export_repos_tar}"
-          repo_dirs = []
+        if repositories
+          Dir.chdir(PUBLISHED_REPOS_DIR) do
+            repo_tar = "#{options['option_export_dir']}/#{export_prefix}/#{export_repos_tar}"
+            repo_dirs = []
 
-          repositories.each do |repo|
-            repo_dirs.push(repo['relative_path'])
-          end
+            repositories.each do |repo|
+              repo_dirs.push(repo['relative_path'])
+            end
 
-          `tar cvfh #{repo_tar} #{repo_dirs.join(" ")}`
+            `tar cvfh #{repo_tar} #{repo_dirs.join(" ")}`
+          end
         end
 
         Dir.chdir("#{options['option_export_dir']}/#{export_prefix}") do
@@ -348,35 +362,13 @@ module HammerCLIKatello
         MSG
         raise _(msg)
       end
-
-      def export_json(content_view_version, repositories)
-        json = {
-          "name" => content_view_version['content_view']['name'],
-          "major" => content_view_version['major'],
-          "minor" => content_view_version['minor']
-        }
-
-        json["repositories"] = repositories.collect do |repo|
-          {
-            "id" => repo['id'],
-            "label" => repo['label'],
-            "content_type" => repo['content_type'],
-            "backend_identifier" => repo['backend_identifier'],
-            "relative_path" => repo['relative_path'],
-            "on_disk_path" => "#{PUBLISHED_REPOS_DIR}/#{repo['relative_path']}",
-            "rpm_filenames" => repo['packages'].collect { |package| package['filename'] },
-            "errata_ids" => repo['errata'].collect { |errata| errata['errata_id'] }
-          }
-        end
-
-        json
-      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
 
@@ -389,8 +381,7 @@ module HammerCLIKatello
 
       option "--organization-id", "ORGANIZATION_ID", _("Organization numeric identifier")
       option(
-        '--export-tar',
-        'EXPORT_TAR',
+        '--export-tar', 'EXPORT_TAR',
         _("Location of export tar on disk")
       )
 
@@ -406,47 +397,35 @@ module HammerCLIKatello
           raise _("Export tar #{options['option_export_tar']} does not exist.")
         end
 
-        self.export_tar_file = File.basename(options['option_export_tar'])
-        self.export_tar_prefix = @export_tar_file.gsub('.tar', '')
-        self.export_tar_dir = File.dirname(options['option_export_tar'])
-        untar_export
-
-        export_json = read_json
+        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'])
-        sync_repositories(export_json['repositories'], options['option_organization_id'])
-
-        publish(
-          cv['id'],
-          export_json['major'],
-          export_json['minor'],
-          repos_units(export_json['repositories'])
-        )
-        return HammerCLI::EX_OK
-      end
-
-      def untar_export
-        Dir.chdir(@export_tar_dir) do
-          `tar -xf #{@export_tar_file}`
-        end
 
-        Dir.chdir("#{@export_tar_dir}/#{@export_tar_prefix}") do
-          if File.exist?(@export_tar_file.gsub('.tar', '-repos.tar'))
-            `tar -xf #{@export_tar_file.gsub('.tar', '-repos.tar')}`
-          else
-            raise _("Export repos tar file is missing.")
+        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)
+
+          publish(
+            cv['id'], export_json['major'],
+            export_json['minor'], repos_units(export_json['repositories'])
+          )
         end
+        return HammerCLI::EX_OK
       end
 
-      def read_json
-        json_file = @export_tar_file.gsub('tar', 'json')
-        json_file = "#{@export_tar_dir}/#{@export_tar_prefix}/#{json_file}"
-        json_file = File.read(json_file)
-        JSON.parse(json_file)
-      end
+      def sync_repositories(repositories, organization_id, options)
+        export_tar_dir =  options[:dirname]
+        export_tar_prefix = options[:prefix]
 
-      def sync_repositories(repositories, organization_id)
         repositories.each do |repo|
           library_repos = index(
             :repositories,
@@ -467,7 +446,7 @@ module HammerCLIKatello
 
           synchronize(
             library_repo['id'],
-            "file://#{@export_tar_dir}/#{@export_tar_prefix}/#{repo['relative_path']}"
+            "file://#{export_tar_dir}/#{export_tar_prefix}/#{repo['relative_path']}"
           )
         end
       end
@@ -489,8 +468,9 @@ module HammerCLIKatello
         task_progress(call(:sync, :repositories, 'id' => id, 'source_url' => source_url))
       end
 
-      def publish(id, major, minor, repos_units)
-        params = {'id' => id, 'major' => major, 'minor' => minor, 'repos_units' => repos_units}
+      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

data/lib/hammer_cli_katello/cv_import_export_helper.rb

@@ -0,0 +1,83 @@
+module HammerCLIKatello
+  module CVImportExportHelper
+    PUBLISHED_REPOS_DIR = "/var/lib/pulp/published/yum/https/repos/".freeze
+
+    def fetch_cvv_repositories(cvv)
+      cvv['repositories'].collect do |repo|
+        show(:repositories, 'id' => repo['id'], :full_result => true)
+      end
+    end
+
+    def find_local_component_id(component_from_export)
+      *name, version = component_from_export.split(' ')
+      name = name.join(' ')
+      existing_component_cv = content_view(name, options['option_organization_id'])
+      found_composite_version = existing_component_cv['versions'].select do |v|
+        v['version'] == version
+      end
+      if found_composite_version.empty?
+        raise _("Unable to find CV version %{cvv} on system. Please ensure it " \
+                "is already imported." % {'cvv' => component_from_export})
+      end
+      found_composite_version.first['id']
+    end
+
+    def untar_export(options)
+      export_tar_file = options[:filename]
+      export_tar_dir =  options[:dirname]
+      export_tar_prefix = options[:prefix]
+
+      Dir.chdir(export_tar_dir) do
+        `tar -xf #{export_tar_file}`
+      end
+
+      Dir.chdir("#{export_tar_dir}/#{export_tar_prefix}") do
+        if File.exist?(export_tar_file.gsub('.tar', '-repos.tar'))
+          `tar -xf #{export_tar_file.gsub('.tar', '-repos.tar')}`
+        end
+      end
+    end
+
+    def obtain_export_params(option_export_tar)
+      export_tar_file = File.basename(option_export_tar)
+      {:filename => export_tar_file,
+       :dirname => File.dirname(option_export_tar),
+       :prefix => export_tar_file.gsub('.tar', '')}
+    end
+
+    def read_json(options)
+      export_tar_file = options[:filename]
+      export_tar_dir =  options[:dirname]
+      export_tar_prefix = options[:prefix]
+
+      json_file = export_tar_file.gsub('tar', 'json')
+      json_file = "#{export_tar_dir}/#{export_tar_prefix}/#{json_file}"
+      json_file = File.read(json_file)
+      JSON.parse(json_file)
+    end
+
+    def export_json(export_json_options)
+      content_view_version = export_json_options[:cvv]
+      repositories = export_json_options[:repositories]
+      json = {
+        "name" => content_view_version['content_view']['name'],
+        "major" => content_view_version['major'],
+        "minor" => content_view_version['minor']
+      }
+      json["composite_components"] = export_json_options[:component_cvvs]
+      json["repositories"] = repositories.collect do |repo|
+        {
+          "id" => repo['id'],
+          "label" => repo['label'],
+          "content_type" => repo['content_type'],
+          "backend_identifier" => repo['backend_identifier'],
+          "relative_path" => repo['relative_path'],
+          "on_disk_path" => "#{PUBLISHED_REPOS_DIR}/#{repo['relative_path']}",
+          "rpm_filenames" => repo['packages'].collect { |package| package['filename'] },
+          "errata_ids" => repo['errata'].collect { |errata| errata['errata_id'] }
+        }
+      end
+      json
+    end
+  end
+end

data/lib/hammer_cli_katello/host_errata.rb

@@ -49,6 +49,16 @@ module HammerCLIKatello
       build_options
     end
 
+    class RecalculateCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+      resource :host_errata, :applicability
+      command_name "recalculate"
+      success_message _("Errata recalculated with task %{id}.")
+      failure_message _("Could not recalculate errata")
+
+      build_options
+    end
+
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/lifecycle_environment.rb

@@ -68,6 +68,8 @@ module HammerCLIKatello
         from :prior do
           field :name, _("Prior Lifecycle Environment")
         end
+        field :registry_unauthenticated_pull, _("Unauthenticated Pull")
+        field :registry_name_pattern, _("Registry Name Pattern")
       end
 
       build_options

data/lib/hammer_cli_katello/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('0.15.0')
+    @version ||= Gem::Version.new('0.16.0')
   end
 end