From b27a4d078027504819a379fa37288ca44b9032db Mon Sep 17 00:00:00 2001 From: jyejare Date: Thu, 13 Jun 2024 12:27:04 +0530 Subject: [PATCH] Git checks fixes --- conf/server.yaml.template | 4 ++-- pytest_fixtures/core/broker.py | 5 +++-- robottelo/config/validators.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conf/server.yaml.template b/conf/server.yaml.template index 4d905f45e8e..e196dd9413d 100644 --- a/conf/server.yaml.template +++ b/conf/server.yaml.template @@ -14,9 +14,9 @@ SERVER: # The RHEL Base OS Version(x.y) where the Satellite is installed RHEL_VERSION: '7' # If the the satellite server is IPv6 server - # IS_IPV6: + IS_IPV6: False # HTTP Proxy url for IPv6 satellite to connect for outer world access - # HTTP_PROXY_IPv6_URL: + HTTP_PROXY_IPv6_URL: # run-on-one - All xdist runners default to the first satellite # balance - xdist runners will be split between available satellites # on-demand - any xdist runner without a satellite will have a new one provisioned. diff --git a/pytest_fixtures/core/broker.py b/pytest_fixtures/core/broker.py index 0b9c114211d..9e63ce92a14 100644 --- a/pytest_fixtures/core/broker.py +++ b/pytest_fixtures/core/broker.py @@ -24,7 +24,7 @@ def _target_sat_imp(request, _default_sat, satellite_factory): """This is the actual working part of the following target_sat fixtures""" if request.node.get_closest_marker(name='destructive'): new_sat = satellite_factory() - new_sat.sat.enable_ipv6_http_proxy() + new_sat.enable_ipv6_http_proxy() yield new_sat new_sat.teardown() Broker(hosts=[new_sat]).checkin() @@ -33,7 +33,8 @@ def _target_sat_imp(request, _default_sat, satellite_factory): settings.set('server.hostname', installer_sat.hostname) yield installer_sat else: - _default_sat.enable_ipv6_http_proxy() + if _default_sat: + _default_sat.enable_ipv6_http_proxy() yield _default_sat diff --git a/robottelo/config/validators.py b/robottelo/config/validators.py index 6ba7c769b7c..1c37d63404f 100644 --- a/robottelo/config/validators.py +++ b/robottelo/config/validators.py @@ -36,7 +36,7 @@ Validator('server.ssh_password', default=None), Validator('server.verify_ca', default=False), Validator('server.is_ipv6', is_type_of=bool, default=False), - Validator('server.http_proxy_ipv6_url', is_type_of=str), + Validator('server.http_proxy_ipv6_url', is_type_of=str, default=None), ], content_host=[ Validator('content_host.default_rhel_version', must_exist=True),