Update according to PR comments

Author: hyonholee

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/AddVhdTests.ps1

@@ -67,13 +67,13 @@ function Test-AddVhd
 
               $vhdDownloadPath = $vhdLocalPath + "-download.vhd";
 
-              $vhdDownloadContext = Save-AzureRmVhd -ResourceGroupName $rgname -Source $vhdDestUri -LocalFilePath $vhdDownloadPath;
+              $vhdDownloadContext = Save-AzureRmVhd -ResourceGroupName $rgname -SourceUri $vhdDestUri -LocalFilePath $vhdDownloadPath;
               Write-Output ("Source :" +$vhdDownloadContext.Source);
               Write-Output ("LocalFilePath :" +$vhdDownloadContext.LocalFilePath);
               Assert-AreEqual $vhdDestUri $vhdDownloadContext.Source;
               Assert-AreEqual $vhdDownloadPath $vhdDownloadContext.LocalFilePath;
 
-              $vhdDownloadContext = Save-AzureRmVhd -ResourceGroupName $rgname -Source $vhdDestUri -LocalFilePath $vhdDownloadPath -Overwrite;
+              $vhdDownloadContext = Save-AzureRmVhd -ResourceGroupName $rgname -SourceUri $vhdDestUri -LocalFilePath $vhdDownloadPath -Overwrite;
               Assert-AreEqual $vhdDestUri $vhdDownloadContext.Source;
               Assert-AreEqual $vhdDownloadPath $vhdDownloadContext.LocalFilePath;
         }

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1

@@ -475,8 +475,9 @@ function Get-SubscriptionIdFromResourceGroup
 
 	  $rgid = $rg.ResourceId;
 
+	  # ResouceId is a form of "/subscriptions/<subId>/resourceGroups/<resourgGroupName>"
+	  # So return the second part to get subscription Id
 	  $first = $rgid.IndexOf('/', 1);
 	  $last = $rgid.IndexOf('/', $first + 1);
-
 	  return $rgid.Substring($first + 1, $last - $first - 1);
 }

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

@@ -310,6 +310,7 @@
     <Compile Include="VirtualMachine\Config\SetAzureVMOperatingSystemCommand.cs" />
     <Compile Include="VirtualMachine\Config\AddAzureVMDataDiskCommand.cs" />
     <Compile Include="VirtualMachine\Config\AddAzureVMNetworkInterfaceCommand.cs" />
+    <Compile Include="VirtualMachine\VirtualMachineCmdletHelper.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj">

src/ResourceManager/Compute/Commands.Compute/Common/ConstantStringTypes.cs

@@ -69,8 +69,8 @@ public static class ProfileNouns
         public const string DataDisk = "AzureRmVMDataDisk";
         public const string OSDisk = "AzureRmVMOSDisk";
         public const string SourceImage = "AzureRmVMSourceImage";
-        public const string BootDiagnostics = "AzureRMVMBootDiagnostics";
-        public const string BootDiagnosticsData = "AzureRMVMBootDiagnosticsData";
+        public const string BootDiagnostics = "AzureRmVMBootDiagnostics";
+        public const string BootDiagnosticsData = "AzureRmVMBootDiagnosticsData";
 
         public const string NetworkInterface = "AzureRmVMNetworkInterface";
 
@@ -79,7 +79,7 @@ public static class ProfileNouns
         public const string VirtualMachineCustomScriptExtension = "AzureRmVMCustomScriptExtension";
         public const string VirtualMachineAccessExtension = "AzureRmVMAccessExtension";
         public const string VirtualMachineDiagnosticsExtension = "AzureRmVMDiagnosticsExtension";
-        public const string VirtualMachineExtensionImage = "AzureRmVMExtensionImage";
+        public const string VirtualMachineExtensionImage = "AzureRmVmExtensionImage";
         public const string VirtualMachineExtensionImageVersion = "AzureRmVMExtensionImageVersion";
         public const string VirtualMachineExtensionImageType = "AzureRmVMExtensionImageType";
 

src/ResourceManager/Compute/Commands.Compute/StorageServices/SaveAzureVhdCommand.cs

@@ -46,36 +46,24 @@ public class SaveAzureVhdCommand : ComputeClientBaseCmdlet
             HelpMessage = "Key of the storage account")]
         [ValidateNotNullOrEmpty]
         [Alias("sk")]
-        public string StorageKey
-        {
-            get;
-            set;
-        }
+        public string StorageKey  { get; set; }
 
         [Parameter(
             Position = 1,
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Uri to blob")]
         [ValidateNotNullOrEmpty]
-        [Alias("src")]
-        public Uri Source
-        {
-            get;
-            set;
-        }
+        [Alias("src", "Source")]
+        public Uri SourceUri  { get; set; }
 
         [Parameter(
             Position = 2,
             Mandatory = true,
             HelpMessage = "Local path of the vhd file")]
         [ValidateNotNullOrEmpty]
         [Alias("lf")]
-        public FileInfo LocalFilePath
-        {
-            get;
-            set;
-        }
+        public FileInfo LocalFilePath  { get; set; }
 
         private int numberOfThreads = DefaultNumberOfUploaderThreads;
 
@@ -98,17 +86,13 @@ public int NumberOfThreads
             HelpMessage = "Delete the local file if already exists")]
         [ValidateNotNullOrEmpty]
         [Alias("o")]
-        public SwitchParameter OverWrite
-        {
-            get;
-            set;
-        }
+        public SwitchParameter OverWrite  { get; set; }
 
         protected override void ProcessRecord()
         {
             var result = DownloadFromBlobUri(
                 this,
-                this.Source,
+                this.SourceUri,
                 this.LocalFilePath,
                 this.StorageKey,
                 this.ResourceGroupName,

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/GetAzureVMBootDiagnosticsDataCommand.cs

@@ -85,7 +85,6 @@ protected override void ProcessRecord()
             ExecuteClientAction(() =>
             {
                 var result = this.VirtualMachineClient.GetWithInstanceView(this.ResourceGroupName, this.Name);
-                var output = new VhdDownloadContext();
                 if (result == null || result.VirtualMachine == null)
                 {
                     ThrowTerminatingError
@@ -153,7 +152,6 @@ protected override void ProcessRecord()
 
                     WriteObject(sb.ToString());
                 }
-                WriteObject(output);
             });
         }
 

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs

@@ -196,9 +196,9 @@ private string GetRandomStorageAccountName(int interation)
             const int maxResLength = 6;
             const int maxVMLength = 4;
 
-            var subscriptionName = GetTruncatedStr(this.DefaultContext.Subscription.Name, maxSubLength);
-            var resourcename = GetTruncatedStr(this.ResourceGroupName, maxResLength);
-            var vmname = GetTruncatedStr(this.VM.Name, maxVMLength);
+            var subscriptionName = VirtualMachineCmdletHelper.GetTruncatedStr(this.DefaultContext.Subscription.Name, maxSubLength);
+            var resourcename = VirtualMachineCmdletHelper.GetTruncatedStr(this.ResourceGroupName, maxResLength);
+            var vmname = VirtualMachineCmdletHelper.GetTruncatedStr(this.VM.Name, maxVMLength);
             var datetimestr = DateTime.Now.ToString("MMddHHmm");
 
             var output = subscriptionName + resourcename + vmname + datetimestr + interation;
@@ -208,14 +208,6 @@ private string GetRandomStorageAccountName(int interation)
             return output.ToLowerInvariant();
         }
 
-        private static string GetTruncatedStr(string inputStr, int maxLength)
-        {
-            if (inputStr == null) return string.Empty;
-            return (inputStr.Length > maxLength)
-                ? inputStr.Substring(0, maxLength)
-                : inputStr;
-        }
-
         private static string GetStorageAccountNameFromUriString(string uriStr)
         {
             Uri uri;

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/VirtualMachineCmdletHelper.cs

@@ -0,0 +1,27 @@
+// ----------------------------------------------------------------------------------
+//
+// 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.
+// ----------------------------------------------------------------------------------
+
+namespace Microsoft.Azure.Commands.Compute
+{
+    public class VirtualMachineCmdletHelper
+    {
+        public static string GetTruncatedStr(string inputStr, int maxLength)
+        {
+            if (inputStr == null) return string.Empty;
+            return (inputStr.Length > maxLength)
+                ? inputStr.Substring(0, maxLength)
+                : inputStr;
+        }
+    }
+}