Add router resource

Author: carolynvs

src/corelib/Compute/v2_1/ComputeService.cs

@@ -217,6 +217,12 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg
             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/Serialization/ComputeApi.cs

@@ -766,16 +766,36 @@ protected ComputeApi(IServiceType serviceType, IAuthenticationProvider authentic
         }
 
         /// <summary>
-        /// Associates a floating IP address to the server instance.
+        /// 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/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;
@@ -242,10 +243,33 @@ public string AdminPassword
 
         /// <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 Task AssociateFloatingIPAsync(AssociateFloatingIPRequest request, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task AssociateFloatingIPAsync(AssociateFloatingIPRequest request, CancellationToken cancellationToken = default(CancellationToken))
         {
             var compute = this.GetOwnerOrThrow<ComputeApi>();
-            return compute.AssociateFloatingIPAsync(Id, request, cancellationToken);
+            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 />

src/corelib/Compute/v2_1/ServerExtensions.cs

@@ -191,6 +191,12 @@ public static void AssociateFloatingIP(this Server server, AssociateFloatingIPRe
             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/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; }
+    }
+}

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

@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace OpenStack.Networking.v2.Layer3
+{
+    /// <summary>
+    /// Defines the set of fields that can be updated on an external gateway resource.
+    /// </summary>
+    public class ExternalGatewayDefinition
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExternalGateway"/> class.
+        /// </summary>
+        public ExternalGatewayDefinition(Identifier externalNetworkId)
+        {
+            ExternalNetworkId = externalNetworkId;
+            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; }
+    }
+}

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

@@ -79,7 +79,7 @@ public class FloatingIP : IHaveExtraData, IServiceResource
         public async Task AssociateAsync(Identifier portId, CancellationToken cancellationToken = default(CancellationToken))
         {
             var networking = this.GetOwnerOrThrow<NetworkingApiBuilder>();
-            var request = new FloatingIPUpdateDefinition {PortId = portId};
+            var request = new FloatingIPUpdateDefinition { PortId = portId };
             var result = await networking.UpdateFloatingIPAsync<FloatingIP>(Id, request, cancellationToken).ConfigureAwait(false);
             result.CopyProperties(this);
         }
@@ -92,7 +92,7 @@ public class FloatingIP : IHaveExtraData, IServiceResource
         public async Task DisassociateAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
             var networking = this.GetOwnerOrThrow<NetworkingApiBuilder>();
-            var request = new FloatingIPUpdateDefinition {PortId = null};
+            var request = new FloatingIPUpdateDefinition { PortId = null };
             var result = await networking.UpdateFloatingIPAsync<FloatingIP>(Id, request, cancellationToken).ConfigureAwait(false);
             result.CopyProperties(this);
         }

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

@@ -1,6 +1,6 @@
-using System;
 using OpenStack.Synchronous.Extensions;
 
+// ReSharper disable once CheckNamespace
 namespace OpenStack.Networking.v2.Layer3.Synchronous
 {
     /// <summary>
@@ -9,14 +9,12 @@ namespace OpenStack.Networking.v2.Layer3.Synchronous
     public static class FloatingIPExtensions
     {
         /// <inheritdoc cref="FloatingIP.AssociateAsync" />
-        /// <exception cref="InvalidOperationException">Thrown when a resource as not constructed by the SDK.</exception>
         public static void Associate(this FloatingIP floatingIP, Identifier portId)
         {
             floatingIP.AssociateAsync(portId).ForceSynchronous();
         }
 
         /// <inheritdoc cref="FloatingIP.DisassociateAsync" />
-        /// <exception cref="InvalidOperationException">Thrown when a resource as not constructed by the SDK.</exception>
         public static void Disassociate(this FloatingIP floatingIP)
         {
             floatingIP.DisassociateAsync().ForceSynchronous();