hammer_cli_katello 1.8.3 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14a8c0516e23ef722ab7bac70b87c22ef600171d0bec5a057196d3f850fbd317
-  data.tar.gz: cb77eda2075ce41fa28c00e1469d6e9f73e1113d73141033702db679bb68f76e
+  metadata.gz: '087997f9ecd956e28e1a16af8a0a9b7d58c8545a21823983a4262455440a4450'
+  data.tar.gz: 24f3198cbecc8efe78ab7307deef8ae037acb150b1fdbbb663f1187e37b0b255
 SHA512:
-  metadata.gz: eac823ff33aa124a1198718eba317a3c6514ade1c77c38df7348709b24b3eb5616a7b8010a5c74435e6e9dadb34bb0597496986b0a7a2d8eb2f2915730b81e93
-  data.tar.gz: 2dc906e2d9d22d7423e3cae95b364f6b1ad5180c373e0776f961cd61f65f77682837ff56c8d62afb1452b5b4c20312cb54b7d685deeda4dd4dd702e3d0f5fa9c
+  metadata.gz: 11f48385ad699c7ffec842e06f80614892d533a5f3aada8a320fbdade7054e31205893e42ce7711eb365f680e0e8166fae6d605251f9ebabd91420e4330e3ea6
+  data.tar.gz: ab4c2fe345e087af5f6bb30ca575f8273212080ab504fc5d5003e721d6f5e2264ed4d837650b4b8598dd31f61acaad08860f53d41ba5d29d44490651aeb0d2b9

data/lib/hammer_cli_katello/activation_key.rb

@@ -55,7 +55,7 @@ module HammerCLIKatello
         field :name, _("Name")
         field :id, _("Id")
         field :description, _("Description"), Fields::Field, :hide_blank => true
-        field :format_limit, _("Host Limit")
+        field :format_consumed, _("Host Limit")
         field :auto_attach, _("Auto Attach")
         field :release_version, _("Release Version"), Fields::Field, :hide_blank => true
 
@@ -66,6 +66,11 @@ module HammerCLIKatello
           field :name, _("Content View")
         end
 
+        collection :hosts, _("Associated Hosts") do
+          field :id, _('Id')
+          field :name, _("Name")
+        end
+
         collection :host_collections, _("Host Collections") do
           field :id, _("Id")
           field :name, _("Name")
@@ -86,8 +91,13 @@ module HammerCLIKatello
       end
 
       def extend_data(data)
-        data["format_limit"] =
-          data["unlimited_hosts"] ? _("Unlimited") : data["max_hosts"]
+        limit = data["unlimited_hosts"] ? _("Unlimited") : data["max_hosts"]
+
+        data["format_consumed"] = _("%{consumed} of %{limit}") %
+                                  {
+                                    :consumed => data["usage_count"],
+                                    :limit => limit
+                                  }
         data
       end
 

data/lib/hammer_cli_katello/content_view_version.rb

@@ -32,8 +32,6 @@ module HammerCLIKatello
     class InfoCommand < HammerCLIKatello::InfoCommand
       include LifecycleEnvironmentNameMapping
 
-      resource :content_view_versions, :show
-
       output do
         field :id, _("Id")
         field :name, _("Name")
@@ -57,6 +55,17 @@ module HammerCLIKatello
           field :name, _("Name")
           field :label, _("Label")
         end
+
+        field :filters_applied, _("Has Applied Filters"), Fields::Boolean, hide_blank: true
+        from :applied_filters do
+          collection :applied_filters, _("Applied Filters"), hide_blank: true, hide_empty: true do
+            from :filter do
+              field :id, _("Id")
+              field :name, _("Name")
+            end
+          end
+          field :dependency_solving, _("Dependency Solving"), Fields::Field, :hide_blank => true
+        end
       end
 
       build_options do |o|

data/lib/hammer_cli_katello/host_collection_erratum.rb

@@ -17,7 +17,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_errata_install`. Specify the host collection with the --search-query " \
           "parameter, e.g. `--search-query \"host_collection = MyCollection\"` or " \

data/lib/hammer_cli_katello/host_collection_package.rb

@@ -26,7 +26,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_package_install`. Specify the host collection with the --search-query " \
           "parameter, e.g. `--search-query \"host_collection = MyCollection\"` or " \
@@ -43,7 +43,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_package_update`. Specify the host collection with the --search-query " \
           "parameter, e.g. `--search-query \"host_collection = MyCollection\"` or " \
@@ -60,7 +60,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_package_remove`. Specify the host collection with the --search-query " \
           "parameter, e.g. `--search-query \"host_collection = MyCollection\"` or " \

data/lib/hammer_cli_katello/host_collection_package_group.rb

@@ -26,7 +26,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_group_install`. Specify the host collection with the --search-query " \
           "parameter, e.g. `--search-query \"host_collection = MyCollection\"` or " \
@@ -43,7 +43,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_group_update`. Specify the host collection with the --search-query " \
           "parameter, e.g. `--search-query \"host_collection = MyCollection\"` or " \
@@ -60,7 +60,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_group_remove`. Specify the host collection with the --search-query " \
           "parameter, e.g. `--search-query \"host_collection = MyCollection\"` or " \

data/lib/hammer_cli_katello/host_errata.rb

@@ -15,7 +15,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_errata_install`."
         super

data/lib/hammer_cli_katello/host_extensions.rb

@@ -42,20 +42,14 @@ module HammerCLIKatello
       output do
         label _('Content Information') do
           from :content_facet_attributes do
-            collection :content_view_environments, _('Content view environments') do
-              from :content_view do
-                label _("Content view") do
-                  field :id, _("Id")
-                  field :name, _("Name")
-                  field :composite, _("Composite"), Fields::Boolean
-                end
-              end
-              from :lifecycle_environment do
-                label _("Lifecycle environment") do
-                  field :id, _("Id")
-                  field :name, _("Name")
-                end
-              end
+            label _("Content View") do
+              field :content_view_id, _("Id")
+              field :content_view_name, _("Name")
+            end
+
+            label _("Lifecycle Environment") do
+              field :lifecycle_environment_id, _("Id")
+              field :lifecycle_environment_name, _("Name")
             end
 
             label _("Content Source") do

data/lib/hammer_cli_katello/host_package.rb

@@ -27,7 +27,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_package_install`."
         super
@@ -45,7 +45,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_package_update`."
         super
@@ -63,7 +63,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_package_update`."
         super
@@ -85,7 +85,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_package_remove`."
         super

data/lib/hammer_cli_katello/host_package_group.rb

@@ -17,7 +17,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_group_install`."
         super
@@ -39,7 +39,7 @@ module HammerCLIKatello
 
       def execute
         warn "This command uses katello agent and will be removed in favor of remote execution " \
-          "in Katello 4.10."
+          "in a future release."
         warn "The remote execution equivalent is `hammer job-invocation create --feature " \
           "katello_group_remove`."
         super

data/lib/hammer_cli_katello/organization.rb

@@ -68,6 +68,18 @@ module HammerCLIKatello
       success_message _("Organization updated.")
       failure_message _("Could not update the organization")
 
+      def request_params
+        params = super
+        # This is so Hammer doesn't say "Nothing to update" when toggling SCA.
+        # (see hammer-cli-foreman)
+        # Rails will safely ignore the extra parameter.
+        if params.key?('simple_content_access')
+          params["organization"] = params.fetch('organization', {}).merge(
+            "_simple_content_access" => params['simple_content_access'])
+        end
+        params
+      end
+
       build_options do |o|
         o.expand(:all).except(:environments)
       end

data/lib/hammer_cli_katello/repository.rb

@@ -31,6 +31,7 @@ module HammerCLIKatello
           field :name, _("Product")
         end
         field :content_type, _("Content Type")
+        field :content_label, _("Content Label")
         field :url, _("Url")
       end
 
@@ -67,6 +68,7 @@ module HammerCLIKatello
         end
         field :_redhat_repo, _("Red Hat Repository")
         field :content_type, _("Content Type")
+        field :content_label, _("Content Label")
         field :checksum_type, _("Checksum Type"), Fields::Field, :hide_blank => true
         field :_mirroring_policy, _("Mirroring Policy"), Fields::Field, :hide_blank => true
         field :url, _("Url")
@@ -74,6 +76,7 @@ module HammerCLIKatello
         field :full_path, _("Published At")
         field :relative_path, _("Relative Path")
         field :download_policy, _("Download Policy"), Fields::Field, :hide_blank => true
+        field :metadata_expire, _("Metadata Expiration"), Fields::Field, :hide_blank => true
         field :docker_upstream_name, _("Upstream Repository Name"),
               Fields::Field, :hide_blank => true
         field :docker_tags_whitelist, _("Container Image Tags Filter"),

data/lib/hammer_cli_katello/version.rb

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