hammer_cli_katello 1.14.2 → 1.15.0

data/test/functional/activation_key/data/activation_key.json

@@ -13,5 +13,47 @@
     "name": "Library",
     "id": 1
   },
-  "purpose_addons": "Test Addon1, Test Addon2"
+  "purpose_addons": "Test Addon1, Test Addon2",
+  "multi_content_view_environment": true,
+  "organization": {
+    "name": "Default Organization",
+    "label": "Default_Organization",
+    "id": 1
+  },
+  "content_view_environments": [
+    {
+      "content_view": {
+        "id": 2,
+        "name": "RHEL-8",
+        "composite": false,
+        "content_view_version": "1.0",
+        "content_view_version_id": 4,
+        "content_view_version_latest": true,
+        "content_view_default": false
+      },
+      "lifecycle_environment": {
+        "id": 1,
+        "name": "Library",
+        "lifecycle_environment_library": true
+      },
+      "label": "Library/RHEL-8"
+    },
+    {
+      "content_view": {
+        "id": 4,
+        "name": "Zoo",
+        "composite": false,
+        "content_view_version": "1.0",
+        "content_view_version_id": 2,
+        "content_view_version_latest": true,
+        "content_view_default": false
+      },
+      "lifecycle_environment": {
+        "id": 2,
+        "name": "Dev",
+        "lifecycle_environment_library": false
+      },
+      "label": "Dev/Zoo"
+    }
+  ]
 }

data/test/functional/activation_key/info_test.rb

@@ -17,11 +17,37 @@ describe 'activation-key info' do
 
     result = run_cmd(@cmd + params)
 
-    expected_fields = [['Description', 'Activation key'],
+    expected_fields = [['Name', 'test key2'],
+                       ['Id', '1'],
+                       ['Description', 'Activation key'],
                        ['Purpose Usage', 'Usage'],
                        ['Purpose Role', 'Role'],
                        ['Purpose Addons', 'Test Addon1, Test Addon2'],
-                       ['Lifecycle Environment', 'Library']]
+                       ['Multi Content View Environment', 'yes'],
+                       ['Organization', ''],
+                       ['Id', '1'],
+                       ['Name', 'Default Organization'],
+                       ['Content View Environments', ''],
+                       ['Content View', ''],
+                       ['Id', '2'],
+                       ['Name', 'RHEL-8'],
+                       ['Version', '1.0'],
+                       ['Content View version Id', '4'],
+                       ['Composite', 'no'],
+                       ['Lifecycle environment', ''],
+                       ['Id', '1'],
+                       ['Name', 'Library'],
+                       ['Label', 'Library/RHEL-8'],
+                       ['Content View', ''],
+                       ['Id', '4'],
+                       ['Name', 'Zoo'],
+                       ['Version', '1.0'],
+                       ['Content View version Id', '2'],
+                       ['Composite', 'no'],
+                       ['Lifecycle environment', ''],
+                       ['Id', '2'],
+                       ['Name', 'Dev'],
+                       ['Label', 'Dev/Zoo']]
 
     expected_results = expected_fields.map { |field| success_result(FieldMatcher.new(*field)) }
     expected_results.each { |expected|  assert_cmd(expected, result) }

data/test/functional/activation_key/list_test.rb

@@ -35,15 +35,16 @@ describe 'listing activation-keys' do
     end
 
     ex.returns(empty_response)
-
-    expected_result = success_result("---|------|------------|-----------------------|-------------
-ID | NAME | HOST LIMIT | LIFECYCLE ENVIRONMENT | CONTENT VIEW
----|------|------------|-----------------------|-------------
+    # rubocop:disable Layout/LineLength
+    expected_result = success_result("---|------|------------|---------------------------|-------------------------------
+ID | NAME | HOST LIMIT | CONTENT VIEW ENVIRONMENTS | MULTI CONTENT VIEW ENVIRONMENT
+---|------|------------|---------------------------|-------------------------------
 ")
 
     result = run_cmd(@cmd + params)
     assert_cmd(expected_result, result)
   end
+  # rubocop:enable Layout/LineLength
 
   it "lists the activation-keys belonging to a lifecycle environment by name" do
     params = ["--organization-id=#{org_id}", '--lifecycle-environment=test']
@@ -56,13 +57,14 @@ ID | NAME | HOST LIMIT | LIFECYCLE ENVIRONMENT | CONTENT VIEW
     end
 
     ex.returns(empty_response)
-
-    expected_result = success_result("---|------|------------|-----------------------|-------------
-ID | NAME | HOST LIMIT | LIFECYCLE ENVIRONMENT | CONTENT VIEW
----|------|------------|-----------------------|-------------
+    # rubocop:disable Layout/LineLength
+    expected_result = success_result("---|------|------------|---------------------------|-------------------------------
+ID | NAME | HOST LIMIT | CONTENT VIEW ENVIRONMENTS | MULTI CONTENT VIEW ENVIRONMENT
+---|------|------------|---------------------------|-------------------------------
 ")
 
     result = run_cmd(@cmd + params)
     assert_cmd(expected_result, result)
   end
+  # rubocop:enable Layout/LineLength
 end

data/test/functional/host/extensions/data/host_list.json

@@ -95,6 +95,27 @@
                "id":1,
                "name":"Library"
             },
+            "content_view_environment_labels": "Library",
+            "multi_content_view_environment": false,
+            "content_view_environments": [
+               {
+                  "content_view": {
+                        "id": 1,
+                        "name": "Default Organization View",
+                        "composite": false,
+                        "content_view_version": "1.0",
+                        "content_view_version_id": 1,
+                        "content_view_version_latest": true,
+                        "content_view_default": true
+                  },
+                  "lifecycle_environment": {
+                        "id": 1,
+                        "name": "Library",
+                        "lifecycle_environment_library": true
+                  },
+                  "label": "Library"
+               }
+            ],
             "errata_counts":{
                "security":0,
                "bugfix":0,

data/test/functional/host/extensions/list_test.rb

@@ -13,8 +13,8 @@ describe 'host list' do
 
     result = run_cmd(@cmd)
 
-    fields = ['CONTENT VIEW', 'LIFECYCLE ENVIRONMENT', 'TRACE STATUS']
-    values = ['Default Organization View', 'Library', 'updated']
+    fields = ['CONTENT VIEW ENVIRONMENTS', 'MULTI CONTENT VIEW ENVIRONMENT', 'TRACE STATUS']
+    values = ['Library', 'no', 'updated']
     expected_result = success_result(IndexMatcher.new([fields, values]))
     assert_cmd(expected_result, result)
   end

data/test/functional/repository/update_test.rb

@@ -27,7 +27,6 @@ module HammerCLIKatello # rubocop:disable Metrics/ModuleLength
         }
       end
       it "adds a tag to an image" do
-        skip "Until we  https://projects.theforeman.org/issues/34817 is resolved"
         ex = api_expects(:content_uploads, :create)
              .with_params('repository_id' => repo_id, :size => 0)
 

data/test/test_helper.rb

@@ -5,7 +5,7 @@ require 'mocha/minitest'
 require 'hammer_cli'
 require 'ostruct'
 
-KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.10')
+KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.14')
 
 if HammerCLI.context[:api_connection]
   HammerCLI.context[:api_connection].create('foreman') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.15.0
 platform: ruby
 authors:
 - Adam Price
@@ -37,7 +37,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: theforeman-rubocop
@@ -115,6 +115,7 @@ files:
 - lib/hammer_cli_katello/content_units.rb
 - lib/hammer_cli_katello/content_view.rb
 - lib/hammer_cli_katello/content_view_component.rb
+- lib/hammer_cli_katello/content_view_environment.rb
 - lib/hammer_cli_katello/content_view_name_resolvable.rb
 - lib/hammer_cli_katello/content_view_purge.rb
 - lib/hammer_cli_katello/content_view_version.rb
@@ -294,6 +295,7 @@ files:
 - test/data/4.0/foreman_api.json
 - test/data/4.1/foreman_api.json
 - test/data/4.10/foreman_api.json
+- test/data/4.14/foreman_api.json
 - test/data/4.3/foreman_api.json
 - test/data/4.4/foreman_api.json
 - test/data/4.5/foreman_api.json
@@ -490,7 +492,7 @@ files:
 - test/unit/search_options_creators_test.rb
 homepage: https://github.com/Katello/hammer-cli-katello
 licenses:
-- GPL-3.0
+- GPL-3.0-or-later
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -503,14 +505,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Katello commands for Hammer
@@ -537,6 +539,7 @@ test_files:
 - test/data/4.0/foreman_api.json
 - test/data/4.1/foreman_api.json
 - test/data/4.10/foreman_api.json
+- test/data/4.14/foreman_api.json
 - test/data/4.3/foreman_api.json
 - test/data/4.4/foreman_api.json
 - test/data/4.5/foreman_api.json