From b71d12be7457476d22e44cdb3d19c4e16d794826 Mon Sep 17 00:00:00 2001 From: Satellite QE <115476073+Satellite-QE@users.noreply.github.com> Date: Tue, 9 Jul 2024 17:08:17 -0400 Subject: [PATCH] [6.15.z] Fix ipv6 proxy url validation (#15615) Fix ipv6 proxy url validation (#15594) Fix ipv6 proxy url validation: http_proxy_url is validated in Validators already (cherry picked from commit a6b4131484d03a7015d472dfeed34814b3703fdd) Co-authored-by: dosas --- robottelo/hosts.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/robottelo/hosts.py b/robottelo/hosts.py index 68c789d050c..f9beb3c79a3 100644 --- a/robottelo/hosts.py +++ b/robottelo/hosts.py @@ -1646,7 +1646,7 @@ def enable_capsule_downstream_repos(self): def enable_ipv6_http_proxy(self): """Execute procedures for enabling IPv6 HTTP Proxy on Capsule using SM""" - if all([settings.server.is_ipv6, settings.server.http_proxy_ipv6_url]): + if settings.server.is_ipv6: url = urlparse(settings.server.http_proxy_ipv6_url) self.enable_rhsm_proxy(url.hostname, url.port) @@ -1826,7 +1826,7 @@ def _swap_nailgun(self, new_version): def enable_ipv6_http_proxy(self): """Execute procedures for enabling IPv6 HTTP Proxy""" - if not all([settings.server.is_ipv6, settings.server.http_proxy_ipv6_url]): + if not settings.server.is_ipv6: logger.warning( 'The IPv6 HTTP Proxy setting is not enabled. Skipping the IPv6 HTTP Proxy setup.' ) @@ -2411,7 +2411,7 @@ def register_contenthost( ): """Satellite Registration to CDN""" # Enabling proxy for IPv6 - if enable_proxy and all([settings.server.is_ipv6, settings.server.http_proxy_ipv6_url]): + if enable_proxy and settings.server.is_ipv6: url = urlparse(settings.server.http_proxy_ipv6_url) self.enable_rhsm_proxy(url.hostname, url.port) return super().register_contenthost(