Merge pull request Azure#1381 from yantang-msft/dev

AzureRmVMDiagnostics command change [yantang]

Author: Hovsep

src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

@@ -227,9 +227,10 @@
     <Compile Include="Extension\CustomScript\RemoveAzureVMCustomScriptExtensionCommand.cs" />
     <Compile Include="Extension\CustomScript\SetAzureVMCustomScriptExtensionCommand.cs" />
     <Compile Include="Extension\CustomScript\VirtualMachineCustomScriptExtensionContext.cs" />
-    <Compile Include="Extension\Diagnostics\GetAzureVMDiagnosticsExtension.cs" />
-    <Compile Include="Extension\Diagnostics\RemoveAzureVMDiagnosticsExtension.cs" />
-    <Compile Include="Extension\Diagnostics\SetAzureVMDiagnosticsExtension.cs" />
+    <Compile Include="Extension\Diagnostics\DiagnosticsExtensionConstants.cs" />
+    <Compile Include="Extension\Diagnostics\GetAzureRmVMDiagnosticsExtension.cs" />
+    <Compile Include="Extension\Diagnostics\RemoveAzureRmVMDiagnosticsExtension.cs" />
+    <Compile Include="Extension\Diagnostics\SetAzureRmVMDiagnosticsExtension.cs" />
     <Compile Include="Extension\DSC\GetAzureVMDscExtensionStatusCommand.cs" />
     <Compile Include="Extension\DSC\GetDscResourceException.cs" />
     <Compile Include="Extension\DSC\DscExtensionPublishCmdletCommonBase.cs" />

src/ResourceManager/Compute/Commands.Compute/Extension/Diagnostics/VirtualMachineDiagnosticsExtensionCmdletBase.cs renamed to src/ResourceManager/Compute/Commands.Compute/Extension/Diagnostics/DiagnosticsExtensionConstants.cs

@@ -14,19 +14,11 @@
 
 namespace Microsoft.Azure.Commands.Compute
 {
-    public class VirtualMachineDiagnosticsExtensionCmdletBase : VirtualMachineExtensionBaseCmdlet
+    public static class DiagnosticsExtensionConstants
     {
-        protected const string DiagnosticsExtensionNamespace = "Microsoft.Azure.Diagnostics";
-        protected const string DiagnosticsExtensionType = "IaaSDiagnostics";
-
-        protected string StorageAccountName { get; set; }
-        protected string StorageKey { get; set; }
-        protected string Endpoint { get; set; }
-
-        public VirtualMachineDiagnosticsExtensionCmdletBase()
-            : base()
-        {
-
-        }
+        public const string VirtualMachineExtensionResourceType = "Microsoft.Compute/virtualMachines/extensions";
+        public const string ExtensionDefaultName = "Microsoft.Insights.VMDiagnosticsSettings";
+        public const string ExtensionPublisher = "Microsoft.Azure.Diagnostics";
+        public const string ExtensionType = "IaaSDiagnostics";
     }
-}
+}

src/ResourceManager/Compute/Commands.Compute/Extension/Diagnostics/GetAzureVMDiagnosticsExtension.cs renamed to src/ResourceManager/Compute/Commands.Compute/Extension/Diagnostics/GetAzureRmVMDiagnosticsExtension.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using System.Linq;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Compute.Common;
@@ -26,7 +27,7 @@ namespace Microsoft.Azure.Commands.Compute
         ProfileNouns.VirtualMachineDiagnosticsExtension),
     OutputType(
         typeof(PSVirtualMachineExtension))]
-    public class GetAzureVMDiagnosticsExtensionCommand : VirtualMachineExtensionBaseCmdlet
+    public class GetAzureRmVMDiagnosticsExtensionCommand : VirtualMachineExtensionBaseCmdlet
     {
         [Parameter(
            Mandatory = true,
@@ -47,11 +48,10 @@ public class GetAzureVMDiagnosticsExtensionCommand : VirtualMachineExtensionBase
 
         [Alias("ExtensionName")]
         [Parameter(
-            Mandatory = true,
+            Mandatory = false,
             Position = 2,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Extension Name.")]
-        [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
         [Parameter(
@@ -67,6 +67,25 @@ public override void ExecuteCmdlet()
 
             ExecuteClientAction(() =>
             {
+                if (string.IsNullOrEmpty(this.Name))
+                {
+                    var virtualMachine = ComputeClient.ComputeManagementClient.VirtualMachines.Get(this.ResourceGroupName, this.VMName).VirtualMachine;
+                    var diagnosticsExtension = virtualMachine.Extensions != null
+                            ? virtualMachine.Extensions.FirstOrDefault(extension =>
+                                extension.Publisher.Equals(DiagnosticsExtensionConstants.ExtensionPublisher, StringComparison.InvariantCultureIgnoreCase) &&
+                                extension.ExtensionType.Equals(DiagnosticsExtensionConstants.ExtensionType, StringComparison.InvariantCultureIgnoreCase))
+                            : null;
+
+                    if (diagnosticsExtension == null)
+                    {
+                        WriteObject(null);
+                        return;
+                    }
+                    else {
+                        this.Name = diagnosticsExtension.Name;
+                    }
+                }
+
                 VirtualMachineExtensionGetResponse virtualMachineExtensionGetResponse = null;
                 if (Status.IsPresent)
                 {

src/ResourceManager/Compute/Commands.Compute/Extension/Diagnostics/RemoveAzureVMDiagnosticsExtension.cs renamed to src/ResourceManager/Compute/Commands.Compute/Extension/Diagnostics/RemoveAzureRmVMDiagnosticsExtension.cs

@@ -13,16 +13,18 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Linq;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Compute.Common;
 using Microsoft.Azure.Management.Compute;
+using System.Globalization;
 
 namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(
         VerbsCommon.Remove,
         ProfileNouns.VirtualMachineDiagnosticsExtension)]
-    public class RemoveAzureVMDiagnosticsExtensionCommand : VirtualMachineExtensionBaseCmdlet
+    public class RemoveAzureRmVMDiagnosticsExtensionCommand : VirtualMachineExtensionBaseCmdlet
     {
         [Parameter(
            Mandatory = true,
@@ -43,11 +45,10 @@ public class RemoveAzureVMDiagnosticsExtensionCommand : VirtualMachineExtensionB
 
         [Alias("ExtensionName")]
         [Parameter(
-            Mandatory = true,
+            Mandatory = false,
             Position = 2,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Extension Name.")]
-        [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
         public override void ExecuteCmdlet()
@@ -56,6 +57,26 @@ public override void ExecuteCmdlet()
 
             ExecuteClientAction(() =>
             {
+                if (string.IsNullOrEmpty(this.Name))
+                {
+                    var virtualMachine = ComputeClient.ComputeManagementClient.VirtualMachines.Get(this.ResourceGroupName, this.VMName).VirtualMachine;
+                    var diagnosticsExtension = virtualMachine.Extensions != null
+                            ? virtualMachine.Extensions.FirstOrDefault(extension =>
+                                extension.Publisher.Equals(DiagnosticsExtensionConstants.ExtensionPublisher, StringComparison.InvariantCultureIgnoreCase) &&
+                                extension.ExtensionType.Equals(DiagnosticsExtensionConstants.ExtensionType, StringComparison.InvariantCultureIgnoreCase))
+                            : null;
+
+                    if (diagnosticsExtension == null)
+                    {
+                        WriteWarning(string.Format(CultureInfo.InvariantCulture, Properties.Resources.DiagnosticsExtensionNotFound, this.ResourceGroupName, this.VMName));
+                        return;
+                    }
+                    else
+                    {
+                        this.Name = diagnosticsExtension.Name;
+                    }
+                }
+
                 var op = this.VirtualMachineExtensionClient.Delete(this.ResourceGroupName, this.VMName,
                     this.Name);
                 WriteObject(op);