Merge release/1.7.0

README.md

@@ -1,5 +1,7 @@
 # OpenStack.NET
 
+Need Help? Email us at [[email protected]](mailto:[email protected]).
+
 [![Join the chat at https://gitter.im/openstacknetsdk/openstack.net](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/openstacknetsdk/openstack.net?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 OpenStack.NET is an OpenStack .NET SDK, written for the Microsoft .NET platform, is designed to enable developers to seamlessly work with

src/Documentation/AdditionalReferenceDocumentation.shfbproj

@@ -27,11 +27,13 @@
       <Argument Key="maxVersionParts" Value="" xmlns="" />
     </TransformComponentArguments>
     <DocumentationSources>
-      <DocumentationSource sourceFile="..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll" />
-      <DocumentationSource sourceFile="..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.xml" />
+      <DocumentationSource sourceFile="..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll" />
+      <DocumentationSource sourceFile="..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.xml" />
       <DocumentationSource sourceFile="..\packages\SimpleRESTServices.1.3.0.1\lib\net40\SimpleRESTServices.dll" />
       <DocumentationSource sourceFile="..\packages\SimpleRESTServices.1.3.0.1\lib\net40\SimpleRESTServices.xml" />
     </DocumentationSources>
+    <PlugInConfigurations>
+    </PlugInConfigurations>
   </PropertyGroup>
   <!-- There are no properties for these groups.  AnyCPU needs to appear in order for Visual Studio to perform
 			 the build.  The others are optional common platform types that may appear. -->
@@ -56,4 +58,4 @@
   </ItemGroup>
   <!-- Import the SHFB build targets -->
   <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
-</Project>
+</Project>

src/Documentation/Documentation.v4.0.shfbproj

@@ -99,14 +99,8 @@
           </versions>
         </configuration>
       </PlugInConfig>
-      <PlugInConfig id="Additional Reference Links" enabled="True">
-        <configuration>
-          <targets>
-            <target htmlSdkLinkType="None" help2SdkLinkType="Index" helpViewerSdkLinkType="Id" websiteSdkLinkType="None" helpFileProject="AdditionalReferenceDocumentation.shfbproj" />
-          </targets>
-        </configuration>
-      </PlugInConfig>
-    </PlugInConfigurations>
+<PlugInConfig id="Additional Reference Links" enabled="True"><configuration><targets><target htmlSdkLinkType="None" help2SdkLinkType="Index" helpViewerSdkLinkType="Id" websiteSdkLinkType="None" helpFileProject="AdditionalReferenceDocumentation.shfbproj" /></targets></configuration></PlugInConfig>
+<PlugInConfig id="Assembly Binding Redirection" enabled="True"><configuration useGAC="false"><assemblyBinding><dependentAssembly><assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /></dependentAssembly></assemblyBinding><ignoreIfUnresolved /></configuration></PlugInConfig></PlugInConfigurations>
     <ApiFilter>
       <Filter entryType="Namespace" fullName="Flurl.Extensions" isExposed="False" />
       <Filter entryType="Namespace" fullName="Flurl.Http" isExposed="False" />
@@ -129,11 +123,12 @@
     <HelpAttributes />
     <NamespaceSummaries>
       <NamespaceSummaryItem name="Flurl.Http" isDocumented="False" />
-<NamespaceSummaryItem name="OpenStack.Compute.v2_1.Serialization" isDocumented="False" />
-<NamespaceSummaryItem name="OpenStack.Compute.v2_2.Serialization" isDocumented="False" />
-<NamespaceSummaryItem name="OpenStack.Compute.v2_6.Serialization" isDocumented="False" />
-<NamespaceSummaryItem name="OpenStack.Serialization" isDocumented="False" />
-<NamespaceSummaryItem name="OpenStack.Synchronous" isDocumented="True" /></NamespaceSummaries>
+      <NamespaceSummaryItem name="OpenStack.Compute.v2_1.Serialization" isDocumented="False" />
+      <NamespaceSummaryItem name="OpenStack.Compute.v2_2.Serialization" isDocumented="False" />
+      <NamespaceSummaryItem name="OpenStack.Compute.v2_6.Serialization" isDocumented="False" />
+      <NamespaceSummaryItem name="OpenStack.Serialization" isDocumented="False" />
+      <NamespaceSummaryItem name="OpenStack.Synchronous" isDocumented="True" />
+    </NamespaceSummaries>
     <BuildLogFile />
     <HtmlHelp1xCompilerPath />
     <HtmlHelp2xCompilerPath />
@@ -190,4 +185,4 @@
   </ItemGroup>
   <!-- Import the SHFB build targets -->
   <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
-</Project>
+</Project>

src/Documentation/History/Current/Documentation.Current.shfbproj

@@ -72,6 +72,17 @@
     <HelpAttributes />
     <NamespaceSummaries />
     <PlugInConfigurations>
+      <PlugInConfig id="Assembly Binding Redirection" enabled="True">
+        <configuration useGAC="false">
+          <assemblyBinding>
+            <dependentAssembly>
+              <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+              <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+            </dependentAssembly>
+          </assemblyBinding>
+          <ignoreIfUnresolved />
+        </configuration>
+      </PlugInConfig>
     </PlugInConfigurations>
     <BuildLogFile />
     <HtmlHelp1xCompilerPath />
@@ -94,4 +105,4 @@
   </PropertyGroup>
   <!-- Import the SHFB build targets -->
   <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
-</Project>
+</Project>

src/Documentation/History/Current/packages.config

@@ -4,6 +4,6 @@
   <package id="Flurl.Http.Signed" version="0.6.2.2015062601" targetFramework="net45" />
   <package id="Flurl.Signed" version="1.0.8" targetFramework="net45" />
   <package id="Marvin.JsonPatch.Signed" version="0.7.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
   <package id="SimpleRESTServices" version="1.3.0.1" targetFramework="net40" />
 </packages>

src/corelib/Compute/v2_1/Actions/AssociateFloatingIPRequest.cs

@@ -0,0 +1,33 @@
+using Newtonsoft.Json;
+using OpenStack.Serialization;
+
+namespace OpenStack.Compute.v2_1
+{
+    /// <summary>
+    /// Associates a floating IP address to a server.
+    /// </summary>
+    [JsonConverterWithConstructor(typeof(RootWrapperConverter), "addFloatingIp")]
+    public class AssociateFloatingIPRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AssociateFloatingIPRequest"/> class.
+        /// </summary>
+        /// <param name="floatingIPAddress">The floating ip address.</param>
+        public AssociateFloatingIPRequest(string floatingIPAddress)
+        {
+            FloatingIPAddress = floatingIPAddress;
+        }
+
+        /// <summary>
+        /// The floating IP address.
+        /// </summary>
+        [JsonProperty("address")]
+        public string FloatingIPAddress { get; set; }
+
+        /// <summary>
+        /// The fixed IP address with which you want to associate the floating IP address.
+        /// </summary>
+        [JsonProperty("fixed_address")]
+        public string FixedIPAddress { get; set; }
+    }
+}

src/corelib/Compute/v2_1/ComputeService.cs

@@ -109,7 +109,6 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg
             return _computeApi.DeleteServerMetadataAsync(serverId, key, cancellationToken);
         }
 
-
         /// <inheritdoc cref="ComputeApi.WaitUntilServerIsDeletedAsync{TServer,TStatus}" />
         public Task WaitUntilServerIsDeletedAsync(Identifier serverId, TimeSpan? refreshDelay = null, TimeSpan? timeout = null, IProgress<bool> progress = null, CancellationToken cancellationToken = default(CancellationToken))
         {
@@ -212,6 +211,18 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg
             return _computeApi.CancelResizeServerAsync(serverId, cancellationToken);
         }
 
+        /// <inheritdoc cref="ComputeApi.AssociateFloatingIPAsync" />
+        public virtual Task AssociateFloatingIPAddressAsync(Identifier serverId, AssociateFloatingIPRequest request, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return _computeApi.AssociateFloatingIPAsync(serverId, request, cancellationToken);
+        }
+
+        /// <inheritdoc cref="ComputeApi.DisassociateFloatingIPAsync" />
+        public virtual Task DisassociateFloatingIPAsync(Identifier serverId, string floatingIPAddress, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return _computeApi.DisassociateFloatingIPAsync(serverId, floatingIPAddress, cancellationToken);
+        }
+
         /// <inheritdoc cref="ComputeApi.ListServerActionSummariesAsync{T}" />
         public virtual async Task<IEnumerable<ServerActionSummary>> ListServerActionSummariesAsync(Identifier serverId, CancellationToken cancellationToken = default(CancellationToken))
         {

src/corelib/Compute/v2_1/ComputeServiceExtensions.cs

@@ -181,6 +181,18 @@ public static void CancelResizeServer(this ComputeService service, Identifier se
             service.CancelResizeServerAsync(serverId).ForceSynchronous();
         }
 
+        /// <inheritdoc cref="ComputeService.AssociateFloatingIPAddressAsync" />
+        public static void AssociateFloatingIPAddressAsync(this ComputeService service, Identifier serverId, AssociateFloatingIPRequest request)
+        {
+            service.AssociateFloatingIPAddressAsync(serverId, request).ForceSynchronous();
+        }
+
+        /// <inheritdoc cref="ComputeService.DisassociateFloatingIPAsync" />
+        public static void DisassociateFloatingIPAsync(this ComputeService service, Identifier serverId, string floatingIPAddress)
+        {
+            service.DisassociateFloatingIPAsync(serverId, floatingIPAddress).ForceSynchronous();
+        }
+
         /// <inheritdoc cref="ComputeService.ListServerActionSummariesAsync" />
         public static IEnumerable<ServerActionSummary> ListServerActions(this ComputeService service, Identifier serverId)
         {

src/corelib/Compute/v2_1/IPProtocol.cs

@@ -1,30 +1,8 @@
-using OpenStack.Serialization;
-
 namespace OpenStack.Compute.v2_1
 {
     /// <summary>
     /// Internet Protocols.
     /// </summary>
-    public class IPProtocol : StringEnumeration
-    {
-        /// <summary />
-        protected IPProtocol(string displayName)
-            : base(displayName)
-        { }
-
-        /// <summary>
-        /// ICMP
-        /// </summary>
-        public static readonly IPProtocol ICMP = new IPProtocol("icmp");
-
-        /// <summary>
-        /// TCP
-        /// </summary>
-        public static readonly IPProtocol TCP = new IPProtocol("tcp");
-
-        /// <summary>
-        /// UDP
-        /// </summary>
-        public static readonly IPProtocol UDP = new IPProtocol("udp");
-    }
+    public class IPProtocol : Networking.v2.Serialization.IPProtocol<IPProtocol>
+    { }
 }

src/corelib/Compute/v2_1/Serialization/ComputeApi.cs

@@ -765,6 +765,37 @@ protected ComputeApi(IServiceType serviceType, IAuthenticationProvider authentic
                 .SendAsync();
         }
 
+        /// <summary>
+        /// Associates a floating IP address to the server.
+        /// </summary>
+        /// <param name="serverId">The server identifier.</param>
+        /// <param name="request">The request.</param>
+        /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public virtual Task AssociateFloatingIPAsync(string serverId, object request, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            return BuildServerActionRequest(serverId, request, cancellationToken).SendAsync();
+        }
+
+        /// <summary>
+        /// Disassociate a floating IP address from a server.
+        /// </summary>
+        /// <param name="serverId">The server identifier.</param>
+        /// <param name="floatingIPAddress">The floating IP address to remove.</param>
+        /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public virtual Task DisassociateFloatingIPAsync(string serverId, string floatingIPAddress, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            var request = new
+            {
+                removeFloatingIp = new
+                {
+                    address = floatingIPAddress
+                }
+            };
+            return BuildServerActionRequest(serverId, request, cancellationToken).SendAsync();
+        }
+
         /// <summary>
         /// Builds a server action request, where the server operation is specified in the request body.
         /// </summary>

src/corelib/Compute/v2_1/Serialization/ServerCreateDefinitionConverter.cs

@@ -22,11 +22,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
             base.WriteJson(writer, value, serializer);
 
             // Serialize scheduler hints
-            var server = value as ServerCreateDefinition;
+            dynamic server = value; // Using dynamic so that other vendors can use this converter as well
             if (server?.SchedulerHints != null)
             {
                 writer.WritePropertyName("os:scheduler_hints");
-                base.WriteJson(writer, server.SchedulerHints, serializer);
+                base.WriteJson(writer, (object)server.SchedulerHints, serializer);
             }
 
             writer.WriteEndObject();

src/corelib/Compute/v2_1/Server.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Extensions;
+using System.Linq;
 using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
@@ -231,15 +232,46 @@ public string AdminPassword
 
         /// <inheritdoc cref="ComputeApi.AttachVolumeAsync{T}" />
         /// <exception cref="InvalidOperationException">When this instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
-        public virtual async Task<ServerVolume> AttachVolumeAsync(ServerVolumeDefinition volume, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<ServerVolume> AttachVolumeAsync(ServerVolumeDefinition volume, CancellationToken cancellationToken = default(CancellationToken))
         {
             var compute = this.GetOwnerOrThrow<ComputeApi>();
             var result = await compute.AttachVolumeAsync<ServerVolume>(Id, volume, cancellationToken).ConfigureAwait(false);
             AttachedVolumes.Add(result);
             ((IChildResource)result).SetParent(this);
             return result;
         }
-
+
+        /// <inheritdoc cref="ComputeApi.AssociateFloatingIPAsync" />
+        /// <exception cref="InvalidOperationException">When this instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
+        public virtual async Task AssociateFloatingIPAsync(AssociateFloatingIPRequest request, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            var compute = this.GetOwnerOrThrow<ComputeApi>();
+            await compute.AssociateFloatingIPAsync(Id, request, cancellationToken);
+
+            Addresses = await compute.ListServerAddressesAsync<ServerAddressCollection>(Id, cancellationToken);
+        }
+
+        /// <inheritdoc cref="ComputeApi.DisassociateFloatingIPAsync" />
+        /// <exception cref="InvalidOperationException">When this instance was not constructed by the <see cref="ComputeService"/>, as it is missing the appropriate internal state to execute service calls.</exception>
+        public virtual async Task DisassociateFloatingIPAsync(string floatingIPAddress, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            var compute = this.GetOwnerOrThrow<ComputeApi>();
+            await compute.DisassociateFloatingIPAsync(Id, floatingIPAddress, cancellationToken);
+
+            // Remove the address from the current instance immediately
+            foreach (KeyValuePair<string, IList<ServerAddress>> group in Addresses)
+            {
+                foreach (ServerAddress address in group.Value)
+                {
+                    if (address.Type == AddressType.Floating && address.IP == floatingIPAddress)
+                    {
+                        Addresses[group.Key].Remove(address);
+                        return;
+                    }
+                }
+            }
+        }
+
         /// <summary />
         [OnDeserialized]
         private void OnDeserializedMethod(StreamingContext context)

src/corelib/Compute/v2_1/ServerExtensions.cs

@@ -185,6 +185,18 @@ public static void CancelResize(this ServerReference server)
             server.CancelResizeAsync().ForceSynchronous();
         }
 
+        /// <inheritdoc cref="Server.AssociateFloatingIPAsync"/>
+        public static void AssociateFloatingIP(this Server server, AssociateFloatingIPRequest request)
+        {
+            server.AssociateFloatingIPAsync(request).ForceSynchronous();
+        }
+
+        /// <inheritdoc cref="Server.DisassociateFloatingIPAsync"/>
+        public static void DisassociateFloatingIP(this Server server, string floatingIPAddress)
+        {
+            server.DisassociateFloatingIPAsync(floatingIPAddress).ForceSynchronous();
+        }
+
         /// <inheritdoc cref="ServerReference.ListActionSummariesAsync"/>
         public static IEnumerable<ServerActionSummary> ListActionSummaries(this ServerReference server)
         {

src/corelib/Networking/v2/IPProtocol.cs

@@ -0,0 +1,8 @@
+using OpenStack.Networking.v2.Serialization;
+
+namespace OpenStack.Networking.v2
+{
+    /// <inheritdoc />
+    public class IPProtocol : IPProtocol<IPProtocol>
+    { }
+}

src/corelib/Networking/v2/Layer3/ExternalGateway.cs

@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace OpenStack.Networking.v2.Layer3
+{
+    /// <summary>
+    /// Defines a connection from a router to an external network.
+    /// </summary>
+    public class ExternalGateway
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExternalGateway"/> class.
+        /// </summary>
+        public ExternalGateway()
+        {
+            ExternalFixedIPs = new List<IPAddressAssociation>();
+        }
+
+        /// <summary>
+        /// The external network identifier.
+        /// </summary>
+        [JsonProperty("network_id")]
+        public Identifier ExternalNetworkId { get; set; }
+
+        /// <summary>
+        /// Specifies if source NAT is enabled
+        /// </summary>
+        [JsonProperty("enable_snat")]
+        public bool IsSourceNATEnabled { get; set; }
+
+        /// <summary>
+        /// External fixed IP addresses assigned to the router.
+        /// </summary>
+        [JsonProperty("external_fixed_ips")]
+        public IList<IPAddressAssociation> ExternalFixedIPs { get; set; }
+    }
+}