From fff6fa7d7a7e61aa7d1a60757002bb5a7a1cb982 Mon Sep 17 00:00:00 2001
From: Martin Slemr <mslemr@redhat.com>
Date: Thu, 23 Mar 2023 14:16:20 +0100
Subject: [PATCH] Additional Licensing values

---
 awx/main/utils/licensing.py                            |  6 +++++-
 .../SubscriptionDetail/SubscriptionDetail.js           | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/awx/main/utils/licensing.py b/awx/main/utils/licensing.py
index b3ea7723e5..c692e3131a 100644
--- a/awx/main/utils/licensing.py
+++ b/awx/main/utils/licensing.py
@@ -388,9 +388,13 @@ class Licenser(object):
         if subscription_model == SUBSCRIPTION_USAGE_MODEL_UNIQUE_HOSTS:
             automated_instances = HostMetric.active_objects.count()
             first_host = HostMetric.active_objects.only('first_automation').order_by('first_automation').first()
+            attrs['deleted_instances'] = HostMetric.objects.filter(deleted=True).count()
+            attrs['reactivated_instances'] = HostMetric.active_objects.filter(deleted_counter__gte=1).count()
         else:
-            automated_instances = HostMetric.objects.count()
+            automated_instances = 0
             first_host = HostMetric.objects.only('first_automation').order_by('first_automation').first()
+            attrs['deleted_instances'] = 0
+            attrs['reactivated_instances'] = 0
 
         if first_host:
             automated_since = int(first_host.first_automation.timestamp())
diff --git a/awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.js b/awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.js
index a9349e3345..bbb4935c6f 100644
--- a/awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.js
+++ b/awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.js
@@ -112,6 +112,16 @@ function SubscriptionDetail() {
             label={t`Hosts remaining`}
             value={license_info.free_instances}
           />
+          <Detail
+            dataCy="subscription-hosts-deleted"
+            label={t`Hosts deleted`}
+            value={license_info.deleted_instances}
+          />
+          <Detail
+              dataCy="subscription-hosts-reactivated"
+              label={t`Active hosts previously deleted`}
+              value={license_info.reactivated_instances}
+          />
           {license_info.instance_count < 9999999 && (
             <Detail
               dataCy="subscription-hosts-available"