Fix serialization tests

Author: carolynvs

src/corelib/Compute/v2_6/Console.cs

@@ -1,4 +1,5 @@
 using System;
+using Newtonsoft.Json;
 using OpenStack.Serialization;
 
 namespace OpenStack.Compute.v2_6
@@ -12,11 +13,13 @@ public class Console
         /// <summary>
         /// The console type.
         /// </summary>
+        [JsonProperty("type")]
         public RemoteConsoleType Type { get; set; }
 
         /// <summary>
         /// The console URL.
         /// </summary>
+        [JsonProperty("url")]
         public Uri Url { get; set; }
     }
 }

src/testing/unit/ContentDeliveryNetworks/v1/ServiceTests.cs

@@ -32,7 +32,7 @@ public void SerializeServiceCollection()
                 Items = {new Service {Id = "service-id"}},
                 Links = {new PageLink("next", "http://api.com/next")}
             };
-            string json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(services, Formatting.None);
+            string json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(services);
             Assert.Contains("\"services\"", json);
             Assert.DoesNotContain("\"service\"", json);
 
@@ -48,7 +48,7 @@ public void SerializeServiceCollection()
         public void SerializePageLink()
         {
             var link = new PageLink("next", "http://api.com/next");
-            string json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(link, Formatting.None);
+            string json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(link);
 
             var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<PageLink>(json);
             Assert.NotNull(result);

src/testing/unit/IdentifierTests.cs

@@ -27,7 +27,7 @@ public void Serialize_WithinAClass()
         {
             var thing = new Thing {Id = Guid.NewGuid()};
 
-            var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(thing, Formatting.None);
+            var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(thing);
 
             Assert.Equal(string.Format("{{\"Id\":\"{0}\"}}", thing.Id), result);
         }

src/testing/unit/Networking/v2/DHCPOptionConverterTests.cs

@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using OpenStack.Networking.v2.Serialization;
-using OpenStack.Serialization;
 using Xunit;
 
 namespace OpenStack.Networking.v2
@@ -12,24 +10,27 @@ public class DHCPOptionConverterTests
         [Fact]
         public void Serialize()
         {
-            var options = new Dictionary<string, string>
+            var input = new PortCreateDefinition(null)
             {
-                {"a", "stuff"},
-                {"b", "things"}
+                DHCPOptions =
+                {
+                    {"a", "stuff"},
+                    {"b", "things"}
+                }
             };
 
-            string result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(options, Formatting.None, new DHCPOptionsConverter());
+            string result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(input);
 
-            string expectedJson = JArray.Parse("[{'opt_name':'a','opt_value':'stuff'},{'opt_name':'b','opt_value':'things'}]").ToString(Formatting.None);
+            string expectedJson = JObject.Parse("{'port':{'extra_dhcp_opts':[{'opt_name':'a','opt_value':'stuff'},{'opt_name':'b','opt_value':'things'}]}}").ToString(Formatting.None);
             Assert.Equal(expectedJson, result);
         }
 
         [Fact]
         public void Deserialize()
         {
-            string json = JArray.Parse("[{'opt_name':'a','opt_value':'stuff'},{'opt_name':'b','opt_value':'things'}]").ToString(Formatting.None);
+            string json = JObject.Parse("{'port':{'extra_dhcp_opts':[{'opt_name':'a','opt_value':'stuff'},{'opt_name':'b','opt_value':'things'}]}}").ToString(Formatting.None);
 
-            var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<Dictionary<string, string>>(json, new DHCPOptionsConverter());
+            var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize<PortCreateDefinition>(json).DHCPOptions;
 
             Assert.NotNull(result);
             Assert.Equal(2, result.Count);
@@ -43,8 +44,6 @@ public void Deserialize()
         [Fact]
         public void OpenStackNet_UsesDHCPOptionConverter()
         {
-            OpenStackNet.Configure();
-
             var port = new Port
             {
                 DHCPOptions = new Dictionary<string, string>