hammer_cli_katello 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4a0b5242f1d0f3e87e8571ebe1c94b82bd6372cce01872180ae287f1ebf486
-  data.tar.gz: 47a56afed02b55e7dead1cbcadb47afcdfa6dc1715bf86d9b86c55d28674bd6f
+  metadata.gz: 7eb373245d3f5729658982b7aefecc00f6fb1637f708ce9d696473d9d351fef7
+  data.tar.gz: 0c783d65abf303cfde9283a7bc464ae4e238402630b9373e1e44e7bf342924b1
 SHA512:
-  metadata.gz: f1e2109e465aaf6099bd7913bf2efb54d74e26bc4926796b0e232dbcb811e1169d16f40009394ede76e409c52c05607c2a77836ed512f98597e9949c32cdbf6f
-  data.tar.gz: 624c661b09f3ecbd747d13b35ea7caf3b5084ab9092ae771cdf15a3029419c23af6bd92ed2609d89ea57b60e52dd26c6e34c55b2e666a3717df571f4470abd97
+  metadata.gz: 8316c8d2380d4cfee7b8dd8a25ea3f4ae56924da1741a179eb43a677af6a81397be3c608abeb6528dda6f81839d3c6749e2500d153518a062e643150d58020a0
+  data.tar.gz: 3497638100e1d86f6ef7a758a7bfef2bf06569c76e804b0736f7eaca1e853c7a0d608082749348f5d91677cfc71b7db0f26e548fd641957c97b4fffc73e5c703

data/lib/hammer_cli_katello/capsule.rb

@@ -105,6 +105,22 @@ module HammerCLIKatello
         extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
       end
 
+      class UpdateCountsCommand < HammerCLIKatello::SingleResourceCommand
+        include HammerCLIForemanTasks::Async
+
+        resource :capsule_content, :update_counts
+        command_name "update-counts"
+
+        success_message _("Capsule content counts are being updated in task %{id}.")
+        failure_message _("Could not update capsule content counts")
+
+        option "--organization-id", "ID", _("Organization ID"),
+               :attribute_name => :option_organization_id
+        option "--organization", "NAME", _("Organization name"),
+               :attribute_name => :option_organization_name
+        build_options
+      end
+
       class SyncStatusCommand < HammerCLIKatello::InfoCommand
         resource :capsule_content, :sync_status
         command_name "synchronization-status"
@@ -170,21 +186,59 @@ module HammerCLIKatello
               field nil, _("Name"), Fields::Reference
               field :composite, _('Composite'), Fields::Boolean
               field :last_published, _('Last Published'), Fields::Date
-              label _('Content') do
-                from :counts do
-                  field :content_hosts, _('Hosts')
-                  field :products, _('Products')
-                  field :yum_repositories, _('Yum repos')
-                  field :docker_repositories, _('Container Image repos')
-                  field :packages, _('Packages')
-                  field :package_groups, _('Package groups')
-                  field :errata, _('Errata')
+              collection :repositories, _('Repositories') do
+                field :id, _("Repository ID")
+                field :name, _("Repository Name")
+                label _('Content Counts') do
+                  from :_content_counts do
+                    field :warning, _('Warning')
+                    field :rpm, _('Packages')
+                    field :srpm, _('SRPMs')
+                    field :module_stream, _('Module Streams')
+                    field :package_group, _('Package Groups')
+                    field :erratum, _('Errata')
+                    field :deb, _('Debian Packages')
+                    field :docker_tag, _('Container Tags')
+                    field :docker_manifest, _('Container Manifests')
+                    field :docker_manifest_list, _('Container Manifest Lists')
+                    field :file, _('Files')
+                    field :ansible_collection, _('Ansible Collections')
+                    field :ostree_ref, _('OSTree Refs')
+                    field :python_package, _('Python Packages')
+                  end
                 end
               end
             end
           end
         end
 
+        private
+
+        def extend_data(data)
+          data["lifecycle_environments"].each do |lce|
+            lce["content_views"].each do |cv|
+              cv["repositories"].each do |repo|
+                if cv["up_to_date"]
+                  cvv_count_repos = data.dig("content_counts", "content_view_versions",
+                    cv["cvv_id"].to_s, "repositories")
+                  cvv_count_repos.each do |_repo_id, counts_and_metadata|
+                    if counts_and_metadata.
+                       dig("metadata", "library_instance_id") == repo["library_id"] &&
+                       counts_and_metadata.dig("metadata", "env_id") == lce["id"]
+                      repo["_content_counts"] = counts_and_metadata["counts"]
+                    end
+                  end
+                else
+                  repo["_content_counts"] = {}
+                  repo["_content_counts"]["warning"] =
+                    _("Content view must be synced to see content counts")
+                end
+              end
+            end
+          end
+          data
+        end
+
         build_options
       end
 

data/lib/hammer_cli_katello/option_sources/lifecycle_environment_params.rb

@@ -25,6 +25,9 @@ module HammerCLIKatello
           result['option_environment_id'] = @command.resolver.lifecycle_environment_id(
             @command.resolver.scoped_options(lifecycle_environment_resource_name, result, :single))
         end
+        if result['option_lifecycle_environment_id'] && result['option_environment_id'].nil?
+          result['option_environment_id'] = result['option_lifecycle_environment_id']
+        end
       end
 
       def legacy_option_ids(result)
@@ -32,6 +35,9 @@ module HammerCLIKatello
           result['option_environment_ids'] = @command.resolver.lifecycle_environment_ids(
             @command.resolver.scoped_options(lifecycle_environment_resource_name, result, :multi))
         end
+        if result['option_lifecycle_environment_ids'] && result['option_environment_ids'].nil?
+          result['option_environment_ids'] = result['option_lifecycle_environment_ids']
+        end
       end
 
       def ensure_option_id(result)

data/lib/hammer_cli_katello/organization.rb

@@ -76,6 +76,9 @@ module HammerCLIKatello
         if params.key?('simple_content_access')
           params["organization"] = params.fetch('organization', {}).merge(
             "_simple_content_access" => params['simple_content_access'])
+          unless params['simple_content_access']
+            warn "Simple Content Access will be required for all organizations in Katello 4.12."
+          end
         end
         params
       end

data/lib/hammer_cli_katello/simple_content_access.rb

@@ -45,6 +45,11 @@ module HammerCLIKatello
       failure_message _("Could not disable Simple Content Access for this organization")
 
       build_options
+
+      def execute
+        warn "Simple Content Access will be required for all organizations in Katello 4.12."
+        super
+      end
     end
 
     autoload_subcommands

data/lib/hammer_cli_katello/version.rb

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