diff --git a/setup.py b/setup.py index e5971da9..a911d46a 100644 --- a/setup.py +++ b/setup.py @@ -95,7 +95,7 @@ def get_cryptography_version(): "asyncstdlib", "typing_extensions", "backports.cached_property", - "python-auditor==0.0.6", + "python-auditor==0.0.7", "pytz", "tzlocal", "aiolancium", diff --git a/tardis/plugins/auditor.py b/tardis/plugins/auditor.py index 298fb397..ee6f9ece 100644 --- a/tardis/plugins/auditor.py +++ b/tardis/plugins/auditor.py @@ -93,15 +93,18 @@ def construct_record(self, resource_attributes: AttributeDict): :type resource_attributes: AttributeDict :return: Record """ + meta = ( + pyauditor.Meta() + .insert("site_id", [resource_attributes["site_name"]]) + .insert("user_id", [self._user]) + .insert("group_id", [self._group]) + ) record = pyauditor.Record( resource_attributes["drone_uuid"], - resource_attributes["site_name"], - self._user, - self._group, resource_attributes["updated"] .replace(tzinfo=self._local_timezone) .astimezone(pytz.utc), - ) + ).with_meta(meta) for (resource, amount) in self._resources[resource_attributes["site_name"]][ resource_attributes["machine_type"] diff --git a/tests/plugins_t/test_auditor.py b/tests/plugins_t/test_auditor.py index 907f34be..0307d35e 100644 --- a/tests/plugins_t/test_auditor.py +++ b/tests/plugins_t/test_auditor.py @@ -147,19 +147,19 @@ def test_construct_record(self): record = self.plugin.construct_record(resource_attributes=self.test_param) self.assertEqual(record.record_id, self.drone_uuid) - self.assertEqual(record.site_id, self.site) - self.assertEqual(record.user_id, self.user) - self.assertEqual(record.group_id, self.group) + self.assertEqual(record.meta.get("site_id"), [self.site]) + self.assertEqual(record.meta.get("user_id"), [self.user]) + self.assertEqual(record.meta.get("group_id"), [self.group]) self.assertEqual(len(record.components), 2) self.assertEqual(record.components[0].name, "Cores") self.assertEqual(record.components[0].amount, 12) self.assertEqual(len(record.components[0].scores), 2) self.assertEqual(record.components[0].scores[0].name, "HEPSPEC") - self.assertEqual(record.components[0].scores[0].factor, 1.2) + self.assertEqual(record.components[0].scores[0].value, 1.2) self.assertEqual(record.components[0].scores[1].name, "BENCHMARK") - self.assertEqual(record.components[0].scores[1].factor, 3.0) + self.assertEqual(record.components[0].scores[1].value, 3.0) self.assertEqual(record.components[1].name, "Memory") self.assertEqual(record.components[1].amount, 100) self.assertEqual(len(record.components[1].scores), 1) self.assertEqual(record.components[1].scores[0].name, "BLUBB") - self.assertEqual(record.components[1].scores[0].factor, 1.4) + self.assertEqual(record.components[1].scores[0].value, 1.4)