HPF PR: dev <- Azure:dev

src/ResourceManager/Network/Commands.Network/Commands.Network.csproj

@@ -237,6 +237,7 @@
     <Compile Include="ApplicationGateway\UrlPathMap\SetAzureApplicationGatewayUrlPathMapConfigCommand.cs" />
     <Compile Include="Common\NetworkBaseCmdlet.cs" />
     <Compile Include="Common\NetworkClient.cs" />
+    <Compile Include="Common\NetworkCloudException.cs" />
     <Compile Include="Common\NetworkResourceManagerProfile.cs" />
     <Compile Include="ExpressRouteCircuit\Authorization\AddAzureExpressRouteCircuitAuthorizationCommand.cs" />
     <Compile Include="ExpressRouteCircuit\Authorization\AzureExpressRouteCircuitAuthorizationBase.cs" />
@@ -286,6 +287,7 @@
     <Compile Include="Models\PSExpressRouteServiceProviderBandwidthsOffered.cs" />
     <Compile Include="Models\PSExpressRouteServiceProvider.cs" />
     <Compile Include="Models\PSIPConfiguration.cs" />
+    <Compile Include="Models\PSNetworkLongRunningOperation.cs" />
     <Compile Include="Models\PSServiceProviderProperties.cs" />
     <Compile Include="Models\PSPeering.cs" />
     <Compile Include="Models\PSPeeringConfig.cs" />

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

@@ -14,6 +14,7 @@
 
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using System;
+using Microsoft.Azure.Commands.Network.Common;
 
 namespace Microsoft.Azure.Commands.Network
 {
@@ -44,6 +45,17 @@ public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
             NetworkResourceManagerProfile.Initialize();
+            try
+            {
+                Execute();
+            }
+            catch (Rest.Azure.CloudException ex)
+            {
+                throw new NetworkCloudException(ex);
+            }
+        }
+        public virtual void Execute()
+        {
         }
 
         public static string GetResourceGroup(string resourceId)

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

@@ -0,0 +1,91 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+
+using Microsoft.Azure.Commands.Network.Models;
+using Microsoft.Azure.Management.Network.Models;
+using Newtonsoft.Json;
+using System;
+using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.Azure.Commands.Network.Common
+{
+    public class NetworkCloudException : Rest.Azure.CloudException
+    {
+        protected const string RequestIdHeaderInResponse = "x-ms-request-id";
+
+        public NetworkCloudException(Rest.Azure.CloudException ex)
+            : base(GetErrorMessageWithRequestIdInfo(ex), ex)
+        {
+        }
+
+        protected static string GetErrorMessageWithRequestIdInfo(Rest.Azure.CloudException cloudException)
+        {
+            if (cloudException == null)
+            {
+                throw new ArgumentNullException("cloudException");
+            }
+
+            var sb = new StringBuilder();
+
+            if (!string.IsNullOrEmpty(cloudException.Message))
+            {
+                sb.Append(cloudException.Message);
+            }
+
+            if (cloudException.Response == null)
+            {
+                return sb.ToString();
+            }
+
+            if (cloudException.Response.StatusCode.Equals(HttpStatusCode.OK)
+                && cloudException.Response.Content != null)
+            {
+
+                var errorReturned = JsonConvert.DeserializeObject<PSNetworkLongRunningOperation>(
+                    cloudException.Response.Content);
+
+
+                sb.AppendLine().AppendFormat("Status: {0}", errorReturned.Status);
+                if (errorReturned.Error == null)
+                {
+                    return sb.ToString();
+                }
+
+                sb.AppendLine().AppendFormat("ErrorMessage: {0}", errorReturned.Error.Message);
+
+            }
+            else
+            {
+                sb.AppendLine().AppendFormat("StatusCode: {0}", cloudException.Response.StatusCode.GetHashCode());
+                sb.AppendLine().AppendFormat("ReasonPhrase: {0}", cloudException.Response.ReasonPhrase);
+                if (cloudException.Response.Headers == null
+                    || !cloudException.Response.Headers.ContainsKey(RequestIdHeaderInResponse))
+                {
+                    return sb.ToString();
+                }
+
+                string operationId = cloudException.RequestId;
+
+                sb.AppendLine().AppendFormat(
+                    "OperationID : '{0}'",
+                    operationId);
+            }
+            return sb.ToString();
+        }
+    }
+}
+

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Authorization/AddAzureExpressRouteCircuitAuthorizationCommand.cs

@@ -35,9 +35,9 @@ public class AddAzureExpressRouteCircuitAuthorizationCommand : AzureExpressRoute
            HelpMessage = "The ExpressRouteCircuit")]
         public PSExpressRouteCircuit ExpressRouteCircuit { get; set; }
 
-        protected override void ProcessRecord()
+        public override void Execute()
         {
-            base.ProcessRecord();
+            base.Execute();
             var authorization = this.ExpressRouteCircuit.Authorizations.SingleOrDefault(resource => string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase));
 
             if (authorization != null)

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Authorization/GetAzureExpressRouteCircuitAuthorizationCommand.cs

@@ -33,9 +33,9 @@ public class GetAzureExpressRouteCircuitAuthorizationCommand : NetworkBaseCmdlet
             HelpMessage = "The ExpressRouteCircuit")]
         public PSExpressRouteCircuit ExpressRouteCircuit { get; set; }
 
-        protected override void ProcessRecord()
+        public override void Execute()
         {
-            base.ProcessRecord();
+            base.Execute();
             if (!string.IsNullOrEmpty(this.Name))
             {
                 var authorization =

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Authorization/NewAzureExpressRouteCircuitAuthorizationCommand.cs

@@ -26,10 +26,9 @@ public class NewAzureExpressRouteCircuitAuthorizationCommand : AzureExpressRoute
         [ValidateNotNullOrEmpty]
         public override string Name { get; set; }
 
-        protected override void ProcessRecord()
+        public override void Execute()
         {
-            base.ProcessRecord();
-
+            base.Execute();
             var authorization = new PSExpressRouteCircuitAuthorization();
 
             authorization.Name = this.Name;

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Authorization/RemoveAzureExpressRouteCircuitAuthorizationCommand.cs

@@ -33,10 +33,9 @@ public class RemoveAzureExpressRouteCircuitAuthorizationCommand : NetworkBaseCmd
              HelpMessage = "The ExpressRouteCircuit")]
         public PSExpressRouteCircuit ExpressRouteCircuit { get; set; }
 
-        protected override void ProcessRecord()
+        public override void Execute()
         {
-            base.ProcessRecord();
-
+            base.Execute();
             var authorization = this.ExpressRouteCircuit.Authorizations.SingleOrDefault(resource => string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase));
 
             if (authorization != null)

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/GetAzureExpressRouteCircuitCommand.cs

@@ -37,9 +37,9 @@ public class GetAzureExpressRouteCircuitCommand : ExpressRouteCircuitBaseCmdlet
         [ValidateNotNullOrEmpty]
         public virtual string ResourceGroupName { get; set; }
 
-        public override void ExecuteCmdlet()
+        public override void Execute()
         {
-            base.ExecuteCmdlet();
+            base.Execute();
             if (!string.IsNullOrEmpty(this.Name))
             {
                 var circuit = this.GetExpressRouteCircuit(this.ResourceGroupName, this.Name);

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/MoveAzureExpressRouteCircuitCommand.cs

@@ -66,10 +66,9 @@ public class MoveAzureExpressRouteCircuitCommand : ExpressRouteCircuitBaseCmdlet
             HelpMessage = "Do not ask for confirmation if you want to overrite a resource")]
         public SwitchParameter Force { get; set; }
 
-        public override void ExecuteCmdlet()
+        public override void Execute()
         {
-            base.ExecuteCmdlet();
-
+            base.Execute();
             if (this.IsExpressRouteCircuitPresent(this.ResourceGroupName, this.Name))
             {
                 ConfirmAction(

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/NewAzureExpressRouteCircuitCommand.cs

@@ -111,10 +111,8 @@ public class NewAzureExpressRouteCircuitCommand : ExpressRouteCircuitBaseCmdlet
             HelpMessage = "Do not ask for confirmation if you want to overrite a resource")]
         public SwitchParameter Force { get; set; }
 
-        public override void ExecuteCmdlet()
+        public override void Execute()
         {
-            base.ExecuteCmdlet();
-
             WriteWarning("The output object type of this cmdlet will be modified in a future release. Also, the usability of Tag parameter in this cmdlet will be modified in a future release. This will impact creating, updating and appending tags for Azure resources. For more details about the change, please visit https://github.com/Azure/azure-powershell/issues/726#issuecomment-213545494");
 
             if (this.IsExpressRouteCircuitPresent(this.ResourceGroupName, this.Name))
@@ -138,6 +136,7 @@ public override void ExecuteCmdlet()
 
         private PSExpressRouteCircuit CreateExpressRouteCircuit()
         {
+            base.Execute();
             var circuit = new PSExpressRouteCircuit();
             circuit.Name = this.Name;
             circuit.ResourceGroupName = this.ResourceGroupName;

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/AddAzureExpressRouteCircuitPeeringConfigCommand.cs

@@ -34,10 +34,9 @@ public class AddAzureExpressRouteCircuitPeeringConfigCommand : AzureExpressRoute
             HelpMessage = "The ExpressRouteCircuit")]
         public PSExpressRouteCircuit ExpressRouteCircuit { get; set; }
 
-        public override void ExecuteCmdlet()
+        public override void Execute()
         {
-            base.ExecuteCmdlet();
-
+            base.Execute();
             // Verify if the subnet exists in the VirtualNetwork
             var peering = this.ExpressRouteCircuit.Peerings.SingleOrDefault(resource => string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase));
 

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/GetAzureExpressRouteCircuitPeeringConfigCommand.cs

@@ -32,10 +32,9 @@ public class GetAzureExpressRouteCircuitPeeringConfigCommand : NetworkBaseCmdlet
             HelpMessage = "The circuit")]
         public PSExpressRouteCircuit ExpressRouteCircuit { get; set; }
 
-        public override void ExecuteCmdlet()
+        public override void Execute()
         {
-            base.ExecuteCmdlet();
-
+            base.Execute();
             if (!string.IsNullOrEmpty(this.Name))
             {
                 var peering =

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/NewAzureExpressRouteCircuitPeeringConfigCommand.cs

@@ -28,11 +28,10 @@ public class NewAzureExpressRouteCircuitPeeringConfigCommand : AzureExpressRoute
         [ValidateNotNullOrEmpty]
         public override string Name { get; set; }
 
-        public override void ExecuteCmdlet()
+        public override void Execute()
         {
-            base.ExecuteCmdlet();
-
-            var peering = new PSPeering();
+            base.Execute();
+           var peering = new PSPeering();
 
             peering.Name = this.Name;
             peering.PeeringType = this.PeeringType;

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/RemoveAzureExpressRouteCircuitPeeringConfigCommand.cs

@@ -33,10 +33,9 @@ public class RemoveAzureExpressRouteCircuitPeeringConfigCommand : NetworkBaseCmd
              HelpMessage = "The ExpressRouteCircuit")]
         public PSExpressRouteCircuit ExpressRouteCircuit { get; set; }
 
-        public override void ExecuteCmdlet()
+        public override void Execute()
         {
-            base.ExecuteCmdlet();
-
+            base.Execute();
             var auth = this.ExpressRouteCircuit.Peerings.SingleOrDefault(resource => string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase));
 
             if (auth != null)

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/SetAzureExpressRouteCircuitPeeringConfigCommand.cs

@@ -34,10 +34,9 @@ public class SetAzureExpressRouteCircuitPeeringConfigCommand : AzureExpressRoute
             HelpMessage = "The ExpressRouteCircuit")]
         public PSExpressRouteCircuit ExpressRouteCircuit { get; set; }
 
-        public override void ExecuteCmdlet()
+        public override void Execute()
         {
-            base.ExecuteCmdlet();
-
+            base.Execute();
             // Verify if the subnet exists in the VirtualNetwork
             var peering = this.ExpressRouteCircuit.Peerings.SingleOrDefault(resource => string.Equals(resource.Name, this.Name, StringComparison.CurrentCultureIgnoreCase));
 

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/RemoveAzureExpressRouteCircuitCommand.cs

@@ -43,10 +43,9 @@ public class RemoveAzureExpressRouteCircuitCommand : ExpressRouteCircuitBaseCmdl
         [Parameter(Mandatory = false)]
         public SwitchParameter PassThru { get; set; }
 
-        public override void ExecuteCmdlet()
+        public override void Execute()
         {
-            base.ExecuteCmdlet();
-
+            base.Execute();
             ConfirmAction(
                 Force.IsPresent,
                 string.Format(Microsoft.Azure.Commands.Network.Properties.Resources.RemovingResource, Name),

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/SetAzureExpressRouteCircuitCommand.cs

@@ -31,10 +31,9 @@ public class SetAzureExpressRouteCircuitCommand : ExpressRouteCircuitBaseCmdlet
             HelpMessage = "The ExpressRouteCircuit")]
         public PSExpressRouteCircuit ExpressRouteCircuit { get; set; }
 
-        public override void ExecuteCmdlet()
+        public override void Execute()
         {
-            base.ExecuteCmdlet();
-
+            base.Execute();
             if (!this.IsExpressRouteCircuitPresent(this.ExpressRouteCircuit.ResourceGroupName, this.ExpressRouteCircuit.Name))
             {
                 throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitARPTableCommand.cs

@@ -31,7 +31,7 @@ public enum DevicePathEnum
         Secondary		
      }		
 
-     [Cmdlet(VerbsCommon.Get, "AzureRmExpressRouteCircuitARPTable"),OutputType(typeof(PSExpressRouteCircuitArpTable))]		
+     [Cmdlet(VerbsCommon.Get, "AzureRmExpressRouteCircuitARPTable"),OutputType(typeof(PSExpressRouteCircuitArpTable))]
      public class GetAzureExpressRouteCircuitARPTableCommand : NetworkBaseCmdlet		
      {		
          [Alias("ResourceName")]		
@@ -72,9 +72,9 @@ public class GetAzureExpressRouteCircuitARPTableCommand : NetworkBaseCmdlet
          [ValidateNotNullOrEmpty]
          public DevicePathEnum DevicePath { get; set; }		
 
-         public override void ExecuteCmdlet()		
-         {		
-             base.ExecuteCmdlet();		
+         public override void Execute()		
+         {
+             base.Execute();
              var arpTables = this.NetworkClient.NetworkManagementClient.ExpressRouteCircuits.ListArpTable
                      (ResourceGroupName, ExpressRouteCircuitName, PeeringType, DevicePath.ToString()).Value.Cast<object>().ToList();
              var psARPs = new List<PSExpressRouteCircuitArpTable>();

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitRouteTableCommand.cs

@@ -66,9 +66,9 @@ public class GetAzureRmExpressRouteCircuitRouteTable : NetworkBaseCmdlet
          [ValidateNotNullOrEmpty]
          public DevicePathEnum DevicePath { get; set; }			
 
-         public override void ExecuteCmdlet()		
-         {		
-             base.ExecuteCmdlet();
+         public override void Execute()		
+         {
+             base.Execute();
              var routeTables = this.NetworkClient.NetworkManagementClient.ExpressRouteCircuits.ListRoutesTable
                  (ResourceGroupName, ExpressRouteCircuitName, PeeringType, DevicePath.ToString()).Value.Cast<object>().ToList();
              var psRoutes = new List<PSExpressRouteCircuitRoutesTable>();

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitRouteTableSummaryCommand.cs

@@ -66,9 +66,9 @@ public class GetAzureRmExpressRouteCircuitRouteTableSummaryCommand : NetworkBase
         [ValidateNotNullOrEmpty]
         public DevicePathEnum DevicePath { get; set; }		
 
-        public override void ExecuteCmdlet()
+        public override void Execute()
         {
-            base.ExecuteCmdlet();
+            base.Execute();
             var arpTables = this.NetworkClient.NetworkManagementClient.ExpressRouteCircuits.ListRoutesTableSummary
                     (ResourceGroupName, ExpressRouteCircuitName, PeeringType, DevicePath.ToString()).Value.Cast<object>().ToList();
             var psARPs = new List<PSExpressRouteCircuitRoutesTableSummary>();

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteStatsCommand.cs

@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.Network		
 {
-    [Cmdlet(VerbsCommon.Get, "AzureRmExpressRouteCircuitStats"), OutputType(typeof(PSExpressRouteCircuitStats))]		
+    [Cmdlet(VerbsCommon.Get, "AzureRmExpressRouteCircuitStats"), OutputType(typeof(PSExpressRouteCircuitStats))]
     public class GetAzureExpressRouteCircuitStatsCommand : NetworkBaseCmdlet		
     {		
         [Alias("ResourceName")]		
@@ -55,10 +55,9 @@ public class GetAzureExpressRouteCircuitStatsCommand : NetworkBaseCmdlet
            IgnoreCase = true)]		
         public string PeeringType { get; set; }		
 
-        public override void ExecuteCmdlet()		
-        {		
-            base.ExecuteCmdlet();		
-
+        public override void Execute()		
+        {
+            base.Execute();
             if (string.IsNullOrEmpty(PeeringType))		
             {		
                 var stats = this.NetworkClient.NetworkManagementClient.ExpressRouteCircuits.GetStats(