From 72046f5f0be5c957433ba09ce3d8ff5683ca2856 Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Thu, 29 Nov 2018 10:53:53 +0000 Subject: fw/output: Convert `Status` enums to/from POD during (de)serialization Previously the `Status` Enum was converted to a string as part of serialization however now use the Enum `to_pod` method and make the respective changes for de-serialization. --- wa/framework/output.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wa/framework/output.py b/wa/framework/output.py index fd49fae1..a9b1f812 100644 --- a/wa/framework/output.py +++ b/wa/framework/output.py @@ -354,7 +354,7 @@ class Result(Podable): @staticmethod def from_pod(pod): instance = super(Result, Result).from_pod(pod) - instance.status = Status(pod['status']) + instance.status = Status.from_pod(pod['status']) instance.metrics = [Metric.from_pod(m) for m in pod['metrics']] instance.artifacts = [Artifact.from_pod(a) for a in pod['artifacts']] instance.events = [Event.from_pod(e) for e in pod['events']] @@ -449,7 +449,7 @@ class Result(Podable): def to_pod(self): pod = super(Result, self).to_pod() - pod['status'] = str(self.status) + pod['status'] = self.status.to_pod() pod['metrics'] = [m.to_pod() for m in self.metrics] pod['artifacts'] = [a.to_pod() for a in self.artifacts] pod['events'] = [e.to_pod() for e in self.events] @@ -460,6 +460,7 @@ class Result(Podable): @staticmethod def _pod_upgrade_v1(pod): pod['_pod_version'] = pod.get('_pod_version', 1) + pod['status'] = Status(pod['status']).to_pod() return pod -- cgit v1.2.3