fixed restart policy deserialization (#7006) (#7101)

Cherry-pick 550dc0d.
Azure · Sep 1, 2023 · bd05d4d · bd05d4d
1 parent 978ccaa
commit bd05d4d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Docker/models/RestartPolicyKind.cs b/edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Docker/models/RestartPolicyKind.cs
@@ -1,23 +1,27 @@
 // Copyright (c) Microsoft. All rights reserved.
 namespace Microsoft.Azure.Devices.Edge.Agent.Docker.Models
 {
+    using System.Runtime.Serialization;
+
     using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
 
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum RestartPolicyKind
     {
-        [JsonProperty("")]
+        [EnumMember(Value ="")]
         Undefined,
 
-        [JsonProperty("no")]
+        [EnumMember(Value = "no")]
         No,
 
-        [JsonProperty("always")]
+        [EnumMember(Value = "always")]
         Always,
 
-        [JsonProperty("on-failure")]
+        [EnumMember(Value = "on-failure")]
         OnFailure,
 
-        [JsonProperty("unless-stopped")]
+        [EnumMember(Value = "unless-stopped")]
         UnlessStopped
     }
 }
diff --git a/edge-agent/test/Microsoft.Azure.Devices.Edge.Agent.Docker.Test/DockerConfigTest.cs b/edge-agent/test/Microsoft.Azure.Devices.Edge.Agent.Docker.Test/DockerConfigTest.cs
@@ -232,5 +232,15 @@ public void TestGetCreateOptions(string createOptions, CreateContainerParameters
             Assert.NotNull(createContainerParameters);
             Assert.True(DockerConfig.CompareCreateOptions(expectedCreateOptions, createContainerParameters));
         }
+
+        [Fact]
+        public void TestRestartPolicyDeserialization()
+        {
+            var original = "{\"HostConfig\":{\"RestartPolicy\":{\"Name\":\"unless-stopped\"}}}";
+            var encoded = JsonConvert.DeserializeObject<CreateContainerParameters>(original);
+            var decoded = JsonConvert.SerializeObject(encoded);
+
+            Assert.Equal(original, decoded);
+        }
     }
 }