Fix New-AzureVM with VM image issue

Author: unknown

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

@@ -285,19 +285,22 @@ public void ValidateAvailableExtesnion(VirtualMachineExtensionImageContext exten
             Assert.IsFalse(string.IsNullOrEmpty(extension.Publisher));
             Assert.IsFalse(string.IsNullOrEmpty(extension.Version));
 
-            switch (extension.ExtensionName)
+            if (! extension.IsJsonExtension)
             {
-                case "DiagnosticsAgent":
-                    {
-                        Assert.IsFalse(string.IsNullOrEmpty(extension.PublicConfigurationSchema));
-                        break;
-                    }
-                case "VMAccessAgent":
-                    {
-                        Assert.IsFalse(string.IsNullOrEmpty(extension.PublicConfigurationSchema));
-                        Assert.IsFalse(string.IsNullOrEmpty(extension.PrivateConfigurationSchema));
-                        break;
-                    }
+                switch (extension.ExtensionName)
+                {
+                    case "DiagnosticsAgent":
+                        {
+                            Assert.IsFalse(string.IsNullOrEmpty(extension.PublicConfigurationSchema));
+                            break;
+                        }
+                    case "VMAccessAgent":
+                        {
+                            Assert.IsFalse(string.IsNullOrEmpty(extension.PublicConfigurationSchema));
+                            Assert.IsFalse(string.IsNullOrEmpty(extension.PrivateConfigurationSchema));
+                            break;
+                        }
+                }
             }
         }
 

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureVM.cs

@@ -434,9 +434,13 @@ private Management.Compute.Models.Role CreatePersistentVMRole(Tuple<Model.Persis
                 ResourceExtensionReferences = persistentVM.ProvisionGuestAgent != null && persistentVM.ProvisionGuestAgent.Value ? Mapper.Map<List<ResourceExtensionReference>>(persistentVM.ResourceExtensionReferences) : null,
                 VMImageName = isVMImage ? persistentVM.OSVirtualHardDisk.SourceImageName : null,
                 MediaLocation = isVMImage ? persistentVM.OSVirtualHardDisk.MediaLink : null,
-                VMImageInput = isVMImage ? PersistentVMHelper.MapVMImageInput(persistentVM.VMImageInput) : null
             };
 
+            if (persistentVM.VMImageInput != null)
+            {
+                result.VMImageInput = isVMImage ? PersistentVMHelper.MapVMImageInput(persistentVM.VMImageInput) : null;
+            }
+
             if (result.OSVirtualHardDisk != null)
             {
                 result.OSVirtualHardDisk.IOType = null;