Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update pyauditor to version 0.0.7 #286

Merged
merged 1 commit into from
Feb 23, 2023
Merged

Update pyauditor to version 0.0.7 #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 7 additions & 4 deletions tardis/plugins/auditor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
12 changes: 6 additions & 6 deletions tests/plugins_t/test_auditor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)