External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-04 18:21:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Set subscription type as developer for developer subscriptions. (#14584)

Browse Source 
* Set subscription type as developer for developer subscriptions.

Signed-off-by: Tong He <the@redhat.com>

* Set subscription type as developer for developer subscription manifests.

Signed-off-by: Tong He <the@redhat.com>

* Remedy the wrong character to assign value.

Signed-off-by: Tong He <the@redhat.com>

* Reformat licensing.py by black.

Signed-off-by: Tong He <the@redhat.com>

---------

Signed-off-by: Tong He <the@redhat.com>
This commit is contained in:
Tong He
2023-11-15 18:33:57 +08:00
committed by GitHub
parent 1f36e84b45
commit 873b1fbe07
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
awx/main/utils/licensing.py
View File

@@ -199,6 +199,8 @@ class Licenser(object):
license['support_level'] = attr.get('value') license['support_level'] = attr.get('value')
elif attr.get('name') == 'usage': elif attr.get('name') == 'usage':
license['usage'] = attr.get('value') license['usage'] = attr.get('value')
elif attr.get('name') == 'ph_product_name' and attr.get('value') == 'RHEL Developer':
license['license_type'] = 'developer'
if not license: if not license:
logger.error("No valid subscriptions found in manifest") logger.error("No valid subscriptions found in manifest")
@@ -322,7 +324,9 @@ class Licenser(object):
def generate_license_options_from_entitlements(self, json): def generate_license_options_from_entitlements(self, json):
from dateutil.parser import parse from dateutil.parser import parse
ValidSub = collections.namedtuple('ValidSub', 'sku name support_level end_date trial quantity pool_id satellite subscription_id account_number usage') ValidSub = collections.namedtuple(
'ValidSub', 'sku name support_level end_date trial developer_license quantity pool_id satellite subscription_id account_number usage'
)
valid_subs = [] valid_subs = []
for sub in json: for sub in json:
satellite = sub.get('satellite') satellite = sub.get('satellite')
@@ -350,6 +354,7 @@ class Licenser(object):
sku = sub['productId'] sku = sub['productId']
trial = sku.startswith('S') # i.e.,, SER/SVC trial = sku.startswith('S') # i.e.,, SER/SVC
developer_license = False
support_level = '' support_level = ''
usage = '' usage = ''
pool_id = sub['id'] pool_id = sub['id']
@@ -364,9 +369,24 @@ class Licenser(object):
support_level = attr.get('value') support_level = attr.get('value')
elif attr.get('name') == 'usage': elif attr.get('name') == 'usage':
usage = attr.get('value') usage = attr.get('value')
elif attr.get('name') == 'ph_product_name' and attr.get('value') == 'RHEL Developer':
developer_license = True
valid_subs.append( valid_subs.append(
ValidSub(sku, sub['productName'], support_level, end_date, trial, quantity, pool_id, satellite, subscription_id, account_number, usage) ValidSub(
sku,
sub['productName'],
support_level,
end_date,
trial,
developer_license,
quantity,
pool_id,
satellite,
subscription_id,
account_number,
usage,
)
) )
if valid_subs: if valid_subs:
@@ -381,6 +401,8 @@ class Licenser(object):
if sub.trial: if sub.trial:
license._attrs['trial'] = True license._attrs['trial'] = True
license._attrs['license_type'] = 'trial' license._attrs['license_type'] = 'trial'
if sub.developer_license:
license._attrs['license_type'] = 'developer'
license._attrs['instance_count'] = min(MAX_INSTANCES, license._attrs['instance_count']) license._attrs['instance_count'] = min(MAX_INSTANCES, license._attrs['instance_count'])
human_instances = license._attrs['instance_count'] human_instances = license._attrs['instance_count']
if human_instances == MAX_INSTANCES: if human_instances == MAX_INSTANCES: