update test

Author: huangpf

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

@@ -155,6 +155,7 @@ public void AzureVMImageTest()
 
             try
             {
+                // BVT Tests for OS Images
                 OSImageContext result = vmPowershellCmdlets.AddAzureVMImage(newImageName, mediaLocation, OS.Windows, oldLabel, vmSize, iconUri, smallIconUri, showInGui);
 
                 OSImageContext resultReturned = vmPowershellCmdlets.GetAzureVMImage(newImageName)[0];
@@ -174,6 +175,7 @@ public void AzureVMImageTest()
                 vmPowershellCmdlets.RemoveAzureVMImage(newImageName, false);
                 Assert.IsTrue(Utilities.CheckRemove(vmPowershellCmdlets.GetAzureVMImage, newImageName));
 
+                // BVT Tests for VM Images
                 // Unique Container Prefix
                 var containerPrefix = Utilities.GetUniqueShortName("vmimg");
 
@@ -211,11 +213,56 @@ public void AzureVMImageTest()
                 };
 
                 // Add-AzureVMImage
-                vmPowershellCmdlets.AddAzureVMImage(addVMImageName, addVMImageName, diskConfig);
+                string label = addVMImageName;
+                string description = "test";
+                string eula = "http://www.bing.com/";
+                string imageFamily = "Windows";
+                DateTime? publishedDate = new DateTime(2015, 1, 1);
+                string privacyUri = "http://www.bing.com/";
+                string recommendedVMSize = vmSize;
+                string iconName = "iconName";
+                string smallIconName = "smallIconName";
+
+                vmPowershellCmdlets.AddAzureVMImage(
+                    addVMImageName,
+                    label,
+                    diskConfig,
+                    description,
+                    eula,
+                    imageFamily,
+                    publishedDate,
+                    privacyUri,
+                    recommendedVMSize,
+                    iconName,
+                    smallIconName,
+                    showInGui);
 
                 // Get-AzureVMImage
                 var vmImage = vmPowershellCmdlets.GetAzureVMImageReturningVMImages(addVMImageName).First();
 
+                Assert.IsTrue(vmImage.ImageName == addVMImageName);
+                Assert.IsTrue(vmImage.Label == label);
+                Assert.IsTrue(vmImage.Description == description);
+                Assert.IsTrue(vmImage.Eula == eula);
+                Assert.IsTrue(vmImage.ImageFamily == imageFamily);
+                Assert.IsTrue(vmImage.PublishedDate.Value.Year == publishedDate.Value.Year);
+                Assert.IsTrue(vmImage.PublishedDate.Value.Month == publishedDate.Value.Month);
+                Assert.IsTrue(vmImage.PublishedDate.Value.Day == publishedDate.Value.Day);
+                Assert.IsTrue(vmImage.PrivacyUri.AbsoluteUri.ToString() == privacyUri);
+                Assert.IsTrue(vmImage.RecommendedVMSize == recommendedVMSize);
+                Assert.IsTrue(vmImage.IconName == iconName);
+                Assert.IsTrue(vmImage.IconUri == iconName);
+                Assert.IsTrue(vmImage.SmallIconName == smallIconName);
+                Assert.IsTrue(vmImage.SmallIconUri == smallIconName);
+                Assert.IsTrue(vmImage.ShowInGui == showInGui);
+                Assert.IsTrue(vmImage.OSDiskConfiguration.HostCaching == diskConfig.OSDiskConfiguration.HostCaching);
+                Assert.IsTrue(vmImage.OSDiskConfiguration.OS == diskConfig.OSDiskConfiguration.OS);
+                Assert.IsTrue(vmImage.OSDiskConfiguration.OSState == diskConfig.OSDiskConfiguration.OSState);
+                Assert.IsTrue(vmImage.OSDiskConfiguration.MediaLink == diskConfig.OSDiskConfiguration.MediaLink);
+                Assert.IsTrue(vmImage.DataDiskConfigurations.First().HostCaching == diskConfig.DataDiskConfigurations.First().HostCaching);
+                Assert.IsTrue(vmImage.DataDiskConfigurations.First().Lun == diskConfig.DataDiskConfigurations.First().Lun);
+                Assert.IsTrue(vmImage.DataDiskConfigurations.First().MediaLink == diskConfig.DataDiskConfigurations.First().MediaLink);
+
                 // Remove-AzureVMImage
                 vmPowershellCmdlets.RemoveAzureVMImage(addVMImageName);
 

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

@@ -98,7 +98,19 @@ public AddAzureVMImageCmdletInfo(
             }
         }
 
-        public AddAzureVMImageCmdletInfo(string imageName, string label, VirtualMachineImageDiskConfigSet diskConfig)
+        public AddAzureVMImageCmdletInfo(
+            string imageName,
+            string label,
+            VirtualMachineImageDiskConfigSet diskConfig,
+            string description,
+            string eula,
+            string imageFamily,
+            DateTime? publishedDate,
+            string privacyUri,
+            string recommendedVMSize,
+            string iconName,
+            string smallIconName,
+            bool? showInGui)
         {
             cmdletName = Utilities.AddAzureVMImageCmdletName;
 
@@ -110,6 +122,51 @@ public AddAzureVMImageCmdletInfo(string imageName, string label, VirtualMachineI
             {
                 cmdletParams.Add(new CmdletParam("DiskConfig", diskConfig));
             }
+
+            if (!string.IsNullOrEmpty(description))
+            {
+                cmdletParams.Add(new CmdletParam("Description", description));
+            }
+
+            if (!string.IsNullOrEmpty(eula))
+            {
+                cmdletParams.Add(new CmdletParam("Eula", eula));
+            }
+
+            if (!string.IsNullOrEmpty(imageFamily))
+            {
+                cmdletParams.Add(new CmdletParam("ImageFamily", imageFamily));
+            }
+
+            if (publishedDate != null)
+            {
+                cmdletParams.Add(new CmdletParam("PublishedDate", publishedDate));
+            }
+
+            if (!string.IsNullOrEmpty(privacyUri))
+            {
+                cmdletParams.Add(new CmdletParam("PrivacyUri", privacyUri));
+            }
+
+            if (!string.IsNullOrEmpty(recommendedVMSize))
+            {
+                cmdletParams.Add(new CmdletParam("RecommendedVMSize", recommendedVMSize));
+            }
+
+            if (!string.IsNullOrEmpty(iconName))
+            {
+                cmdletParams.Add(new CmdletParam("IconName", iconName));
+            }
+
+            if (!string.IsNullOrEmpty(smallIconName))
+            {
+                cmdletParams.Add(new CmdletParam("SmallIconName", smallIconName));
+            }
+
+            if (showInGui != null)
+            {
+                cmdletParams.Add(new CmdletParam("ShowInGui", showInGui));
+            }
         }
     }
 }

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

@@ -1370,9 +1370,35 @@ 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 void AddAzureVMImage(
+            string imageName,
+            string label,
+            SM.VirtualMachineImageDiskConfigSet diskConfig,
+            string description = null,
+            string eula = null,
+            string imageFamily = null,
+            DateTime? publishedDate = null,
+            string privacyUri = null,
+            string recommendedVMSize = null,
+            string iconName = null,
+            string smallIconName = null,
+            bool? showInGui = null)
+        {
+            var cmdletInfo = new AddAzureVMImageCmdletInfo(
+                imageName,
+                label,
+                diskConfig,
+                description,
+                eula,
+                imageFamily,
+                publishedDate,
+                privacyUri,
+                recommendedVMSize,
+                iconName,
+                smallIconName,
+                showInGui);
+
+            RunPSCmdletAndReturnFirst<ManagementOperationContext>(cmdletInfo);
         }
 
         public SM.OSImageContext UpdateAzureVMImage(string imageName, string label, string recommendedSize = null)