Skip to content
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

[6.15.z] Enable IPv6 proxy when settings.server.is_ipv6=True in IPv6 runs #16883

Merged
merged 1 commit into from
Nov 11, 2024
+10 −22
Merged

[6.15.z] Enable IPv6 proxy when settings.server.is_ipv6=True in IPv6 runs #16883

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
2 changes: 1 addition & 1 deletion pytest_fixtures/core/sat_cap_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ def installer_satellite(request):
sat.setup_firewall()

# register to cdn (also enables rhel repos from cdn)
sat.register_to_cdn(enable_proxy=True)
sat.register_to_cdn()

# setup source repositories
if settings.server.version.source == "ga":
Expand Down
30 changes: 9 additions & 21 deletions robottelo/hosts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,6 @@ def register_contenthost(
auto_attach=False,
serverurl=None,
baseurl=None,
enable_proxy=False,
):
"""Registers content host on foreman server either by specifying
organization name and activation key name or by specifying organization
Expand Down Expand Up @@ -1512,15 +1511,21 @@ def install_tracer(self):
raise ContentHostError('There was an error installing katello-host-tools-tracer')
self.execute('katello-tracer-upload')

def register_to_cdn(self, pool_ids=None, enable_proxy=False):
def register_to_cdn(self, pool_ids=None):
"""Subscribe satellite to CDN"""
self.remove_katello_ca()

# Enabling proxy for IPv6
if settings.server.is_ipv6:
url = urlparse(settings.server.http_proxy_ipv6_url)
self.enable_rhsm_proxy(url.hostname, url.port)
self.enable_dnf_proxy(url.hostname, url.scheme, url.port)

cmd_result = self.register_contenthost(
org=None,
lce=None,
username=settings.subscription.rhn_username,
password=settings.subscription.rhn_password,
enable_proxy=enable_proxy,
)
if cmd_result.status != 0:
raise ContentHostError(
Expand Down Expand Up @@ -1686,6 +1691,7 @@ def enable_ipv6_http_proxy(self):
if settings.server.is_ipv6:
url = urlparse(settings.server.http_proxy_ipv6_url)
self.enable_rhsm_proxy(url.hostname, url.port)
self.enable_dnf_proxy(url.hostname, url.scheme, url.port)
self.ipv6 = settings.server.is_ipv6

def disable_ipv6_http_proxy(self):
Expand Down Expand Up @@ -2436,24 +2442,6 @@ def sync_inventory_status(self, org):
)
return inventory_sync

def register_contenthost(
self,
org='Default_Organization',
lce='Library',
username=settings.server.admin_username,
password=settings.server.admin_password,
enable_proxy=False,
):
"""Satellite Registration to CDN"""
# Enabling proxy for IPv6
if enable_proxy and settings.server.is_ipv6:
url = urlparse(settings.server.http_proxy_ipv6_url)
self.enable_rhsm_proxy(url.hostname, url.port)
self.enable_dnf_proxy(url.hostname, url.scheme, url.port)
return super().register_contenthost(
org=org, lce=lce, username=username, password=password, enable_proxy=enable_proxy
)

def run_orphan_cleanup(self, smart_proxy_id=None):
"""Run orphan cleanup task for all or given smart proxy."""
timestamp = datetime.utcnow().replace(microsecond=0)
Expand Down