Use certguard fixtures

[noissue]

Author: mdellweg

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-129-gf780fda
+2021.08.26-130-ge87b661

.github/workflows/scripts/install.sh

@@ -22,7 +22,7 @@ if [[ "$TEST" = "docs" || "$TEST" = "publish" ]]; then
   pip install -r doc_requirements.txt
 fi
 
-pip install -e ../pulpcore
+pip install -e ../pulpcore -e ../pulp-certguard
 pip install -r functest_requirements.txt
 
 cd .ci/ansible/

functest_requirements.txt

@@ -3,4 +3,5 @@ aiohttp
 pulp-smash @ git+https://github.com/pulp/pulp-smash.git
 pulpcore-client
 pulp-file-client
+pulp-certguard-client
 pytest

pulp_file/tests/functional/api/test_generic_list.py

@@ -3,11 +3,6 @@
 
 import pytest
 
-from pulpcore.client.pulp_certguard import (
-    ApiClient as CertGuardApiClient,
-    ContentguardsX509Api,
-)
-
 
 @pytest.mark.parallel
 def test_read_all_repos_generic(file_repo_api_client, file_repo):
@@ -29,11 +24,10 @@ def test_read_all_content_generic(file_content_api_client, file_random_content_u
 
 @pytest.mark.parallel
 def test_read_all_content_guards_generic(
-    content_guards_api_client, tls_certificate_authority_cert, bindings_cfg
+    content_guards_api_client, tls_certificate_authority_cert, x509_content_guards_api_client
 ):
     """Ensure name is displayed when listing content guards generic."""
-    cert_guards_api = ContentguardsX509Api(CertGuardApiClient(bindings_cfg))
-    cert_guards_api.create(
+    x509_content_guards_api_client.create(
         {"name": str(uuid.uuid4()), "ca_certificate": tls_certificate_authority_cert}
     )