From 9ae4e3421f4c0a536fa3c912727a3bba535677b8 Mon Sep 17 00:00:00 2001 From: Peter Ondrejka Date: Mon, 11 Dec 2023 15:33:28 +0100 Subject: [PATCH] fixed api audit tests (cherry picked from commit 2809bdb4018fc00974b1144f53d4fdd416e74eb3) --- tests/foreman/api/test_audit.py | 66 +++++++++++++++++---------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/tests/foreman/api/test_audit.py b/tests/foreman/api/test_audit.py index 1aa9c28cc41..1eff8e5e599 100644 --- a/tests/foreman/api/test_audit.py +++ b/tests/foreman/api/test_audit.py @@ -39,7 +39,7 @@ def test_positive_create_by_type(target_sat): :CaseImportance: Medium """ for entity_item in [ - {'entity': target_sat.api.Architecture()}, + {'entity': target_sat.api.Architecture(), 'entity_type': 'architecture'}, { 'entity': target_sat.api.AuthSourceLDAP(), 'entity_type': 'auth_source', @@ -51,15 +51,16 @@ def test_positive_create_by_type(target_sat): 'entity_type': 'compute_resource', 'value_template': '{entity.name} (Libvirt)', }, - {'entity': target_sat.api.Domain()}, - {'entity': target_sat.api.Host()}, - {'entity': target_sat.api.HostGroup()}, + {'entity': target_sat.api.Domain(), 'entity_type': 'domain'}, + {'entity': target_sat.api.Host(), 'entity_type': 'host'}, + {'entity': target_sat.api.HostGroup(), 'entity_type': 'hostgroup'}, { 'entity': target_sat.api.Image( compute_resource=target_sat.api.LibvirtComputeResource().create() - ) + ), + 'entity_type': 'image', }, - {'entity': target_sat.api.Location()}, + {'entity': target_sat.api.Location(), 'entity_type': 'location'}, {'entity': target_sat.api.Media(), 'entity_type': 'medium'}, { 'entity': target_sat.api.OperatingSystem(), @@ -67,14 +68,19 @@ def test_positive_create_by_type(target_sat): 'value_template': '{entity.name} {entity.major}', }, {'entity': target_sat.api.PartitionTable(), 'entity_type': 'ptable'}, - {'entity': target_sat.api.Role()}, + {'entity': target_sat.api.Role(), 'entity_type': 'role'}, { 'entity': target_sat.api.Subnet(), + 'entity_type': 'subnet', 'value_template': '{entity.name} ({entity.network}/{entity.cidr})', }, {'entity': target_sat.api.ProvisioningTemplate(), 'entity_type': 'provisioning_template'}, - {'entity': target_sat.api.User(), 'value_template': '{entity.login}'}, - {'entity': target_sat.api.UserGroup()}, + { + 'entity': target_sat.api.User(), + 'value_template': '{entity.login}', + 'entity_type': 'user', + }, + {'entity': target_sat.api.UserGroup(), 'entity_type': 'usergroup'}, {'entity': target_sat.api.ContentView(), 'entity_type': 'katello/content_view'}, {'entity': target_sat.api.LifecycleEnvironment(), 'entity_type': 'katello/kt_environment'}, {'entity': target_sat.api.ActivationKey(), 'entity_type': 'katello/activation_key'}, @@ -86,10 +92,11 @@ def test_positive_create_by_type(target_sat): }, ]: created_entity = entity_item['entity'].create() - entity_type = entity_item.get('entity_type', created_entity.__class__.__name__.lower()) value_template = entity_item.get('value_template', '{entity.name}') entity_value = value_template.format(entity=created_entity) - audits = target_sat.api.Audit().search(query={'search': f'type={entity_type}'}) + audits = target_sat.api.Audit().search( + query={'search': f'type={entity_item["entity_type"]}'} + ) entity_audits = [entry for entry in audits if entry.auditable_name == entity_value] assert entity_audits, ( f'audit not found by name "{entity_value}" for entity: ' @@ -114,21 +121,19 @@ def test_positive_update_by_type(target_sat): :CaseImportance: Medium """ for entity in [ - target_sat.api.Architecture(), - target_sat.api.Domain(), - target_sat.api.HostGroup(), - target_sat.api.Location(), - target_sat.api.Role(), - target_sat.api.UserGroup(), + {'entity': target_sat.api.Architecture(), 'entity_type': 'architecture'}, + {'entity': target_sat.api.Domain(), 'entity_type': 'domain'}, + {'entity': target_sat.api.HostGroup(), 'entity_type': 'hostgroup'}, + {'entity': target_sat.api.Location(), 'entity_type': 'location'}, + {'entity': target_sat.api.Role(), 'entity_type': 'role'}, + {'entity': target_sat.api.UserGroup(), 'entity_type': 'usergroup'}, ]: - created_entity = entity.create() + created_entity = entity['entity'].create() name = created_entity.name new_name = gen_string('alpha') created_entity.name = new_name created_entity = created_entity.update(['name']) - audits = target_sat.api.Audit().search( - query={'search': f'type={created_entity.__class__.__name__.lower()}'} - ) + audits = target_sat.api.Audit().search(query={'search': f'type={entity["entity_type"]}'}) entity_audits = [entry for entry in audits if entry.auditable_name == name] assert entity_audits, f'audit not found by name "{name}"' audit = entity_audits[0] @@ -151,19 +156,16 @@ def test_positive_delete_by_type(target_sat): :CaseImportance: Medium """ for entity in [ - target_sat.api.Architecture(), - target_sat.api.Domain(), - target_sat.api.Host(), - target_sat.api.HostGroup(), - target_sat.api.Location(), - target_sat.api.Role(), - target_sat.api.UserGroup(), + {'entity': target_sat.api.Architecture(), 'entity_type': 'architecture'}, + {'entity': target_sat.api.Domain(), 'entity_type': 'domain'}, + {'entity': target_sat.api.HostGroup(), 'entity_type': 'hostgroup'}, + {'entity': target_sat.api.Location(), 'entity_type': 'location'}, + {'entity': target_sat.api.Role(), 'entity_type': 'role'}, + {'entity': target_sat.api.UserGroup(), 'entity_type': 'usergroup'}, ]: - created_entity = entity.create() + created_entity = entity['entity'].create() created_entity.delete() - audits = target_sat.api.Audit().search( - query={'search': f'type={created_entity.__class__.__name__.lower()}'} - ) + audits = target_sat.api.Audit().search(query={'search': f'type={entity["entity_type"]}'}) entity_audits = [entry for entry in audits if entry.auditable_name == created_entity.name] assert entity_audits, f'audit not found by name "{created_entity.name}"' audit = entity_audits[0]