foreman_rh_cloud 13.0.11 → 13.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3cd43b3c072653346cba58fc50735fe1a91534d5e62260d0808be259f88b621
-  data.tar.gz: afe8d3c292de19def85bc357dbe6c320968f8b51ddd1b5aff9f5d01cbf378b50
+  metadata.gz: 972f28c475749451f2833bc918cfe95601eec5db19e024aec0d550a6f8844ad8
+  data.tar.gz: cf12bf0072e5596db8b10fd7901e8c600482bfd0799426da0d7193a7ddd8d1bb
 SHA512:
-  metadata.gz: ff518b50470965cdbed1097e72dabaac4dd9a8c07eb6859ddaea0c071965c7b05853c125f624e99c856ee6898d58692dcd2dd499da9e389ec0b3881432c49f2b
-  data.tar.gz: 6ca347f830741453325dbfe725ab6118be6e211094b1797345abb9fa27fa25e538b13cbc76dab45d2d31b77543434894445137565d486b879372dc09d11bd3e1
+  metadata.gz: fe0c825977e36641a874663dc97ba5efcb80ba3dd130123e445739e8ae72c5aff3b2e40859f9e73f3b82ae2be863307d190adf80cc544c4eef52171959bdbd73
+  data.tar.gz: d1f9c3d4ef5dd131b9e28a3725ebd6f6bb3bab01e5e30e1970954085264bdaa632449bc4e4ff32ccfbeb5aaa126a4f854d57d2b11fbddc272a89526185fd3811

data/app/controllers/concerns/foreman_rh_cloud/registration_manager_extensions.rb

@@ -13,13 +13,13 @@ module ForemanRhCloud
       host.reload
 
       # Only delete from HBI in IoP mode (hosted mode uses async job for cleanup)
-      hbi_host_destroy(host) if ForemanRhCloud.with_iop_smart_proxy? && !organization_destroy && host.insights_facet&.uuid&.presence
+      hbi_host_destroy(host) if ForemanRhCloud.with_iop_smart_proxy? && !organization_destroy && host.insights_uuid.presence
       host.insights&.destroy!
       super(host, options)
     end
 
     def hbi_host_destroy(host)
-      uuid = host.insights_facet.uuid
+      uuid = host.insights_uuid
       logger.debug "Unregistering host #{uuid} from HBI"
       execute_cloud_request(
         organization: host.organization,

data/app/controllers/concerns/insights_cloud/package_profile_upload_extensions.rb

@@ -21,6 +21,9 @@ module InsightsCloud
         @host.id
       )
 
+      # Ensure insights UUID matches subscription UUID (only runs in IoP mode per method guard above)
+      @host.ensure_iop_insights_uuid
+
       # in IoP case, the hosts are identified by the sub-man ID, and we can assume they already
       # exist in the local inventory. This will also handle facet creation for new hosts.
       return if @host.insights

data/app/models/concerns/rh_cloud_host.rb

@@ -26,5 +26,19 @@ module RhCloudHost
     def insights_facet
       insights
     end
+
+    # In IoP, read directly from the subscription facet to avoid stale data (see comment on ensure_iop_insights_uuid)
+    def insights_uuid
+      ForemanRhCloud.with_iop_smart_proxy? ? subscription_facet&.uuid : insights_facet&.uuid
+    end
+
+    # In non-IoP, insights_facet uuids are assigned by Hosted.
+    # In IoP, insights_facet uuids must match Katello subscription_facet uuids.
+    # If the host was previously registered to hosted Insights,
+    # we need to correct its uuid.
+    def ensure_iop_insights_uuid
+      return unless insights_facet.present? && subscription_facet.present? && insights_facet.uuid != subscription_facet.uuid
+      insights_facet.update!(uuid: subscription_facet.uuid)
+    end
   end
 end

data/app/models/foreman_rh_cloud/ping.rb

@@ -7,7 +7,7 @@ module ForemanRhCloud
       include ForemanRhCloud::CertAuth
 
       def iop_smart_proxy_url
-        @iop_smart_proxy_url ||= ForemanRhCloud.iop_smart_proxy.url
+        ForemanRhCloud.iop_smart_proxy&.url
       end
 
       def service_urls
@@ -33,6 +33,7 @@ module ForemanRhCloud
       end
 
       def ping
+        return {} unless ForemanRhCloud.with_iop_smart_proxy?
         ping_services
       end
 

data/app/views/api/v2/advisor_engine/host_details.json.rabl

@@ -1,9 +1,7 @@
 collection @hosts
 
 attributes :name
-node :insights_uuid do |host|
-  host.insights_facet&.uuid
-end
+node :insights_uuid, &:insights_uuid
 node :insights_hit_details do |host|
   host&.facts('insights::hit_details')&.values&.first
 end

data/app/views/api/v2/hosts/insights/base.rabl

@@ -1,5 +1,6 @@
-attributes :uuid
-
+node :uuid do |facet|
+  facet&.host&.insights_uuid
+end
 node :insights_hit_details do |facet|
   facet&.host&.facts('insights::hit_details')&.values&.first
 end

data/lib/foreman_rh_cloud/plugin.rb

@@ -118,14 +118,17 @@ module ForemanRhCloud
           end
         end
 
+        # Preload insights facet to avoid N+1 queries when rendering host list with facets
+        add_controller_action_scope('Api::V2::HostsController', :index) do |base_scope|
+          base_scope.preload(:insights)
+        end
+
         register_global_js_file 'global'
 
         register_custom_status InventorySync::InventoryStatus
         register_custom_status InsightsClientReportStatus
-        if ForemanRhCloud.with_iop_smart_proxy?
-          register_ping_extension { ForemanRhCloud::Ping.ping }
-          register_status_extension { ForemanRhCloud::Ping.status }
-        end
+        register_ping_extension { ForemanRhCloud::Ping.ping }
+        register_status_extension { ForemanRhCloud::Ping.status }
 
         describe_host do
           overview_buttons_provider :insights_host_overview_buttons
@@ -148,7 +151,7 @@ module ForemanRhCloud
         end
 
         ::Foreman::Plugin.app_metadata_registry.register(:foreman_rh_cloud, {
-          iop: ForemanRhCloud.with_iop_smart_proxy?,
+          iop: -> { ForemanRhCloud.with_iop_smart_proxy? },
         })
 
         extend_template_helpers ForemanRhCloud::TemplateRendererHelper

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.0.11'.freeze
+  VERSION = '13.0.12'.freeze
 end

data/lib/foreman_rh_cloud.rb

@@ -14,15 +14,15 @@ module ForemanRhCloud
 
   def self.base_url
     # for testing set ENV to 'https://ci.cloud.redhat.com'
-    @base_url ||= env_or_on_premise_url('SATELLITE_RH_CLOUD_URL') || 'https://cloud.redhat.com'
+    env_or_on_premise_url('SATELLITE_RH_CLOUD_URL') || 'https://cloud.redhat.com'
   end
 
   def self.cert_base_url
-    @cert_base_url ||= env_or_on_premise_url('SATELLITE_CERT_RH_CLOUD_URL') || 'https://cert.cloud.redhat.com'
+    env_or_on_premise_url('SATELLITE_CERT_RH_CLOUD_URL') || 'https://cert.cloud.redhat.com'
   end
 
   def self.legacy_insights_url
-    @legacy_insights_url ||= env_or_on_premise_url('SATELLITE_LEGACY_INSIGHTS_URL') || 'https://cert-api.access.redhat.com'
+    env_or_on_premise_url('SATELLITE_LEGACY_INSIGHTS_URL') || 'https://cert-api.access.redhat.com'
   end
 
   def self.verify_ssl_method

data/lib/insights_cloud/async/connector_playbook_execution_reporter_task.rb

@@ -126,10 +126,10 @@ module InsightsCloud
 
       def invocation_status
         hosts_state = Hash[job_invocation.targeting.hosts.map do |host|
-          next unless host.insights&.uuid
+          next unless host.insights_uuid
           [
-            host.insights.uuid,
-            task_status(job_invocation.sub_task_for_host(host), host.insights.uuid),
+            host.insights_uuid,
+            task_status(job_invocation.sub_task_for_host(host), host.insights_uuid),
           ]
         end.compact]
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "13.0.11",
+  "version": "13.0.12",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

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

@@ -13,7 +13,7 @@ module InsightsCloud
       end
 
       test 'shows hosts with uuids' do
-        uuids = [@host1.insights.uuid, @host2.insights.uuid]
+        uuids = [@host1.insights_uuid, @host2.insights_uuid]
         get :host_details, params: { organization_id: @test_org.id, host_uuids: uuids }
         assert_response :success
         assert_template 'api/v2/advisor_engine/host_details'
@@ -21,6 +21,33 @@ module InsightsCloud
         refute_equal @test_org.hosts.count, assigns(:hosts).count
       end
 
+      test 'in IoP mode host_details uses subscription uuid when insights uuid is stale' do
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+
+        stale_insights_uuid = 'stale-insights-uuid-123'
+        subscription_uuid   = 'subscription-uuid-456'
+
+        # Create host with diverging facet UUIDs
+        host = FactoryBot.create(:host, :with_subscription, organization: @test_org)
+        host.subscription_facet.update!(uuid: subscription_uuid)
+        host.insights = FactoryBot.create(:insights_facet, host_id: host.id, uuid: stale_insights_uuid)
+        host.save!
+
+        # Query using the stale insights UUID
+        get :host_details, params: {
+          organization_id: @test_org.id,
+          host_uuids: [stale_insights_uuid],
+        }
+
+        assert_response :success
+        body = JSON.parse(response.body)
+
+        # Should return the subscription UUID, not the stale insights UUID
+        insights_uuids = body.map { |h| h['insights_uuid'] }
+        assert_includes insights_uuids, subscription_uuid, "Should use subscription UUID in IoP mode"
+        refute_includes insights_uuids, stale_insights_uuid, "Should not use stale insights UUID"
+      end
+
       test 'shows error when no hosts found' do
         get :host_details, params: { organization_id: @test_org.id, host_uuids: ['nonexistentuuid'] }
         assert_response :not_found

data/test/factories/insights_factories.rb

@@ -58,5 +58,34 @@ FactoryBot.modify do
         host.insights = FactoryBot.create(:insights_facet, :with_hits, host_id: host.id)
       end
     end
+
+    trait :with_mismatched_insights_uuid do
+      # Simulates host previously registered to cloud with stale UUID
+      # Requires :with_subscription trait to be used together
+      after(:create) do |host, _evaluator|
+        raise "subscription_facet required for :with_mismatched_insights_uuid trait" unless host.subscription_facet&.uuid
+
+        host.insights = FactoryBot.create(
+          :insights_facet,
+          host_id: host.id,
+          uuid: 'stale-cloud-uuid' # Different from subscription_facet
+        )
+      end
+    end
+
+    trait :with_synced_insights_uuid do
+      # Ideal state: insights_facet UUID matches subscription_facet UUID
+      # Requires :with_subscription trait to be used together
+      after(:create) do |host, _evaluator|
+        raise "subscription_facet required for :with_synced_insights_uuid trait" unless host.subscription_facet&.uuid
+
+        subscription_uuid = host.subscription_facet.uuid
+        host.insights = FactoryBot.create(
+          :insights_facet,
+          host_id: host.id,
+          uuid: subscription_uuid  # Same as subscription_facet
+        )
+      end
+    end
   end
 end

data/test/unit/foreman_rh_cloud_iop_metadata_test.rb

@@ -0,0 +1,200 @@
+require 'test_plugin_helper'
+
+class ForemanRhCloudIopMetadataTest < ActiveSupport::TestCase
+  setup do
+    # Clean up any existing IoP smart proxies
+    SmartProxy.unscoped.with_features('iop').destroy_all
+  end
+
+  teardown do
+    # Clean up
+    SmartProxy.unscoped.with_features('iop').destroy_all
+  end
+
+  def create_iop_proxy(url: 'https://iop.example.com')
+    feature = Feature.find_or_create_by(name: 'iop')
+    proxy = FactoryBot.create(:smart_proxy, :url => url)
+    # Clear any existing associations for this feature
+    feature.reload
+    feature.smart_proxies.clear
+    proxy.features << feature
+    proxy
+  end
+
+  describe 'plugin metadata' do
+    test 'iop metadata is false when no IoP smart proxy exists' do
+      # Ensure no IoP proxy exists
+      refute ForemanRhCloud.with_iop_smart_proxy?
+
+      # Plugin metadata should reflect this
+      metadata = ::Foreman::Plugin.app_metadata_registry.all_plugin_metadata[:foreman_rh_cloud]
+
+      # The value is a lambda, so we need to call it
+      assert_kind_of Proc, metadata[:iop]
+      refute metadata[:iop].call
+    end
+
+    test 'iop metadata is true when IoP smart proxy exists' do
+      # Create an IoP smart proxy
+      create_iop_proxy
+
+      # Verify proxy exists
+      assert ForemanRhCloud.with_iop_smart_proxy?
+
+      # Plugin metadata should reflect this
+      metadata = ::Foreman::Plugin.app_metadata_registry.all_plugin_metadata[:foreman_rh_cloud]
+
+      # The value is a lambda, so we need to call it
+      assert_kind_of Proc, metadata[:iop]
+      assert metadata[:iop].call
+    end
+
+    test 'iop metadata updates when IoP smart proxy is created' do
+      # Initially no IoP proxy
+      metadata = ::Foreman::Plugin.app_metadata_registry.all_plugin_metadata[:foreman_rh_cloud]
+      refute metadata[:iop].call
+
+      # Create an IoP smart proxy
+      create_iop_proxy
+
+      # Metadata should now return true
+      assert metadata[:iop].call
+    end
+
+    test 'iop metadata updates when IoP smart proxy is destroyed' do
+      # Create an IoP smart proxy
+      proxy = create_iop_proxy
+
+      metadata = ::Foreman::Plugin.app_metadata_registry.all_plugin_metadata[:foreman_rh_cloud]
+      assert metadata[:iop].call
+
+      # Destroy the proxy
+      proxy.destroy
+
+      # Metadata should now return false
+      refute metadata[:iop].call
+    end
+  end
+
+  describe 'URL methods' do
+    test 'base_url returns cloud URL when no IoP smart proxy exists' do
+      assert_equal 'https://cloud.redhat.com', ForemanRhCloud.base_url
+    end
+
+    test 'cert_base_url returns cloud URL when no IoP smart proxy exists' do
+      assert_equal 'https://cert.cloud.redhat.com', ForemanRhCloud.cert_base_url
+    end
+
+    test 'legacy_insights_url returns cloud URL when no IoP smart proxy exists' do
+      assert_equal 'https://cert-api.access.redhat.com', ForemanRhCloud.legacy_insights_url
+    end
+
+    test 'base_url returns IoP URL when IoP smart proxy exists' do
+      create_iop_proxy
+
+      assert_equal 'https://iop.example.com', ForemanRhCloud.base_url
+    end
+
+    test 'cert_base_url returns IoP URL when IoP smart proxy exists' do
+      create_iop_proxy
+
+      assert_equal 'https://iop.example.com', ForemanRhCloud.cert_base_url
+    end
+
+    test 'legacy_insights_url returns IoP URL when IoP smart proxy exists' do
+      create_iop_proxy
+
+      assert_equal 'https://iop.example.com', ForemanRhCloud.legacy_insights_url
+    end
+
+    test 'base_url returns ENV var when set' do
+      ENV['SATELLITE_RH_CLOUD_URL'] = 'https://custom.example.com'
+
+      assert_equal 'https://custom.example.com', ForemanRhCloud.base_url
+    ensure
+      ENV.delete('SATELLITE_RH_CLOUD_URL')
+    end
+
+    test 'cert_base_url returns ENV var when set' do
+      ENV['SATELLITE_CERT_RH_CLOUD_URL'] = 'https://env-cert.cloud.test'
+
+      assert_equal 'https://env-cert.cloud.test', ForemanRhCloud.cert_base_url
+    ensure
+      ENV.delete('SATELLITE_CERT_RH_CLOUD_URL')
+    end
+
+    test 'legacy_insights_url returns ENV var when set' do
+      ENV['SATELLITE_LEGACY_INSIGHTS_URL'] = 'https://env-legacy.insights.test'
+
+      assert_equal 'https://env-legacy.insights.test', ForemanRhCloud.legacy_insights_url
+    ensure
+      ENV.delete('SATELLITE_LEGACY_INSIGHTS_URL')
+    end
+
+    test 'base_url prefers IoP URL over ENV var' do
+      ENV['SATELLITE_RH_CLOUD_URL'] = 'https://custom.example.com'
+
+      create_iop_proxy
+
+      # IoP URL should take precedence
+      assert_equal 'https://iop.example.com', ForemanRhCloud.base_url
+    ensure
+      ENV.delete('SATELLITE_RH_CLOUD_URL')
+    end
+
+    test 'cert_base_url prefers IoP URL over ENV var' do
+      ENV['SATELLITE_CERT_RH_CLOUD_URL'] = 'https://env-cert.cloud.test'
+
+      create_iop_proxy
+
+      # IoP URL should take precedence
+      assert_equal 'https://iop.example.com', ForemanRhCloud.cert_base_url
+    ensure
+      ENV.delete('SATELLITE_CERT_RH_CLOUD_URL')
+    end
+
+    test 'legacy_insights_url prefers IoP URL over ENV var' do
+      ENV['SATELLITE_LEGACY_INSIGHTS_URL'] = 'https://env-legacy.insights.test'
+
+      create_iop_proxy
+
+      # IoP URL should take precedence
+      assert_equal 'https://iop.example.com', ForemanRhCloud.legacy_insights_url
+    ensure
+      ENV.delete('SATELLITE_LEGACY_INSIGHTS_URL')
+    end
+
+    test 'URL methods update when IoP smart proxy is created' do
+      # Initially returns cloud URLs
+      assert_equal 'https://cloud.redhat.com', ForemanRhCloud.base_url
+      assert_equal 'https://cert.cloud.redhat.com', ForemanRhCloud.cert_base_url
+      assert_equal 'https://cert-api.access.redhat.com', ForemanRhCloud.legacy_insights_url
+
+      # Create an IoP smart proxy
+      create_iop_proxy
+
+      # Should now return IoP URL for all helpers
+      assert_equal 'https://iop.example.com', ForemanRhCloud.base_url
+      assert_equal 'https://iop.example.com', ForemanRhCloud.cert_base_url
+      assert_equal 'https://iop.example.com', ForemanRhCloud.legacy_insights_url
+    end
+
+    test 'URL methods update when IoP smart proxy is destroyed' do
+      # Create an IoP smart proxy
+      proxy = create_iop_proxy
+
+      # Initially returns IoP URL for all helpers
+      assert_equal 'https://iop.example.com', ForemanRhCloud.base_url
+      assert_equal 'https://iop.example.com', ForemanRhCloud.cert_base_url
+      assert_equal 'https://iop.example.com', ForemanRhCloud.legacy_insights_url
+
+      # Destroy the proxy
+      proxy.destroy
+
+      # Should now return cloud URLs again
+      assert_equal 'https://cloud.redhat.com', ForemanRhCloud.base_url
+      assert_equal 'https://cert.cloud.redhat.com', ForemanRhCloud.cert_base_url
+      assert_equal 'https://cert-api.access.redhat.com', ForemanRhCloud.legacy_insights_url
+    end
+  end
+end

data/test/unit/lib/foreman_rh_cloud/registration_manager_extensions_test.rb

@@ -4,8 +4,8 @@ module ForemanRhCloud
   class RegistrationManagerExtensionsTest < ActiveSupport::TestCase
     setup do
       @org = FactoryBot.create(:organization)
-      @host = FactoryBot.create(:host, :managed, organization: @org)
-      @insights_facet = ::InsightsFacet.create!(host: @host, uuid: 'test-uuid-123')
+      @host = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      @insights_facet = ::InsightsFacet.create!(host: @host, uuid: @host.subscription_facet.uuid)
 
       # Stub Candlepin interaction (from Katello)
       ::Katello::Resources::Candlepin::Consumer.stubs(:destroy)
@@ -15,9 +15,9 @@ module ForemanRhCloud
     end
 
     context 'unregister_host' do
-      test 'should call HBI delete in IoP mode when host has insights facet with UUID' do
+      test 'should call HBI delete in IoP mode when host has insights UUID' do
         ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
-        expected_url = ForemanInventoryUpload.host_by_id_url('test-uuid-123')
+        expected_url = ForemanInventoryUpload.host_by_id_url(@host.subscription_facet.uuid)
 
         # Expect the cloud request to be made
         Katello::RegistrationManager.expects(:execute_cloud_request).with do |params|
@@ -45,44 +45,6 @@ module ForemanRhCloud
         assert_nil InsightsFacet.find_by(id: @insights_facet.id)
       end
 
-      test 'should NOT call HBI delete when host has no insights_facet' do
-        host_without_facet = FactoryBot.create(:host, :managed, organization: @org)
-        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
-
-        Katello::RegistrationManager.expects(:execute_cloud_request).never
-
-        assert_nothing_raised do
-          Katello::RegistrationManager.unregister_host(host_without_facet, unregistering: true)
-        end
-      end
-
-      test 'should NOT call HBI delete when host has insights_facet with empty UUID' do
-        host_with_empty_uuid_facet = FactoryBot.create(:host, :managed, organization: @org)
-        empty_uuid_facet = InsightsFacet.create!(host: host_with_empty_uuid_facet, uuid: '')
-        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
-
-        Katello::RegistrationManager.expects(:execute_cloud_request).never
-
-        assert_nothing_raised do
-          Katello::RegistrationManager.unregister_host(host_with_empty_uuid_facet, unregistering: true)
-        end
-
-        assert_nil InsightsFacet.find_by(id: empty_uuid_facet.id)
-      end
-
-      test 'should NOT call HBI delete when insights_facet has no UUID' do
-        facet_id = @insights_facet.id
-        @insights_facet.update(uuid: nil)
-        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
-
-        Katello::RegistrationManager.expects(:execute_cloud_request).never
-
-        Katello::RegistrationManager.unregister_host(@host, unregistering: true)
-
-        # Verify facet was still destroyed
-        assert_nil InsightsFacet.find_by(id: facet_id)
-      end
-
       test 'should always destroy insights_facet regardless of IoP mode' do
         facet_id = @insights_facet.id
         ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)

data/test/unit/rh_cloud_host_test.rb

@@ -0,0 +1,191 @@
+require 'test_plugin_helper'
+
+class RhCloudHostTest < ActiveSupport::TestCase
+  setup do
+    @org = FactoryBot.create(:organization)
+  end
+
+  teardown do
+    ForemanRhCloud.unstub(:with_iop_smart_proxy?)
+  end
+
+  context 'insights_uuid method' do
+    test 'returns insights_facet uuid in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      @host = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      @host.insights = FactoryBot.create(:insights_facet, host_id: @host.id, uuid: 'insights-123')
+
+      assert_equal 'insights-123', @host.insights_uuid
+      assert_not_equal @host.subscription_facet.uuid, @host.insights_uuid
+    end
+
+    test 'returns subscription_facet uuid in IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+      @host = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      @host.insights = FactoryBot.create(:insights_facet, host_id: @host.id, uuid: 'insights-456')
+
+      assert_equal @host.subscription_facet.uuid, @host.insights_uuid
+      assert_not_equal 'insights-456', @host.insights_uuid
+    end
+
+    test 'returns nil when insights_facet missing in non-IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      @host = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+
+      assert_nil @host.insights_uuid
+    end
+
+    test 'returns nil when subscription_facet missing in IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+      @host = FactoryBot.create(:host, :managed, organization: @org)
+      @host.insights = FactoryBot.create(:insights_facet, host_id: @host.id, uuid: 'insights-789')
+
+      assert_nil @host.insights_uuid
+    end
+
+    test 'returns nil when both facets missing' do
+      @host = FactoryBot.create(:host, :managed, organization: @org)
+
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      assert_nil @host.insights_uuid
+
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+      assert_nil @host.insights_uuid
+    end
+
+    test 'never returns stale insights_facet uuid in IoP mode' do
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+      @host = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      current_uuid = @host.subscription_facet.uuid
+      @host.insights = FactoryBot.create(:insights_facet, host_id: @host.id, uuid: 'stale-456')
+
+      # Should return subscription_facet UUID, never the stale insights_facet UUID
+      assert_equal current_uuid, @host.insights_uuid
+      assert_not_equal 'stale-456', @host.insights_uuid
+
+      # Verify multiple calls always return subscription_facet UUID
+      3.times do
+        assert_equal current_uuid, @host.insights_uuid
+      end
+    end
+
+    test 'dynamically responds to IoP mode changes' do
+      @host = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      @host.insights = FactoryBot.create(:insights_facet, host_id: @host.id, uuid: 'insights-123')
+      subscription_uuid = @host.subscription_facet.uuid
+
+      # Non-IoP mode: should return insights_facet UUID
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      assert_equal 'insights-123', @host.insights_uuid
+
+      # IoP mode: should return subscription_facet UUID
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+      assert_equal subscription_uuid, @host.insights_uuid
+
+      # Toggle back to non-IoP mode
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+      assert_equal 'insights-123', @host.insights_uuid
+    end
+  end
+
+  context 'ensure_iop_insights_uuid method' do
+    test 'updates insights_facet uuid when different from subscription_facet' do
+      @host = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      correct_uuid = @host.subscription_facet.uuid
+      @host.insights = FactoryBot.create(:insights_facet, host_id: @host.id, uuid: 'wrong-456')
+
+      assert_equal 'wrong-456', @host.insights_facet.uuid
+
+      @host.ensure_iop_insights_uuid
+
+      assert_equal correct_uuid, @host.insights_facet.reload.uuid
+    end
+
+    test 'does nothing when uuids already match' do
+      @host = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      matching_uuid = @host.subscription_facet.uuid
+      @host.insights = FactoryBot.create(:insights_facet, host_id: @host.id, uuid: matching_uuid)
+
+      # Expect no update call since UUIDs already match
+      @host.insights_facet.expects(:update!).never
+
+      @host.ensure_iop_insights_uuid
+
+      assert_equal matching_uuid, @host.insights_facet.uuid
+    end
+
+    test 'does nothing when insights_facet missing' do
+      @host = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+
+      assert_nothing_raised do
+        @host.ensure_iop_insights_uuid
+      end
+    end
+
+    test 'does nothing when subscription_facet missing' do
+      @host = FactoryBot.create(:host, :managed, organization: @org)
+      @host.insights = FactoryBot.create(:insights_facet, host_id: @host.id, uuid: 'insights-999')
+      original_uuid = @host.insights_facet.uuid
+
+      assert_nothing_raised do
+        @host.ensure_iop_insights_uuid
+      end
+
+      assert_equal original_uuid, @host.insights_facet.uuid
+    end
+
+    test 'does nothing when both facets missing' do
+      @host = FactoryBot.create(:host, :managed, organization: @org)
+
+      assert_nothing_raised do
+        @host.ensure_iop_insights_uuid
+      end
+    end
+
+    test 'handles nil uuids gracefully' do
+      @host = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+
+      # Scenario 1: subscription_facet uuid is nil (shouldn't happen but test gracefully)
+      @host.subscription_facet.update(uuid: nil)
+      @host.insights = FactoryBot.create(:insights_facet, host_id: @host.id, uuid: 'some-uuid')
+
+      assert_nothing_raised do
+        @host.ensure_iop_insights_uuid
+      end
+
+      # Scenario 2: insights_facet uuid is nil
+      @host.subscription_facet.update(uuid: 'valid-uuid')
+      @host.insights_facet.update(uuid: nil)
+
+      assert_nothing_raised do
+        @host.ensure_iop_insights_uuid
+      end
+
+      # Should update to match subscription_facet
+      assert_equal 'valid-uuid', @host.insights_facet.reload.uuid
+    end
+
+    test 'corrects stale uuid after cloud registration' do
+      # Simulate a host that was previously registered to cloud with cloud-assigned UUID
+      @host = FactoryBot.create(:host, :managed, :with_subscription, organization: @org)
+      local_uuid = @host.subscription_facet.uuid
+      @host.insights = FactoryBot.create(:insights_facet, host_id: @host.id, uuid: 'cloud-456')
+
+      # Before sync: insights_facet has stale cloud UUID
+      assert_equal 'cloud-456', @host.insights_facet.uuid
+
+      # In IoP mode, insights_uuid should return subscription_facet UUID (not stale)
+      ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+      assert_equal local_uuid, @host.insights_uuid
+
+      # Call sync to correct the stale UUID
+      @host.ensure_iop_insights_uuid
+
+      # After sync: insights_facet UUID should match subscription_facet UUID
+      assert_equal local_uuid, @host.insights_facet.reload.uuid
+
+      # Verify insights_uuid still returns correct value
+      assert_equal local_uuid, @host.insights_uuid
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 13.0.11
+  version: 13.0.12
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -277,12 +277,14 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
+- test/unit/foreman_rh_cloud_iop_metadata_test.rb
 - test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/lib/foreman_rh_cloud/registration_manager_extensions_test.rb
 - test/unit/lib/insights_cloud/async/vmaas_reposcan_sync_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/playbook_progress_generator_test.rb
+- test/unit/rh_cloud_host_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/rh_cloud_permissions_test.rb
 - test/unit/services/foreman_rh_cloud/branch_info_test.rb
@@ -691,12 +693,14 @@ test_files:
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
+- test/unit/foreman_rh_cloud_iop_metadata_test.rb
 - test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/lib/foreman_rh_cloud/registration_manager_extensions_test.rb
 - test/unit/lib/insights_cloud/async/vmaas_reposcan_sync_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/playbook_progress_generator_test.rb
+- test/unit/rh_cloud_host_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/rh_cloud_permissions_test.rb
 - test/unit/services/foreman_rh_cloud/branch_info_test.rb