diff --git a/robottelo/constants/__init__.py b/robottelo/constants/__init__.py index 552be092489..c69d42517af 100644 --- a/robottelo/constants/__init__.py +++ b/robottelo/constants/__init__.py @@ -808,7 +808,7 @@ REAL_RHEL7_0_ERRATA_ID = 'RHBA-2020:3615' # for REAL_RHEL7_0_0_PACKAGE REAL_RHEL7_1_ERRATA_ID = 'RHBA-2017:0395' # tcsh bug fix update REAL_RHEL8_1_ERRATA_ID = 'RHSA-2022:4867' # for REAL_RHEL8_1_PACKAGE -REAL_RHEL8_ERRATA_CVES = ['CVE-2021-27023' , 'CVE-2021-27025'] +REAL_RHEL8_ERRATA_CVES = ['CVE-2021-27023', 'CVE-2021-27025'] FAKE_1_YUM_REPOS_COUNT = 32 FAKE_3_YUM_REPOS_COUNT = 78 FAKE_9_YUM_SECURITY_ERRATUM = [ diff --git a/robottelo/host_helpers/api_factory.py b/robottelo/host_helpers/api_factory.py index bf2ab7a3781..ff0878488d0 100644 --- a/robottelo/host_helpers/api_factory.py +++ b/robottelo/host_helpers/api_factory.py @@ -297,6 +297,7 @@ def configure_provisioning(self, org=None, loc=None, compute=False, os=None): # Create new compute-resource with 'libvirt' provider. # compute boolean is added to not block existing test's that depend on # Libvirt resource and use this same functionality to all CR's. + if compute is False: resource_url = f'qemu+ssh://root@{settings.libvirt.libvirt_hostname}/system' comp_res = [ @@ -724,34 +725,31 @@ def register_host_and_needed_setup( loc=None, ): """ - * Helper will setup desired entities to host content. Then, register the + Helper will setup desired entities to host content. Then, register the host client to the entities, using associated activation-key. - * Attempt to make needed associations between detached entities. + Attempt to make needed associations between detached entities. - * Add desired repos to the content-view prior to calling this helper. + Add desired repos to the content-view prior to calling this helper. Or, add them to content-view after calling, then publish/promote. - * The host will be registered to location: None (visible to all locations). + The host will be registered to location: None (visible to all locations). param client: instance of a rhel contenthost to register. - param enable_repos (bool): enable all available repos on the client, after registration? default: False, be sure to enable any repo(s) for client, after calling this method. - param rex_key (bool): add a Remote Execution Key to client for satellite? default: False - param force (bool): force registration of the client to bypass? default: False, a reused fixture contenthost will fail if already registered. - param loc: pass a location object to limit host visibility. default None, client is available to all locations. type: Below arguments can be any of the following: - * (int): pass id of entity to be read - * (str): pass name of entity to be searched - * (entity): pass an entity instance + - (int): pass id of entity to be read + - (str): pass name of entity to be searched + - (entity): pass an entity instance + param organization: pass an Organization instance, name, or id to use. param activation_key: pass an Activation-Key instance, name, or id. param environment: pass a Lifecycle-Environment instance, name, or id.