From: Yaarit Hatuka <yhatuka@ibm.com>
Date: Mon, 21 Apr 2025 19:54:16 +0000 (-0400)
Subject: mgr/call_home: add country code to the inventory report
X-Git-Tag: testing/wip-pdonnell-testing-20260323.122957-tentacle~539
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=803f0b087eb5aa0061ac29de79f78df8d4f269b0;p=ceph-ci.git

mgr/call_home: add country code to the inventory report

Country code was missing from the inventory report, adding it.

Resolves: rhbz#2361502

Signed-off-by: Yaarit Hatuka <yhatuka@ibm.com>
(cherry picked from commit 22b67301e27362e6f855c4d05b1003b7dee1a247)
---

diff --git a/src/pybind/mgr/call_home_agent/report.py b/src/pybind/mgr/call_home_agent/report.py
index 9c741efa97e..7e62a9c5a8b 100644
--- a/src/pybind/mgr/call_home_agent/report.py
+++ b/src/pybind/mgr/call_home_agent/report.py
@@ -66,7 +66,7 @@ class Report:
                 "asset_type": "RedHatMarine",
                 "asset_vendor": "IBM",
                 "asset_virtual_id": self.agent.ceph_cluster_id,
-                "country_code": "",
+                "country_code": self.agent.customer_country_code,
                 "event_id": report_event_id,
                 "event_time": report_times.time,
                 "event_time_ms": report_times.time_ms,
@@ -172,6 +172,7 @@ class EventGeneric(Event):
                 "request_time": report_times.time_ms,
                 "content": {},  # will be filled later
                 "ibm_customer_number": self.agent.icn,
+                "customer_country_code": self.agent.customer_country_code,
                 "product_id_list" : [
                     ['5900-AVA', 'D0CYVZX'],
                     ['5900-AVA', 'D0CYWZX'],