Skip to content

Commit

Permalink
[6.14.z] Add conditioning for pool attach (#16824)
Browse files Browse the repository at this point in the history
* Add conditioning for pool attach

* Improve pool validations a bit
  • Loading branch information
vsedmik authored Nov 5, 2024
1 parent ef0475c commit 273de3d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
1 change: 1 addition & 0 deletions robottelo/constants/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@
'current': 'Overall Status: Current',
'invalid': 'Overall Status: Invalid',
'insufficient': 'Overall Status: Insufficient',
'disabled': 'Overall Status: Disabled',
'unknown': 'Overall Status: Unknown',
}

Expand Down
19 changes: 12 additions & 7 deletions robottelo/hosts.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
RHSSO_RESET_PASSWORD,
RHSSO_USER_UPDATE,
SATELLITE_VERSION,
SM_OVERALL_STATUS,
)
from robottelo.exceptions import CLIFactoryError, DownloadFileError, HostPingFailed
from robottelo.host_helpers import CapsuleMixins, ContentHostMixins, SatelliteMixins
Expand Down Expand Up @@ -1503,8 +1504,6 @@ def install_tracer(self):

def register_to_cdn(self, pool_ids=None):
"""Subscribe satellite to CDN"""
if pool_ids is None:
pool_ids = [settings.subscription.rhn_poolid]
self.remove_katello_ca()
cmd_result = self.register_contenthost(
org=None,
Expand All @@ -1516,11 +1515,17 @@ def register_to_cdn(self, pool_ids=None):
raise ContentHostError(
f'Error during registration, command output: {cmd_result.stdout}'
)
cmd_result = self.subscription_manager_attach_pool(pool_ids)[0]
if cmd_result.status != 0:
raise ContentHostError(
f'Error during pool attachment, command output: {cmd_result.stdout}'
)
# Attach a pool only if the Org isn't SCA yet
sub_status = self.subscription_manager_status().stdout
if SM_OVERALL_STATUS['disabled'] not in sub_status:
if pool_ids in [None, []]:
pool_ids = [settings.subscription.rhn_poolid]
for pid in pool_ids:
int(pid, 16) # raises ValueError if not a HEX number
cmd_result = self.subscription_manager_attach_pool(pool_ids)
for res in cmd_result:
if res.status != 0:
raise ContentHostError(f'Pool attachment failed with output: {res.stdout}')

def ping_host(self, host):
"""Check the provisioned host status by pinging the ip of host
Expand Down

0 comments on commit 273de3d

Please sign in to comment.