Skip to content

Remove subscription entitlment hammer class methods #20121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chris1984 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove subscription entitlment hammer class methods #20121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions robottelo/cli/host.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,62 +407,6 @@ def subscription_unregister(cls, options=None):
cls.command_sub = 'subscription unregister'
return cls.execute(cls._construct_command(options))

@classmethod
def subscription_attach(cls, options=None):
Copy link
Member

@Gauravtalreja1 Gauravtalreja1 Oct 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

subscription_attach is still being used at - https://github.com/SatelliteQE/robottelo/blob/master/robottelo/hosts.py#L1463

"""Attach a subscription to host

Usage::

hammer host subscription attach [OPTIONS]

Options::

--host HOST_NAME Name to search by
--host-id HOST_ID Host ID
--quantity Quantity Quantity of this subscriptions to
add. Defaults to 1
--subscription-id SUBSCRIPTION_ID ID of subscription
"""
cls.command_sub = 'subscription attach'
return cls.execute(cls._construct_command(options))

@classmethod
def subscription_remove(cls, options=None):
"""Remove a subscription from host

Usage::

hammer host subscription remove [OPTIONS]

Options::

--host HOST_NAME Name to search by
--host-id HOST_ID
--quantity Quantity Remove the first instance of a
subscription with matching id
and quantity
--subscription-id SUBSCRIPTION_ID ID of subscription
"""
cls.command_sub = 'subscription remove'
return cls.execute(cls._construct_command(options))

@classmethod
def subscription_auto_attach(cls, options=None):
"""Auto attach subscription to host

Usage::

hammer host subscription auto-attach [OPTIONS]

Options::

--host HOST_NAME Name to search by
--host-id HOST_ID
-h, --help print help
"""
cls.command_sub = 'subscription auto-attach'
return cls.execute(cls._construct_command(options))

@classmethod
def sc_params(cls, options=None):
"""List all smart class parameters
Expand Down
42 changes: 4 additions & 38 deletions tests/new_upgrades/test_subscription.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def test_manifest_scenario_refresh(manifest_scenario_refresh_setup):


@pytest.fixture
def subscription_auto_attach_setup(
def subscription_setup(
Copy link
Contributor

@synkd synkd Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than changing the name of this fixture and continuing to use it, I think it makes more sense to test this with test_candlepin_hung_transaction inheriting the other setup fixture in this module, manifest_scenario_refresh_setup. If that passes, the subscription_setup fixture could be removed entirely.

subscription_upgrade_shared_satellite,
upgrade_action,
rhel_contenthost,
Expand All @@ -108,7 +108,7 @@ def subscription_auto_attach_setup(
1. Before Satellite upgrade.
2. Create new Organization and Location.
3. Upload a manifest in it.
4. Create a AK with 'auto-attach False' and without Subscription add in it.
4. Create an Activation Key.
5. Create a content host.

:expectedresults:
Expand Down Expand Up @@ -145,16 +145,11 @@ def subscription_auto_attach_setup(
assert rh_repo.content_counts['rpm'] >= 1
content_view = target_sat.publish_content_view(org, rh_repo, f'{test_name}_content_view')
content_view.version[-1].promote(data={'environment_ids': lce.id})
subscription = target_sat.api.Subscription(organization=org.id).search(
query={'search': f'name="{constants.DEFAULT_SUBSCRIPTION_NAME}"'}
)
assert len(subscription)
activation_key = target_sat.api.ActivationKey(
name=f'{test_name}_ak',
content_view=content_view,
organization=org.id,
environment=lce,
auto_attach=False,
).create()
rhel_contenthost.api_register(
target_sat,
Expand All @@ -173,40 +168,11 @@ def subscription_auto_attach_setup(
sat_upgrade.ready()
yield test_data


@pytest.mark.subscription_upgrades
@pytest.mark.rhel_ver_list([7, 8, 9, 10])
@pytest.mark.no_containers
@pytest.mark.manifester
def test_subscription_scenario_auto_attach(subscription_auto_attach_setup):
"""Run subscription auto-attach on pre-upgrade content host registered
with Satellite.

:id: 940fc78c-ffa6-4d9a-9c4b-efa1b9480a22

:steps:
1. Run subscription auto-attach on content host.
2. Delete the manifest from the Satellite

:expectedresults: After upgrade,
1. Pre-upgrade content host should get subscribed.
2. All the cleanup should be completed successfully.
"""
rhel_contenthost = subscription_auto_attach_setup.rhel_client
target_sat = subscription_auto_attach_setup.satellite
org = subscription_auto_attach_setup.org
result = rhel_contenthost.execute('yum install -y zsh')
assert result.status == 0, 'package was not installed'
sub = target_sat.api.Subscription(organization=org)
sub.delete_manifest(data={'organization_id': org.id})
assert len(sub.search()) == 0


@pytest.mark.subscription_upgrades
@pytest.mark.rhel_ver_match([settings.content_host.default_rhel_version])
@pytest.mark.no_containers
@pytest.mark.manifester
def test_candlepin_hung_transaction(subscription_auto_attach_setup):
def test_candlepin_hung_transaction(subscription_setup):
"""Check that no open Candlepin transactions are present after upgrading

:id: b2d8f844-3e9c-4c25-87a8-b9a2a21738b9
Expand All @@ -217,7 +183,7 @@ def test_candlepin_hung_transaction(subscription_auto_attach_setup):
:expectedresults:
No dangling transactions are present in the Candlepin database.
"""
result = subscription_auto_attach_setup.satellite.execute(
result = subscription_setup.satellite.execute(
'sudo -u postgres psql -d candlepin -c "SELECT * FROM pg_stat_activity WHERE state IN (\'idle in transaction\');"'
)
assert result.status == 0
Expand Down