From a4a76e6b154aa9c8e28629203c1e663f0d0a8448 Mon Sep 17 00:00:00 2001 From: gregcorbett Date: Thu, 20 Mar 2025 10:26:15 +0000 Subject: [PATCH] Filter out non-ascii characters in usernames - treat in the same way as non-ascii characters in VM names. --- caso/extract/openstack/nova.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/caso/extract/openstack/nova.py b/caso/extract/openstack/nova.py index f1b9922..a074a50 100644 --- a/caso/extract/openstack/nova.py +++ b/caso/extract/openstack/nova.py @@ -224,13 +224,16 @@ def _build_record(self, server): floating_ips = self._count_ips_on_server(server) + # Filter out non-ascii characters for APEL compatibility. vm_name = server.name.encode("ascii", errors="ignore") + local_user_id = server.user_id.encode("ascii", errors="ignore") + global_username = user.encode("ascii", errors="ignore") r = record.CloudRecord( uuid=server.id, site_name=CONF.site_name, name=vm_name, - user_id=server.user_id, + user_id=local_user_id, group_id=server.tenant_id, fqan=self.vo, start_time=server_start, @@ -238,7 +241,7 @@ def _build_record(self, server): compute_service=CONF.service_name, status=status, image_id=image_id, - user_dn=user, + user_dn=global_username, benchmark_type=bench_name, benchmark_value=bench_value, memory=memory,