IconName & SmallIconName

Author: huangpf

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

@@ -558,7 +558,7 @@ public void UpdateVMImageDataDiskAndOsDiskTest()
                 UpdateAzureVMImageDetails(vmImageName);
 
                 string disk1Name,disk2Name;
-                UpdateVMImageOsAndDataDiskAnderifyChanges(  diskConfig,out disk1Name,out disk2Name);
+                UpdateVMImageOsAndDataDiskAnderifyChanges(diskConfig, out disk1Name, out disk2Name);
 
                 //Update VMImage using DiskConfig set prepared manually.
                 UpdateVmImageUsingDiskConfigSetAndVerifyChanges(diskConfig, disk1Name, disk2Name);
@@ -709,7 +709,7 @@ private void UpdateAzureVMImageDetails(string imageName)
             Utilities.ExecuteAndLog(() =>
                 {
                     vmPowershellCmdlets.UpdateAzureVMImage(imageName, imageName, imageContext.ImageFamily, imageContext.ShowInGui.Value, imageContext.RecommendedVMSize, imageContext.Description, imageContext.Eula,
-                         imageContext.PrivacyUri, imageContext.PublishedDate, imageContext.Language, imageContext.IconUri, imageContext.SmallIconUri);
+                         imageContext.PrivacyUri, imageContext.PublishedDate, imageContext.Language, imageContext.IconName, imageContext.SmallIconName);
                 }, "Update Azure VM Image details");
 
             VerifyVMImageProperties(imageContext);
@@ -728,6 +728,7 @@ private void VerifyVMImageProperties(VMImageContext imageContext)
                     Utilities.LogAssert(() => Assert.AreEqual(imageContext.Eula, vmImageContext.Eula), "Eula");
                     Utilities.LogAssert(() => Assert.AreEqual(imageContext.Description, vmImageContext.Description), "Description");
                     Utilities.LogAssert(() => Assert.AreEqual(imageContext.IconUri, vmImageContext.IconUri), "IconUri");
+                    Utilities.LogAssert(() => Assert.AreEqual(imageContext.IconName, vmImageContext.IconName), "IconName");
                     Utilities.LogAssert(() => Assert.AreEqual(imageContext.ImageFamily, vmImageContext.ImageFamily), "ImageFamily");
                     Utilities.LogAssert(() => Assert.AreEqual(imageContext.ImageName, vmImageContext.ImageName), "ImageName");
                     Utilities.LogAssert(() => Assert.AreEqual(imageContext.Label, vmImageContext.Label), "Label");
@@ -737,6 +738,7 @@ private void VerifyVMImageProperties(VMImageContext imageContext)
                     Utilities.LogAssert(() => Assert.AreEqual(imageContext.RecommendedVMSize, vmImageContext.RecommendedVMSize), "RecommendedVMSize");
                     Utilities.LogAssert(() => Assert.AreEqual(imageContext.ShowInGui, vmImageContext.ShowInGui), "ShowInGui");
                     Utilities.LogAssert(() => Assert.AreEqual(imageContext.SmallIconUri, vmImageContext.SmallIconUri), "SmallIconUri");
+                    Utilities.LogAssert(() => Assert.AreEqual(imageContext.SmallIconName, vmImageContext.SmallIconName), "SmallIconName");
                 }, "Verify VM image details");
         }
 

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/DiskRepository/AddAzureVMImage.cs

@@ -75,11 +75,13 @@ public class AddAzureVMImage : ServiceManagementBaseCmdlet
         [Parameter(Position = 9, ValueFromPipelineByPropertyName = true, HelpMessage = " Specifies the size to use for the virtual machine that is created from the OS image.")]
         public string RecommendedVMSize { get; set; }
 
+        [Alias("IconUri")]
         [Parameter(Position = 10, ValueFromPipelineByPropertyName = true, HelpMessage = "Icon Uri.")]
-        public string IconUri { get; set; }
+        public string IconName { get; set; }
 
+        [Alias("SmallIconUri")]
         [Parameter(Position = 11, ValueFromPipelineByPropertyName = true, HelpMessage = "Small Icon Uri.")]
-        public string SmallIconUri { get; set; }
+        public string SmallIconName { get; set; }
 
         [Parameter(Position = 12, ValueFromPipelineByPropertyName = true, HelpMessage = "To show in GUI.")]
         public SwitchParameter ShowInGui { get; set; }
@@ -116,8 +118,8 @@ protected override void OnProcessRecord()
                     PublishedDate = this.PublishedDate,
                     PrivacyUri = this.PrivacyUri,
                     RecommendedVMSize = this.RecommendedVMSize,
-                    IconUri = this.IconUri,
-                    SmallIconUri = this.SmallIconUri,
+                    IconUri = this.IconName,
+                    SmallIconUri = this.SmallIconName,
                     ShowInGui = this.ShowInGui
                 };
 
@@ -140,8 +142,8 @@ protected override void OnProcessRecord()
                     PublishedDate = this.PublishedDate,
                     PrivacyUri = this.PrivacyUri,
                     RecommendedVMSize = this.RecommendedVMSize,
-                    IconUri = this.IconUri,
-                    SmallIconUri = this.SmallIconUri,
+                    IconUri = this.IconName,
+                    SmallIconUri = this.SmallIconName,
                     ShowInGui = this.ShowInGui
                 };
 

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/DiskRepository/UpdateAzureVMImage.cs

@@ -70,13 +70,15 @@ public class UpdateAzureVMImage : ServiceManagementBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string Language { get; set; }
 
+        [Alias("IconUri")]
         [Parameter(Position = 10, ValueFromPipelineByPropertyName = true, HelpMessage = "IconUri.")]
         [ValidateNotNullOrEmpty]
-        public string IconUri { get; set; }
+        public string IconName { get; set; }
 
+        [Alias("SmallIconUri")]
         [Parameter(Position = 11, ValueFromPipelineByPropertyName = true, HelpMessage = "SmallIconUri.")]
         [ValidateNotNullOrEmpty]
-        public string SmallIconUri { get; set; }
+        public string SmallIconName { get; set; }
 
         [Parameter(Position = 12, ValueFromPipelineByPropertyName = true, HelpMessage = "DontShowInGui.")]
         public SwitchParameter DontShowInGui { get; set; }
@@ -106,8 +108,8 @@ protected override void OnProcessRecord()
                     PrivacyUri        = this.PrivacyUri,
                     RecommendedVMSize = this.RecommendedVMSize,
                     Language          = this.Language,
-                    IconUri           = this.IconUri,
-                    SmallIconUri      = this.SmallIconUri,
+                    IconUri           = this.IconName,
+                    SmallIconUri      = this.SmallIconName,
                     ShowInGui         = this.DontShowInGui.IsPresent ? (bool?)false : null
                 };
 
@@ -139,8 +141,8 @@ protected override void OnProcessRecord()
                         Name              = d.Name
                     }).ToList(),
                     Language               = this.Language,
-                    IconUri                = this.IconUri,
-                    SmallIconUri           = this.SmallIconUri,
+                    IconUri                = this.IconName,
+                    SmallIconUri           = this.SmallIconName,
                     ShowInGui              = this.DontShowInGui.IsPresent ? (bool?)false : null
                 };
 

src/ServiceManagement/Compute/Commands.ServiceManagement/Model/OSImageContext.cs

@@ -39,5 +39,21 @@ public class OSImageContext : ManagementOperationContext
         public virtual string PublisherName { get; set; }
         public virtual string IOType { get; set; }
         public virtual bool? ShowInGui { get; set; }
+
+        public virtual string IconName
+        {
+            get
+            {
+                return IconUri;
+            }
+        }
+
+        public virtual string SmallIconName
+        {
+            get
+            {
+                return SmallIconUri;
+            }
+        }
     }
 }