foreman_rh_cloud 11.2.0 → 12.0.0

data/locale/zh_CN/foreman_rh_cloud.po

@@ -4,19 +4,20 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 # Translators:
+# Bryan Kearney <bryan.kearney@gmail.com>, 2023
 # tim123, 2023
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2023
-# Bryan Kearney <bryan.kearney@gmail.com>, 2023
 # Amit Upadhye <aupadhye@redhat.com>, 2023
-# Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2023
+# Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: foreman_rh_cloud 11.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2023-01-20 13:26+0000\n"
 "Last-Translator: Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarde"
-"n.nl>, 2023\n"
+"n.nl>, 2025\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/foreman/teams/114/zh"
 "_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid " Sync all inventory status"
-msgstr ""
+msgstr " 同步所有清单状态"
 
 msgid "%s organizations"
 msgstr "%s 机构"
@@ -53,7 +54,7 @@ msgid "Automatic inventory upload"
 msgstr "自动清单上传"
 
 msgid "Automatic mismatch deletion"
-msgstr ""
+msgstr "自动清单删除"
 
 msgid "Cancel"
 msgstr "取消"
@@ -95,7 +96,7 @@ msgid "Configure Cloud Connector on given hosts"
 msgstr "在给定主机上配置 Cloud Connector"
 
 msgid "Configure cloud connector"
-msgstr ""
+msgstr "配置云连接器"
 
 msgid "Connectivity test"
 msgstr "连接测试"
@@ -119,10 +120,10 @@ msgid "Download Report"
 msgstr "下载报告"
 
 msgid "Download latest report"
-msgstr "下载最新報告"
+msgstr "下载最新的报告"
 
 msgid "Enable automatic deletion of mismatched host records from the Red Hat cloud"
-msgstr ""
+msgstr "启用自动删除来自红帽云的主机记录"
 
 msgid "Enable automatic synchronization of Insights recommendations from the Red Hat cloud"
 msgstr "启用来自红帽云的 Insights 建议自动同步"
@@ -158,7 +159,7 @@ msgid "Exit Code: %s"
 msgstr "退出代码：%s"
 
 msgid "Fetch Insights-related host details"
-msgstr ""
+msgstr "获取与 Insights 相关的主机详情"
 
 msgid "Fetching data about your accounts"
 msgstr "获取有关您的帐户的数据"
@@ -173,10 +174,10 @@ msgid "For more info, please visit the"
 msgstr "如需更多信息，请访问"
 
 msgid "For more information about Insights and Cloud Connector, see:"
-msgstr ""
+msgstr "有关 Insights 和云连接器的更多信息，请参阅"
 
 msgid "For more information about the Subscriptions service, see:"
-msgstr ""
+msgstr "有关订阅服务的更多信息，请参阅："
 
 msgid "Foreman plugin that process & upload data to Red Hat Cloud"
 msgstr "处理数据并将其上传到红帽云的 Foreman 插件"
@@ -185,16 +186,16 @@ msgid "Full Screen"
 msgstr "全屏"
 
 msgid "Generate and upload report"
-msgstr ""
+msgstr "生成并上传报告"
 
 msgid "Generate the report, but do not upload"
-msgstr ""
+msgstr "生成报告，但不上传"
 
 msgid "Generating"
 msgstr "生成中"
 
 msgid "Go to Foreman Insights page"
-msgstr ""
+msgstr "进入 Foreman Insights 页面"
 
 msgid "Go to first page"
 msgstr "前往第一页"
@@ -209,7 +210,7 @@ msgid "Go to previous page"
 msgstr "前往上一页"
 
 msgid "Grab hosts that are missing in RH Cloud"
-msgstr ""
+msgstr "获取 RH Cloud 中缺少的主机"
 
 msgid "Host Insights recommendations"
 msgstr "主机 Insights 建议"
@@ -257,7 +258,7 @@ msgid "Knowledgebase article"
 msgstr "知识库文章"
 
 msgid "List of host UUIDs"
-msgstr ""
+msgstr "主机 UUID 列表"
 
 msgid "Loading"
 msgstr "加载"
@@ -362,7 +363,7 @@ msgid "Recommendations synced successfully"
 msgstr "成功同步建议"
 
 msgid "Reconfigure cloud connector"
-msgstr ""
+msgstr "重新配置云连接器"
 
 msgid "Red Hat Cloud Inventory"
 msgstr "红帽云清单"
@@ -404,7 +405,7 @@ msgid "Satellite server has %{hits_count} recommendations by Red Hat"
 msgstr "Satellite 服务器有 %{hits_count} 个红帽提供的建议"
 
 msgid "Scoped search string for host removal"
-msgstr ""
+msgstr "用于删除主机的有范围的搜索字符串"
 
 msgid "Select recommendations from all pages"
 msgstr "在所有页面中选择建议"
@@ -422,7 +423,7 @@ msgid "Show Advanced Settings"
 msgstr "显示高级设置"
 
 msgid "Show if system is configured to use local iop-advisor-engine."
-msgstr ""
+msgstr "显示系统是否被配置为使用本地 iop-advisor-engine。"
 
 msgid "Start inventory synchronization"
 msgstr "启动清单同步"
@@ -446,16 +447,16 @@ msgid "Synchronize recommendations Automatically"
 msgstr "自动同步建议"
 
 msgid "The Foreman inventory upload plugin automatically uploads Foreman host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required."
-msgstr ""
+msgstr "Foreman 清单上传插件会自动将 Foreman 主机清单数据上传到 Insights 的 Inventory 服务，订阅服务使用这些信息来提供订阅报告。如果使用订阅服务，则需要启用清单上传。"
 
 msgid "The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Foreman instance."
-msgstr ""
+msgstr "Red Hat Hybrid Cloud Console 提供了一组云服务，包括 Red Hat Insights 和订阅，提供预测分析、修复问题以及针对此 Foreman 实例的统一订阅报告。"
 
 msgid "The report file %{filename} doesn't exist"
 msgstr "报告文件 %{filename} 不存在"
 
 msgid "The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option."
-msgstr ""
+msgstr "调度的进程被禁用，因为此 Foreman 配置了 use_local_advisor_engine 选项。"
 
 msgid "The server returned the following error: %s"
 msgstr "服务器返回以下错误：%s"
@@ -464,16 +465,16 @@ msgid "The task failed with the following error:"
 msgstr "任务失败，错误为:"
 
 msgid "There are no recommendations for your hosts"
-msgstr ""
+msgstr "没有适用于您的主机的建议"
 
 msgid "This action will also enable automatic reports upload"
 msgstr "此操作还会启用自动报告上传"
 
 msgid "To enable this reporting for all Foreman organizations, set {uploadButtonName} to on. The data will be reported automatically once per day."
-msgstr ""
+msgstr "要为所有 Foreman 机构启用此报告，请将 {uploadButtonName} 设置为 on。数据将每天自动报告一次。"
 
 msgid "To manually upload the data for a specific organization, select an organization and click {restartButtonName}."
-msgstr ""
+msgstr "要手动上传特定机构的数据，请选择机构并点 {restartButtonName}。"
 
 msgid "Total risk"
 msgstr "总风险"
@@ -482,13 +483,13 @@ msgid "Total risks"
 msgstr "总风险"
 
 msgid "Upload hits from iop-advisor-engine"
-msgstr ""
+msgstr "从 iop-advisor-engine 上传 hits"
 
 msgid "Upload hits information"
-msgstr ""
+msgstr "上传 hits 信息"
 
 msgid "Upload rules related to the hits"
-msgstr ""
+msgstr "上传与 hits 相关的 rule"
 
 msgid "Uploading"
 msgstr "上载中"
@@ -506,85 +507,85 @@ msgid "Wait and %s"
 msgstr "等待和 %s"
 
 msgid "Whether the resolution requires reboot"
-msgstr ""
+msgstr "resolution 是否需要重启"
 
 msgid "category name"
-msgstr ""
+msgstr "类别名称"
 
 msgid "generic"
-msgstr ""
+msgstr "通用"
 
 msgid "hosts page"
 msgstr "主机页"
 
 msgid "impact name"
-msgstr ""
+msgstr "影响名称"
 
 msgid "iop payload including resolutions, rules, hits"
-msgstr ""
+msgstr "IOP 有效负载，包括 resolutions, rules, hits"
 
 msgid "items"
 msgstr "项"
 
 msgid "likelihood number"
-msgstr ""
+msgstr "可能性号"
 
 msgid "more info"
-msgstr ""
+msgstr "更多信息"
 
 msgid "page"
-msgstr "page"
+msgstr "页"
 
 msgid "per page"
 msgstr "每页"
 
 msgid "publish date (YYYY-MM-DD)"
-msgstr ""
+msgstr "发布日期 (YYYY-MM-DD)"
 
 msgid "rating"
-msgstr ""
+msgstr "评级"
 
 msgid "reason"
-msgstr ""
+msgstr "原因"
 
 msgid "reboot required"
-msgstr ""
+msgstr "需要重启"
 
 msgid "resolution description"
-msgstr ""
+msgstr "resolution 描述"
 
 msgid "resolution risk"
-msgstr ""
+msgstr "resolution 风险"
 
 msgid "result url"
-msgstr ""
+msgstr "结果 url"
 
 msgid "rule description"
-msgstr ""
+msgstr "rule 描述"
 
 msgid "rule id"
-msgstr ""
+msgstr "rule id"
 
 msgid "rule title"
-msgstr ""
+msgstr "rule 标题"
 
 msgid "solution url"
-msgstr ""
+msgstr "solution url"
 
 msgid "summary"
-msgstr ""
+msgstr "摘要"
 
 msgid "total risk"
-msgstr ""
+msgstr "总风险"
 
 msgid "type"
-msgstr ""
+msgstr "类型"
 
 msgid "upload hits details json"
-msgstr ""
+msgstr "上传 hits 详情 json"
 
 msgid "upload resolutions related to the hits"
-msgstr ""
+msgstr "上传与 hits 相关的 resolutions"
 
 msgid "view the job in progress"
 msgstr "查看正在进行中的任务"

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "11.2.0",
+  "version": "12.0.0",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -19,13 +19,13 @@
     "url": "http://projects.theforeman.org/projects/foreman_rh_cloud/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 10.1.1"
+    "@theforeman/vendor": ">= 15.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": ">= 10.1.1",
-    "@theforeman/test": ">= 10.1.1",
-    "@theforeman/eslint-plugin-foreman": ">= 10.1.1",
+    "@theforeman/builder": ">= 15.0.1",
+    "@theforeman/test": ">= 15.0.1",
+    "@theforeman/eslint-plugin-foreman": ">= 15.0.1",
     "babel-eslint": "~10.0.0",
     "eslint": "~6.7.2",
     "eslint-plugin-spellcheck": "~0.0.17",

data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb

@@ -1,7 +1,10 @@
 require 'test_plugin_helper'
+require 'rest-client'
 
 module InsightsCloud::Api
   class MachineTelemetriesControllerTest < ActionController::TestCase
+    include KatelloCVEHelper
+
     setup do
       FactoryBot.create(:common_parameter, name: InsightsCloud.enable_client_param, key_type: 'boolean', value: true)
     end
@@ -33,6 +36,18 @@ module InsightsCloud::Api
         assert_equal @body, @response.body
       end
 
+      test "should handle timeout from cloud" do
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.
+          stubs(:forward_request).
+          raises(RestClient::Exceptions::OpenTimeout.new("Timed out connecting to server"))
+
+        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
+        request_response = JSON.parse(@response.body)
+        # I can't get @response.status to take a nil value so I'm not asserting for that
+
+        assert_equal 'Timed out connecting to server', request_response['error']
+      end
+
       test "should respond with the same content type" do
         net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
         net_http_resp.add_field 'Set-Cookie', 'Monster'
@@ -109,9 +124,8 @@ module InsightsCloud::Api
       setup do
         UpstreamOnlySettingsTestHelper.set_if_available('allow_multiple_content_views')
         User.current = User.find_by(login: 'secret_admin')
-
-        @env = FactoryBot.create(:katello_k_t_environment)
-        @env2 = FactoryBot.create(:katello_k_t_environment, organization: @env.organization)
+        env = FactoryBot.create(:katello_k_t_environment)
+        env2 = FactoryBot.create(:katello_k_t_environment, organization: env.organization)
 
         @host = FactoryBot.create(
           :host,
@@ -119,19 +133,8 @@ module InsightsCloud::Api
           :with_content,
           :with_hostgroup,
           :with_parameter,
-          content_view_environments: [
-            FactoryBot.create(
-              :katello_content_view_environment,
-              content_view: FactoryBot.create(:katello_content_view, organization: @env.organization),
-              lifecycle_environment: @env
-            ),
-            FactoryBot.create(
-              :katello_content_view_environment,
-              content_view: FactoryBot.create(:katello_content_view, organization: @env.organization),
-              lifecycle_environment: @env2
-            ),
-          ],
-          organization: @env.organization
+          content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)],
+          organization: env.organization
         )
 
         @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)

data/test/controllers/inventory_upload/api/inventory_controller_test.rb

@@ -14,7 +14,7 @@ module InventoryUpload::Api
         .expects(:start_report_generation)
         .with(@test_org.id.to_s, @disconnected)
 
-      post :generate_report, params: { organization_id: @test_org.id, disconnected: @disconnected }
+      post :generate_report, params: { organization_id: @test_org.id, no_upload: @disconnected }
 
       assert_response :success
     end

data/test/jobs/insights_full_sync_test.rb

@@ -65,6 +65,8 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Hits data is replaced with data from cloud' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(false)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits)
 
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync)
@@ -79,7 +81,31 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
     assert_equal 1, @host2.insights.hits.count
   end
 
+  test 'Manifest is expired do not run task steps' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(true)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
+
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).never
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync).never
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_self).never
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization])
+  end
+
+  test 'Manifest is deleted do not run task steps' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(false)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(false)
+
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).never
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync).never
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_self).never
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization])
+  end
+
   test 'Hits counters are reset correctly' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(false)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits).twice
 
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_hosts_sync)
@@ -97,6 +123,8 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Hits ignoring non-existent hosts' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(false)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     hits_json = <<-HITS_JSON
     [
         {

data/test/jobs/insights_resolutions_sync_test.rb

@@ -73,6 +73,7 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
   end
 
   test 'Resolutions data is replaced with data from cloud' do
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsResolutionsSync.any_instance.stubs(:query_insights_resolutions).returns(@resolutions)
 
     ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
@@ -82,7 +83,28 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     assert_equal 2, @rule.resolutions.count
   end
 
+  test 'Manifest is deleted do not run task steps' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(false)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(false)
+    InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
+
+    assert_equal 0, InsightsResolution.all.count
+  end
+
+  test 'Manifest is expired do not run task steps' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(true)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
+    InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
+
+    assert_equal 0, InsightsResolution.all.count
+  end
+
   test 'Skips pinging the cloud if no rule ids were found' do
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
     InsightsRule.all.delete_all
 

data/test/jobs/inventory_full_sync_test.rb

@@ -4,6 +4,7 @@ require 'foreman_tasks/test_helpers'
 class InventoryFullSyncTest < ActiveSupport::TestCase
   include ForemanTasks::TestHelpers::WithInThreadExecutor
   include MockCerts
+  include KatelloCVEHelper
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
@@ -11,15 +12,15 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
     InventorySync::Async::InventoryFullSync.any_instance.stubs(:plan_self_host_sync)
     Organization.any_instance.stubs(:manifest_expired?).returns(false)
 
-    env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
+    cve = make_cve
+    env = cve.lifecycle_environment
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host1 = FactoryBot.create(
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization
     )
@@ -33,7 +34,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization
     )
@@ -46,7 +47,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization
     )

data/test/jobs/inventory_hosts_sync_test.rb

@@ -4,19 +4,19 @@ require 'foreman_tasks/test_helpers'
 class InventoryHostsSyncTest < ActiveSupport::TestCase
   include ForemanTasks::TestHelpers::WithInThreadExecutor
   include MockCerts
+  include KatelloCVEHelper
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-
-    env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
-
+    cve = make_cve
+    env = cve.lifecycle_environment
+    cv = cve.content_view
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host1 = FactoryBot.create(
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cv,
       lifecycle_environment: env,
       organization: env.organization
     )
@@ -30,7 +30,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cv,
       lifecycle_environment: env,
       organization: env.organization
     )

data/test/jobs/upload_report_job_test.rb

@@ -18,7 +18,7 @@ class UploadReportJobTest < ActiveSupport::TestCase
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
-    assert_match(/Upload was stopped/, progress_output.full_output)
+    assert_match(/Upload canceled/, progress_output.full_output)
     assert_match(/exit 1/, progress_output.status)
   end
 

data/test/test_plugin_helper.rb

@@ -118,6 +118,20 @@ module CandlepinIsolation
   end
 end
 
+module KatelloCVEHelper
+  def make_cve(lifecycle_environment: nil, content_view: nil)
+    env = lifecycle_environment || FactoryBot.create(:katello_k_t_environment)
+    content_view ||= FactoryBot.create(:katello_content_view, organization: env.organization)
+    cvv = ::Katello::ContentViewVersion.create!(:major => 2, :content_view => content_view)
+    FactoryBot.create(
+      :katello_content_view_environment,
+      content_view_version: cvv,
+      content_view: content_view,
+      lifecycle_environment: env
+    )
+  end
+end
+
 module UpstreamOnlySettingsTestHelper
   def self.set_if_available(setting_name, value: true)
     Setting[setting_name] = value

data/test/unit/archived_report_generator_test.rb

@@ -2,18 +2,18 @@ require 'test_plugin_helper'
 
 class ArchivedReportGeneratorTest < ActiveSupport::TestCase
   include MockForemanHostname
+  include KatelloCVEHelper
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
-
-    env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
+    cve = make_cve
+    env = cve.lifecycle_environment
 
     @host = FactoryBot.create(
       :host,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
+      content_view: cve.content_view,
       lifecycle_environment: env,
       organization: env.organization
     )

data/test/unit/services/foreman_rh_cloud/branch_info_test.rb

@@ -1,21 +1,22 @@
 require 'test_plugin_helper'
 
 class BranchInfoTest < ActiveSupport::TestCase
+  include KatelloCVEHelper
+
   setup do
     User.current = User.find_by(login: 'secret_admin')
 
-    @env = FactoryBot.create(:katello_k_t_environment)
-    cv = @env.content_views << FactoryBot.create(:katello_content_view, organization: @env.organization)
-
+    cve = make_cve
+    env = cve.lifecycle_environment
     @host = FactoryBot.create(
       :host,
       :with_subscription,
       :with_content,
       :with_hostgroup,
       :with_parameter,
-      content_view: cv.first,
-      lifecycle_environment: @env,
-      organization: @env.organization
+      content_view: cve.content_view,
+      lifecycle_environment: env,
+      organization: env.organization
     )
 
     @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)