Merge "add caller name to _log_request_full log" into mcp/caracal
diff --git a/tempest/api/identity/admin/v3/test_list_users.py b/tempest/api/identity/admin/v3/test_list_users.py
index 3884989..e81afef 100644
--- a/tempest/api/identity/admin/v3/test_list_users.py
+++ b/tempest/api/identity/admin/v3/test_list_users.py
@@ -30,7 +30,7 @@
# expected: user expected in the list response
# not_expected: user, which should not be present in list response
body = self.users_client.list_users(**params)['users']
- self.assertIn(expected[key], map(lambda x: x[key], body))
+ self.assertIn(expected[key], list(map(lambda x: x[key], body)))
self.assertNotIn(not_expected[key],
map(lambda x: x[key], body))
@@ -80,9 +80,18 @@
@decorators.idempotent_id('bff8bf2f-9408-4ef5-b63a-753c8c2124eb')
def test_list_users_with_not_enabled(self):
"""List the users with not enabled"""
- params = {'enabled': False}
+ domain_disabled_user = self.users_client.create_user(
+ name=data_utils.rand_name('test_user'),
+ password=data_utils.rand_password(),
+ domain_id=self.domain['id'],
+ email=self.alt_email,
+ enabled=False,
+ )['user']
+ self.addCleanup(self.users_client.delete_user,
+ domain_disabled_user['id'])
+ params = {'enabled': False, "domain_id": self.domain["id"]}
self._list_users_with_params(params, 'enabled',
- self.non_domain_enabled_user,
+ domain_disabled_user,
self.domain_enabled_user)
@decorators.idempotent_id('c285bb37-7325-4c02-bff3-3da5d946d683')
diff --git a/tempest/lib/common/dynamic_creds.py b/tempest/lib/common/dynamic_creds.py
index 99647d4..eb18aad 100644
--- a/tempest/lib/common/dynamic_creds.py
+++ b/tempest/lib/common/dynamic_creds.py
@@ -108,8 +108,8 @@
self.creds_domain_name = None
if self.identity_version == 'v3':
self.creds_domain_name = (
- self.default_admin_creds.project_domain_name or
- self.credentials_domain)
+ self.credentials_domain or
+ self.default_admin_creds.project_domain_name)
self.creds_client = cred_client.get_creds_client(
self.identity_admin_client,
self.tenants_admin_client,
diff --git a/tempest/lib/services/compute/servers_client.py b/tempest/lib/services/compute/servers_client.py
index 7e3b99f..58008aa 100644
--- a/tempest/lib/services/compute/servers_client.py
+++ b/tempest/lib/services/compute/servers_client.py
@@ -18,6 +18,7 @@
import copy
from urllib import parse as urllib
+from oslo_log import log as logging
from oslo_serialization import jsonutils as json
from tempest.lib.api_schema.response.compute.v2_1 import \
@@ -48,6 +49,9 @@
from tempest.lib.services.compute import base_compute_client
+LOG = logging.getLogger(__name__)
+
+
class ServersClient(base_compute_client.BaseComputeClient):
"""Service client for the resource /servers"""
@@ -167,6 +171,12 @@
API reference:
https://docs.openstack.org/api-ref/compute/#delete-server
"""
+ try:
+ console_out = self.get_console_output(server_id)
+ LOG.debug("Console log for server %s: %s", server_id, console_out)
+ except Exception as e:
+ LOG.debug("Failed to get console log for server %s: %s",
+ server_id, str(e))
resp, body = self.delete("servers/%s" % server_id)
self.validate_response(schema.delete_server, resp, body)
return rest_client.ResponseBody(resp, body)
@@ -730,6 +740,12 @@
API reference:
https://docs.openstack.org/api-ref/compute/#force-delete-server-forcedelete-action
"""
+ try:
+ console_out = self.get_console_output(server_id)
+ LOG.debug("Console log for server %s: %s", server_id, console_out)
+ except Exception as e:
+ LOG.debug("Failed to get console log for server %s: %s",
+ server_id, str(e))
return self.action(server_id, 'forceDelete', **kwargs)
def restore_soft_deleted_server(self, server_id, **kwargs):