Fix Set-AzurePlatformVMImage for OS Images

Author: huangpf

src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/ImagePublishing/SetAzurePlatformVMImage.cs

@@ -153,7 +153,23 @@ private void ProcessReplicateImageParameterSet()
                         ValidateTargetLocations();
                         return this.ComputeClient.VirtualMachineOSImages.Replicate(this.ImageName, new Management.Compute.Models.VirtualMachineOSImageReplicateParameters
                             {
-                                TargetLocations = this.ReplicaLocations == null ? null : this.ReplicaLocations.ToList()
+                                TargetLocations = this.ReplicaLocations == null ? null : this.ReplicaLocations.ToList(),
+                                ComputeImageAttributes = new ComputeImageAttributes
+                                {
+                                    Offer = this.ComputeImageConfig.Offer,
+                                    Sku = this.ComputeImageConfig.Sku,
+                                    Version = this.ComputeImageConfig.Version
+                                },
+                                MarketplaceImageAttributes = this.MarketplaceImageConfig == null ? null : new MarketplaceImageAttributes
+                                {
+                                    Plan = new Plan
+                                    {
+                                        Name = this.MarketplaceImageConfig.PlanName,
+                                        Product = this.MarketplaceImageConfig.Product,
+                                        Publisher = this.MarketplaceImageConfig.Publisher
+                                    },
+                                    PublisherId = this.MarketplaceImageConfig.PublisherId
+                                }
                             });
                     });
             }

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

@@ -1747,18 +1747,19 @@ public void AzurePlatformVMImageNegativeTest()
         {
             StartTest(MethodBase.GetCurrentMethod().Name, testStartTime);
 
-            var imgName = Utilities.GetUniqueShortName("img");
-
-            try
-            {
-                var scripts = new string[]
+            Func<string, string[]> getScripts = img => new string[]
                 {
                     "Import-Module '.\\" + Utilities.AzurePowershellModuleServiceManagementPirModule + "';",
                     "$c1 = New-AzurePlatformComputeImageConfig -Offer test -Sku test -Version test;",
                     "$c2 = New-AzurePlatformMarketplaceImageConfig -PlanName test -Product test -Publisher test -PublisherId test;",
-                    "Set-AzurePlatformVMImage -ImageName " + imgName + " -ReplicaLocations 'West US' -ComputeImageConfig $c1 -MarketplaceImageConfig $c2;"
+                    "Set-AzurePlatformVMImage -ImageName " + img + " -ReplicaLocations 'West US' -ComputeImageConfig $c1 -MarketplaceImageConfig $c2;"
                 };
 
+            var imgName = Utilities.GetUniqueShortName("img");
+
+            try
+            {
+                var scripts = getScripts(imgName);
                 vmPowershellCmdlets.RunPSScript(string.Join(System.Environment.NewLine, scripts), true);
             }
             catch (Exception e)
@@ -1775,6 +1776,54 @@ public void AzurePlatformVMImageNegativeTest()
                     Assert.Fail("Exception occurred: {0}", e.ToString());
                 }
             }
+
+            // OS Image
+            var osImages = vmPowershellCmdlets.GetAzureVMImage();
+            imgName = osImages.First().ImageName;
+
+            try
+            {
+                var scripts = getScripts(imgName);
+                vmPowershellCmdlets.RunPSScript(string.Join(System.Environment.NewLine, scripts), true);
+            }
+            catch (Exception e)
+            {
+                var expectedMsg = "ForbiddenError: This operation is not allowed for this subscription.";
+                if (e.InnerException != null && e.InnerException.Message != null && e.InnerException.Message.Contains(expectedMsg))
+                {
+                    pass = true;
+                    Console.WriteLine(e.InnerException.ToString());
+                }
+                else
+                {
+                    pass = false;
+                    Assert.Fail("Exception occurred: {0}", e.ToString());
+                }
+            }
+
+            // VM Image
+            var vmImages = vmPowershellCmdlets.GetAzureVMImageReturningVMImages();
+            imgName = vmImages.First().ImageName;
+
+            try
+            {
+                var scripts = getScripts(imgName);
+                vmPowershellCmdlets.RunPSScript(string.Join(System.Environment.NewLine, scripts), true);
+            }
+            catch (Exception e)
+            {
+                var expectedMsg = "ForbiddenError: This operation is not allowed for this subscription.";
+                if (e.InnerException != null && e.InnerException.Message != null && e.InnerException.Message.Contains(expectedMsg))
+                {
+                    pass = true;
+                    Console.WriteLine(e.InnerException.ToString());
+                }
+                else
+                {
+                    pass = false;
+                    Assert.Fail("Exception occurred: {0}", e.ToString());
+                }
+            }
         }
     }
 }