update test

Author: huangpf

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/CredentialHelper.cs

@@ -239,7 +239,7 @@ public static string DefaultStorageName
             }
         }
 
-        public static void CopyTestData(string srcContainer, string srcBlob, string destContainer, string destBlob)
+        public static void CopyTestData(string srcContainer, string srcBlob, string destContainer, string destBlob = null)
         {
             ServiceManagementCmdletTestHelper vmPowershellCmdlets = new ServiceManagementCmdletTestHelper();
             Process currentProcess = Process.GetCurrentProcess();
@@ -262,7 +262,15 @@ public static void CopyTestData(string srcContainer, string srcBlob, string dest
             // Make SAS Uri for the source blob.
             string srcSasUri = Utilities.GenerateSasUri(CredentialHelper.CredentialBlobUriFormat, storageAccount, storageAccountKey, srcContainer, srcBlob);
 
-            vmPowershellCmdlets.RunPSScript(string.Format("Start-AzureStorageBlobCopy -SrcUri \"{0}\" -DestContainer {1} -DestBlob {2} -Force", srcSasUri, destContainer, destBlob));
+            if (string.IsNullOrEmpty(destBlob))
+            {
+                vmPowershellCmdlets.RunPSScript(string.Format("Start-AzureStorageBlobCopy -SrcContainer {0} -SrcBlob {1} -DestContainer {2} -Force", srcContainer, srcBlob, destContainer));
+                destBlob = srcBlob;
+            }
+            else
+            {
+                vmPowershellCmdlets.RunPSScript(string.Format("Start-AzureStorageBlobCopy -SrcUri \"{0}\" -DestContainer {1} -DestBlob {2} -Force", srcSasUri, destContainer, destBlob));
+            }
 
             for (int i = 0; i < 60; i++)
             {

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/FunctionalTestCommonVhd.cs

@@ -174,6 +174,51 @@ public void AzureVMImageTest()
                 vmPowershellCmdlets.RemoveAzureVMImage(newImageName, false);
                 Assert.IsTrue(Utilities.CheckRemove(vmPowershellCmdlets.GetAzureVMImage, newImageName));
 
+                // Unique Container Prefix
+                var containerPrefix = Utilities.GetUniqueShortName("vmimg");
+
+                // Disk Blobs
+                var srcVhdName = "os1.vhd";
+                var srcVhdContainer = vhdContainerName;
+                var dstOSVhdContainer = containerPrefix.ToLower() + "os" + vhdContainerName;
+                CredentialHelper.CopyTestData(srcVhdContainer, srcVhdName, dstOSVhdContainer);
+                string osVhdLink = string.Format("{0}{1}/{2}", blobUrlRoot, dstOSVhdContainer, srcVhdName);
+
+                var dstDataVhdContainer = containerPrefix.ToLower() + "data" + vhdContainerName;
+                CredentialHelper.CopyTestData(srcVhdContainer, srcVhdName, dstDataVhdContainer);
+                string dataVhdLink = string.Format("{0}{1}/{2}", blobUrlRoot, dstDataVhdContainer, srcVhdName);
+
+                // VM Image OS/Data Disk Configuration
+                var addVMImageName = containerPrefix + "Image";
+                var diskConfig = new VirtualMachineImageDiskConfigSet
+                {
+                    OSDiskConfiguration = new OSDiskConfiguration
+                    {
+                        HostCaching = HostCaching.ReadWrite.ToString(),
+                        OS = OSType.Windows.ToString(),
+                        OSState = "Generalized",
+                        MediaLink = new Uri(osVhdLink)
+                    },
+                    DataDiskConfigurations = new DataDiskConfigurationList
+                    {
+                        new DataDiskConfiguration
+                        {
+                            HostCaching = HostCaching.ReadOnly.ToString(),
+                            Lun = 0,
+                            MediaLink = new Uri(dataVhdLink)
+                        }
+                    }
+                };
+
+                // Add-AzureVMImage
+                vmPowershellCmdlets.AddAzureVMImage(addVMImageName, addVMImageName, diskConfig);
+
+                // Get-AzureVMImage
+                var vmImage = vmPowershellCmdlets.GetAzureVMImageReturningVMImages(addVMImageName).First();
+
+                // Remove-AzureVMImage
+                vmPowershellCmdlets.RemoveAzureVMImage(addVMImageName);
+
                 pass = true;
             }
             catch (Exception e)

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/AddAzureVMImageCmdletInfo.cs

@@ -15,6 +15,7 @@
 using System;
 using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.ConfigDataInfo;
 using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PowershellCore;
+using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
 
 namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo
 {
@@ -96,5 +97,19 @@ public AddAzureVMImageCmdletInfo(
                 cmdletParams.Add(new CmdletParam("PublishedDate", publishedDate.ToString()));
             }
         }
+
+        public AddAzureVMImageCmdletInfo(string imageName, string label, VirtualMachineImageDiskConfigSet diskConfig)
+        {
+            cmdletName = Utilities.AddAzureVMImageCmdletName;
+
+            cmdletParams.Add(new CmdletParam("ImageName", imageName));
+
+            cmdletParams.Add(new CmdletParam("Label", label));
+
+            if (diskConfig != null)
+            {
+                cmdletParams.Add(new CmdletParam("DiskConfig", diskConfig));
+            }
+        }
     }
 }

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs

@@ -1370,6 +1370,11 @@ public SM.OSImageContext AddAzureVMImage(string imageName, string mediaLocation,
             return result;
         }
 
+        public void AddAzureVMImage(string imageName, string label, SM.VirtualMachineImageDiskConfigSet diskConfig)
+        {
+            RunPSCmdletAndReturnFirst<ManagementOperationContext>(new AddAzureVMImageCmdletInfo(imageName, label, diskConfig));
+        }
+
         public SM.OSImageContext UpdateAzureVMImage(string imageName, string label, string recommendedSize = null)
         {
             return RunPSCmdletAndReturnFirst<SM.OSImageContext>(new UpdateAzureVMImageCmdletInfo(imageName, label, recommendedSize, null, null));