Merge pull request #98 from KirtiWandhare/patch-9

Avoid unicode chars and remove trailing / from uri and add CreateGalleryItem param

Author: MatthewMcGlynn

ComputeAdmin/AzureStack.ComputeAdmin.psm1

@@ -150,6 +150,7 @@ Function Add-VMImage{
         }
     }
 
+    $ArmEndpoint = $ArmEndpoint.TrimEnd("/")
     $uri = $armEndpoint + '/subscriptions/' + $subscription + '/providers/Microsoft.Compute.Admin/locations/' + $location + '/artifactTypes/platformImage/publishers/' + $publisher
     $uri = $uri + '/offers/' + $offer + '/skus/' + $sku + '/versions/' + $version + '?api-version=2015-12-01-preview'
 
@@ -320,6 +321,7 @@ Function Remove-VMImage{
         Write-Error -Message ('VM Image with publisher "{0}", offer "{1}", sku "{2}" is not present.' -f $publisher,$offer,$sku) -ErrorAction Stop
     }
 
+    $ArmEndpoint = $ArmEndpoint.TrimEnd("/")
     $uri = $armEndpoint + '/subscriptions/' + $subscription + '/providers/Microsoft.Compute.Admin/locations/' + $location + '/artifactTypes/platformImage/publishers/' + $publisher
     $uri = $uri + '/offers/' + $offer + '/skus/' + $sku + '/versions/' + $version + '?api-version=2015-12-01-preview'
 
@@ -371,6 +373,9 @@ function New-Server2016VMImage {
 
         [ValidateNotNullorEmpty()]
         [String] $TenantId,
+        
+        [Parameter()]
+        [bool] $CreateGalleryItem = $true,
 
         [switch] $Net35
     )
@@ -531,8 +536,15 @@ function New-Server2016VMImage {
             try {
                 Write-Verbose -Message "Creating Server Core Image"
                 CreateWindowsVHD @ConvertParams -VHDPath $ImagePath -Edition $CoreEdition -ErrorAction Stop -Verbose
-                $description = "This evaluation image should not be used for production workloads."
-                Add-VMImage -sku "2016-Datacenter-Core" -osDiskLocalPath $ImagePath @PublishArguments -title "Windows Server 2016 Datacenter Core Eval" -description $description
+                if ($CreateGalleryItem)
+                {
+                    $description = "This evaluation image should not be used for production workloads."
+                    Add-VMImage -sku "2016-Datacenter-Core" -osDiskLocalPath $ImagePath @PublishArguments -title "Windows Server 2016 Datacenter Core Eval" -description $description -CreateGalleryItem $CreateGalleryItem
+                }
+                else
+                {
+                    Add-VMImage -sku "2016-Datacenter-Core" -osDiskLocalPath $ImagePath @PublishArguments -CreateGalleryItem $CreateGalleryItem
+                }
             } catch {
                 Write-Error -ErrorRecord $_ -ErrorAction Stop
             }
@@ -542,8 +554,15 @@ function New-Server2016VMImage {
             Write-Verbose -Message "Creating Server Full Image" -Verbose
             try {
                 CreateWindowsVHD @ConvertParams -VHDPath $ImagePath -Edition $FullEdition -ErrorAction Stop -Verbose
-                $description = "This evaluation image should not be used for production workloads."
-                Add-VMImage -sku "2016-Datacenter" -osDiskLocalPath $ImagePath @PublishArguments -title "Windows Server 2016 Datacenter Eval" -description $description
+                if ($CreateGalleryItem)
+                {
+                    $description = "This evaluation image should not be used for production workloads."
+                    Add-VMImage -sku "2016-Datacenter" -osDiskLocalPath $ImagePath @PublishArguments -title "Windows Server 2016 Datacenter Eval" -description $description -CreateGalleryItem $CreateGalleryItem
+                }
+                else
+                {
+                    Add-VMImage -sku "2016-Datacenter" -osDiskLocalPath $ImagePath @PublishArguments -CreateGalleryItem $CreateGalleryItem
+                }
             } catch {
                 Write-Error -ErrorRecord $_ -ErrorAction Stop
             }