fix addressing review comments

Signed-off-by: Martina Fabikova <[email protected]>

Author: fabikova

testsuite/kuadrant/policy/dns.py

@@ -140,7 +140,7 @@ def _check_dns(_):
                 answers = resolver.resolve(hostname, "A")
                 found_ips = {ip.to_text() for ip in answers}
                 return expected_ip in found_ips
-            except Exception:  # pylint: disable=broad-exception-caught
+            except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer, dns.resolver.Timeout):
                 return False
 
         success = self.wait_until(_check_dns)

testsuite/tests/singlecluster/gateway/dnspolicy/dns_records/test_dns_endpoint_provider.py

@@ -5,8 +5,11 @@
 a single Destination DNSRecord (Zone) and successfully resolved via the upstream provider.
 """
 
+import base64
 import pytest
+import openshift_client as oc
 from testsuite.kuadrant.policy.dns import DNSRecord, DNSRecordEndpoint
+from testsuite.kubernetes.secret import Secret
 
 SOURCE_IP1 = "91.16.35.100"
 SOURCE_IP2 = "172.6.13.223"
@@ -16,50 +19,57 @@
 
 
 @pytest.fixture(scope="module")
-def endpoint_provider_secret():
-    """Returns the name of the endpoint provider secret"""
-    return "dns-provider-credentials-endpoint"
-
+def endpoint_provider_secret(request, cluster, module_label, blame):
+    """Creates endpoint provider secret by copying from default namespace"""
+    default_cluster = cluster.change_project("default")
+    with default_cluster.context:
+        source_secret = oc.selector("secret/dns-provider-credentials-endpoint").object(cls=Secret)
+
+    decoded_data = {}
+    if source_secret.model.data:
+        for key, value in source_secret.model.data.items():
+            decoded_data[key] = base64.b64decode(value).decode("utf-8")
+
+    secret = Secret.create_instance(
+        cluster,
+        blame("endpoint-creds"),
+        decoded_data,
+        secret_type=source_secret.model.type,
+        labels={"app": module_label},
+    )
 
-@pytest.fixture(scope="module")
-def aws_provider_secret():
-    """Returns the name of the AWS provider secret"""
-    return "aws-credentials"
+    request.addfinalizer(secret.delete)
+    secret.commit()
+    return secret.name()
 
 
 @pytest.fixture(scope="module")
-def shared_hostname(base_domain, blame):
-    """Returns the shared hostname used for aggregation"""
-    return f"{blame('app')}.{base_domain}"
-
-
-@pytest.fixture(scope="module")
-def destination_dnsrecord(cluster, blame, shared_hostname, aws_provider_secret, module_label):
+def destination_dnsrecord(cluster, blame, hostname, dns_provider_secret, module_label):
     """Destination Record acting as the Zone"""
-    dummy_endpoint = DNSRecordEndpoint(dnsName=shared_hostname, recordType="A", recordTTL=300, targets=[DUMMY_IP])
+    dummy_endpoint = DNSRecordEndpoint(dnsName=hostname.hostname, recordType="A", recordTTL=300, targets=[DUMMY_IP])
 
     record = DNSRecord.create_instance(
         cluster=cluster,
         name=blame("dest-zone"),
-        root_host=shared_hostname,
+        root_host=hostname.hostname,
         endpoints=[dummy_endpoint],
         delegate=False,
         labels={"app": module_label, "kuadrant.io/zone-record": "true"},
     )
-    record.model["spec"]["providerRef"] = {"name": aws_provider_secret}
+    record.model["spec"]["providerRef"] = {"name": dns_provider_secret}
     return record
 
 
 @pytest.fixture(scope="module")
-def source_dnsrecords(cluster, blame, shared_hostname, endpoint_provider_secret, module_label):
+def source_dnsrecords(cluster, blame, hostname, endpoint_provider_secret, module_label):
     """Source Records acting as endpoint feeders"""
-    dns_name_1 = f"src1.{shared_hostname}"
-    dns_name_2 = f"src2.{shared_hostname}"
+    dns_name_1 = f"src1.{hostname.hostname}"
+    dns_name_2 = f"src2.{hostname.hostname}"
 
     source1 = DNSRecord.create_instance(
         cluster=cluster,
         name=blame("src-1"),
-        root_host=shared_hostname,
+        root_host=hostname.hostname,
         endpoints=[DNSRecordEndpoint(dnsName=dns_name_1, recordType="A", recordTTL=60, targets=[SOURCE_IP1])],
         delegate=False,
         labels={"app": module_label},
@@ -69,7 +79,7 @@ def source_dnsrecords(cluster, blame, shared_hostname, endpoint_provider_secret,
     source2 = DNSRecord.create_instance(
         cluster=cluster,
         name=blame("src-2"),
-        root_host=shared_hostname,
+        root_host=hostname.hostname,
         endpoints=[DNSRecordEndpoint(dnsName=dns_name_2, recordType="A", recordTTL=60, targets=[SOURCE_IP2])],
         delegate=False,
         labels={"app": module_label},
@@ -89,23 +99,10 @@ def commit(request, destination_dnsrecord, source_dnsrecords):
     for record in source_dnsrecords:
         request.addfinalizer(record.delete)
         record.commit()
+        record.wait_for_ready()
 
 
-def test_endpoint_provider_configuration(destination_dnsrecord, source_dnsrecords, endpoint_provider_secret):
-    """Verify configuration and labels"""
-    destination_dnsrecord.refresh()
-    assert destination_dnsrecord.model.metadata.labels.get("kuadrant.io/zone-record") == "true"
-
-    for record in source_dnsrecords:
-        record.refresh()
-        assert record.model.spec.providerRef.name == endpoint_provider_secret
-        assert record.model.spec.rootHost == destination_dnsrecord.model.spec.rootHost
-
-
-def test_records_accessible(destination_dnsrecord, shared_hostname):
+def test_records_accessible(destination_dnsrecord, hostname):
     """Verify that endpoints are merged and accessible via DNS"""
-    # 1. Verify Merge
-    destination_dnsrecord.wait_for_endpoints_merged({SOURCE_IP1, SOURCE_IP2})
-    # 2. Verify DNS Resolution
-    destination_dnsrecord.wait_until_resolves(f"src1.{shared_hostname}", SOURCE_IP1)
-    destination_dnsrecord.wait_until_resolves(f"src2.{shared_hostname}", SOURCE_IP2)
+    destination_dnsrecord.wait_until_resolves(f"src1.{hostname.hostname}", SOURCE_IP1)
+    destination_dnsrecord.wait_until_resolves(f"src2.{hostname.hostname}", SOURCE_IP2)