Merge pull request #1469 from Nilambari/latestdev

Fixing broken PS command let:- Get-AzureRmVpnClientPackage

Author: markcowl

src/ResourceManager/Network/Commands.Network/Common/NetworkClient.cs

@@ -16,6 +16,19 @@
 using Microsoft.Azure.Management.Network;
 using Microsoft.Azure.Common.Authentication.Models;
 using Microsoft.Azure.Common.Authentication;
+using Microsoft.Azure.Management.Network.Models;
+using System.Threading.Tasks;
+using System.Threading;
+using Microsoft.Rest.Azure;
+using System.Collections.Generic;
+using Microsoft.Rest;
+using System.Net.Http;
+using Newtonsoft.Json;
+using System.Text;
+using System.Net.Http.Headers;
+using System.Net;
+using System.Linq;
+
 namespace Microsoft.Azure.Commands.Network
 {
     public partial class NetworkClient
@@ -41,5 +54,171 @@ public NetworkClient(INetworkManagementClient NetworkManagementClient)
         public NetworkClient()
         {
         }
+        public string Generatevpnclientpackage(string resourceGroupName, string virtualNetworkGatewayName, VpnClientParameters parameters)
+        {
+            return Task.Factory.StartNew(() => GeneratevpnclientpackageAsync(resourceGroupName, virtualNetworkGatewayName, parameters)).Unwrap().GetAwaiter().GetResult();
+        }
+
+        public async Task<string> GeneratevpnclientpackageAsync(string resourceGroupName, string virtualNetworkGatewayName, VpnClientParameters parameters,
+            CancellationToken cancellationToken = default(CancellationToken))
+        {
+            AzureOperationResponse<string> result = await this.GeneratevpnclientpackageWithHttpMessagesAsync(resourceGroupName, virtualNetworkGatewayName,
+                parameters, null, cancellationToken).ConfigureAwait(false);
+            return result.Body;
+        }
+
+        /// <summary>
+        /// The Generatevpnclientpackage operation generates Vpn client package for
+        /// P2S client of the virtual network gateway in the specified resource group
+        /// through Network resource provider.
+        /// </summary>
+        /// <param name='resourceGroupName'>
+        /// The name of the resource group.
+        /// </param>
+        /// <param name='virtualNetworkGatewayName'>
+        /// The name of the virtual network gateway.
+        /// </param>
+        /// <param name='parameters'>
+        /// Parameters supplied to the Begin Generating  Virtual Network Gateway Vpn
+        /// client package operation through Network resource provider.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<string>> GeneratevpnclientpackageWithHttpMessagesAsync(string resourceGroupName, string virtualNetworkGatewayName,
+            VpnClientParameters parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            #region 1. Send Async request to generate vpn client package
+
+            // 1. Send Async request to generate vpn client package          
+            string baseUrl = NetworkManagementClient.BaseUri.ToString();
+            string apiVersion = NetworkManagementClient.ApiVersion;
+
+            if (resourceGroupName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
+            }
+            if (virtualNetworkGatewayName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "virtualNetworkGatewayName");
+            }
+            if (parameters == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
+            }
+
+            // Construct URL
+            var url = new Uri(new Uri(baseUrl + (baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/" +
+                "providers/Microsoft.Network/virtualnetworkgateways/{virtualNetworkGatewayName}/generatevpnclientpackage").ToString();
+            url = url.Replace("{resourceGroupName}", Uri.EscapeDataString(resourceGroupName));
+            url = url.Replace("{virtualNetworkGatewayName}", Uri.EscapeDataString(virtualNetworkGatewayName));
+            url = url.Replace("{subscriptionId}", Uri.EscapeDataString(NetworkManagementClient.SubscriptionId));
+            url += "?" + string.Join("&", string.Format("api-version={0}", Uri.EscapeDataString(apiVersion)));
+
+            // Create HTTP transport objects
+            HttpRequestMessage httpRequest = new HttpRequestMessage();
+            httpRequest.Method = new HttpMethod("POST");
+            httpRequest.RequestUri = new Uri(url);
+            // Set Headers
+            httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+
+            // Serialize Request
+            string requestContent = JsonConvert.SerializeObject(parameters, NetworkManagementClient.SerializationSettings);
+            httpRequest.Content = new StringContent(requestContent, Encoding.UTF8);
+            httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+
+            // Set Credentials
+            if (NetworkManagementClient.Credentials != null)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                await NetworkManagementClient.Credentials.ProcessHttpRequestAsync(httpRequest, cancellationToken).ConfigureAwait(false);
+            }
+            // Send Request
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var client = this.NetworkManagementClient as NetworkManagementClient;
+            HttpClient httpClient = client.HttpClient;
+            HttpResponseMessage httpResponse = await httpClient.SendAsync(httpRequest, cancellationToken).ConfigureAwait(false);
+
+            HttpStatusCode statusCode = httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            if ((int)statusCode != 202)
+            {
+                string responseContent = await httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                throw new Exception(string.Format("Get-AzureRmVpnClientPackage Operation returned an invalid status code '{0}' with Exception:{1}",
+                    statusCode, string.IsNullOrEmpty(responseContent) ? "NotAvailable" : responseContent));
+            }
+
+            // Create Result
+            var result = new AzureOperationResponse<string>();
+            result.Request = httpRequest;
+            result.Response = httpResponse;
+            if (httpResponse.Headers.Contains("x-ms-request-id"))
+            {
+                result.RequestId = httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+            }
+            else
+            {
+                throw new Exception(string.Format("Get-AzureRmVpnClientPackage Operation Failed as no valid status code received in response!"));
+            }
+
+            string operationId = result.RequestId;
+            #endregion
+
+            #region 2. Wait for Async operation to succeed and then Get the content i.e. VPN Client package Url from locationResults
+            //Microsoft.WindowsAzure.Commands.Utilities.Common.TestMockSupport.Delay(60000);
+
+            // 2. Wait for Async operation to succeed           
+            var locationResultsUrl = new Uri(new Uri(baseUrl + (baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Network/" +
+                "locations/westus.validation/operationResults/{operationId}").ToString();
+            locationResultsUrl = locationResultsUrl.Replace("{operationId}", Uri.EscapeDataString(operationId));
+            locationResultsUrl = locationResultsUrl.Replace("{subscriptionId}", Uri.EscapeDataString(NetworkManagementClient.SubscriptionId));
+            locationResultsUrl += "?" + string.Join("&", string.Format("api-version={0}", Uri.EscapeDataString(apiVersion)));
+
+            DateTime startTime = DateTime.UtcNow;
+            DateTime giveUpAt = DateTime.UtcNow.AddMinutes(3);
+
+            // Send the Get locationResults request for operaitonId till either we get StatusCode 200 or it time outs (3 minutes in this case)
+            while (true)
+            {
+                HttpRequestMessage newHttpRequest = new HttpRequestMessage();
+                newHttpRequest.Method = new HttpMethod("GET");
+                newHttpRequest.RequestUri = new Uri(locationResultsUrl);
+
+                if (NetworkManagementClient.Credentials != null)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+                    await NetworkManagementClient.Credentials.ProcessHttpRequestAsync(newHttpRequest, cancellationToken).ConfigureAwait(false);
+                }
+
+                HttpResponseMessage newHttpResponse = await httpClient.SendAsync(newHttpRequest, cancellationToken).ConfigureAwait(false);
+
+                if ((int)newHttpResponse.StatusCode != 200)
+                {
+                    if (DateTime.UtcNow > giveUpAt)
+                    {
+                        string newResponseContent = await newHttpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+                        throw new Exception(string.Format("Get-AzureRmVpnClientPackage Operation returned an invalid status code '{0}' with Exception:{1} while retrieving " +
+                            "the Vpnclient PackageUrl!", newHttpResponse.StatusCode, string.IsNullOrEmpty(newResponseContent) ? "NotAvailable" : newResponseContent));
+                    }
+                    else
+                    {
+                        // Wait for 15 seconds before retrying
+                        Microsoft.WindowsAzure.Commands.Utilities.Common.TestMockSupport.Delay(15000);
+                    }
+                }
+                else
+                {
+                    // Get the content i.e.VPN Client package Url from locationResults
+                    result.Body = newHttpResponse.Content.ReadAsStringAsync().Result;
+                    return result;
+                }
+            }
+            #endregion
+        }
     }
 }

src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/GenerateAzureVpnClientPackage.cs

@@ -22,6 +22,19 @@
 using System.Collections;
 using Microsoft.Azure.Commands.Tags.Model;
 using System.Collections.Generic;
+using System.Net.Http;
+using Microsoft.Rest.Azure;
+using Microsoft.Azure.Management.Network.Models;
+using Microsoft.Rest;
+using Microsoft.Azure.Common.Authentication;
+using Newtonsoft.Json;
+using System.Text;
+using System.Net.Http.Headers;
+using System.Net;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Threading;
+using Microsoft.Azure.Management.Internal.Resources.Models;
 
 namespace Microsoft.Azure.Commands.Network
 {
@@ -65,7 +78,11 @@ public override void ExecuteCmdlet()
             vpnClientParams.ProcessorArchitecture = this.ProcessorArchitecture;
             var vnetVpnClientParametersModel = Mapper.Map<MNM.VpnClientParameters>(vpnClientParams);
 
-            string packageUrl = this.VirtualNetworkGatewayClient.Generatevpnclientpackage(ResourceGroupName, VirtualNetworkGatewayName, vnetVpnClientParametersModel);
+            //TODO:- This code is added just for current release of P2S feature as Generatevpnclientpackage API is broken & need to be fixed on server 
+            //side as well as in overall Poweshell flow
+            //string packageUrl = this.VirtualNetworkGatewayClient.Generatevpnclientpackage(ResourceGroupName, VirtualNetworkGatewayName, vnetVpnClientParametersModel);
+
+            string packageUrl = this.NetworkClient.Generatevpnclientpackage(ResourceGroupName, VirtualNetworkGatewayName, vnetVpnClientParametersModel);
 
             WriteObject(packageUrl);
         }