Merge pull request #7210 from hytao/AddStandardMicrosoftSku

Adding Standard_Microsoft in Cdn Pricing sku

Author: cormacpayne

src/ResourceManager/Cdn/Commands.Cdn.Test/Commands.Cdn.Test.csproj

@@ -125,6 +125,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.ProfileTests\TestProfileGetResourceUsage.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.ProfileTests\TestSkuCreate.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.EndpointTests\TestEndpointResourceUsage.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/ProfileTests.cs

@@ -35,6 +35,13 @@ public void TestProfileCrud()
             TestController.NewInstance.RunPowerShellTest(_logger, "Test-ProfileCrud");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSkuCreate()
+        {
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-SkuCreate");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestProfileCrudWithPiping()

src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/ProfileTests.ps1

@@ -12,6 +12,49 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
+<#
+.SYNOPSIS
+Create Profile with different Sku
+#>
+function Test-SkuCreate
+{
+    $profileName = getAssetName
+    $resourceGroup = TestSetup-CreateResourceGroup
+    $profileLocation = "EastUS"
+    $profileSku = "Standard_Microsoft"
+    $createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $profileLocation -Sku $profileSku
+
+    Assert-NotNull $createdProfile
+    Assert-AreEqual $profileName $createdProfile.Name
+    Assert-AreEqual $resourceGroup.ResourceGroupName $createdProfile.ResourceGroupName
+    Assert-AreEqual $profileSku $createdProfile.Sku.Name
+
+	$profileSku = "Standard_Verizon"
+    $profileName = getAssetName
+    $createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $profileLocation -Sku $profileSku 
+    Assert-NotNull $createdProfile
+    Assert-AreEqual $profileName $createdProfile.Name
+    Assert-AreEqual $resourceGroup.ResourceGroupName $createdProfile.ResourceGroupName
+    Assert-AreEqual $profileSku $createdProfile.Sku.Name
+
+	$profileSku = "Premium_Verizon"
+    $profileName = getAssetName
+    $createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $profileLocation -Sku $profileSku 
+    Assert-NotNull $createdProfile
+    Assert-AreEqual $profileName $createdProfile.Name
+    Assert-AreEqual $resourceGroup.ResourceGroupName $createdProfile.ResourceGroupName
+    Assert-AreEqual $profileSku $createdProfile.Sku.Name
+	
+	$profileSku = "Standard_Akamai"
+    $profileName = getAssetName
+    $createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $profileLocation -Sku $profileSku 
+    Assert-NotNull $createdProfile
+    Assert-AreEqual $profileName $createdProfile.Name
+    Assert-AreEqual $resourceGroup.ResourceGroupName $createdProfile.ResourceGroupName
+    Assert-AreEqual $profileSku $createdProfile.Sku.Name
+
+    Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
+}
 <#
 .SYNOPSIS
 Full Profile CRUD cycle

src/ResourceManager/Cdn/Commands.Cdn.Test/SessionRecords/Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.ProfileTests/TestSkuCreate.json

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Added Standard_Microsoft in Cdn pricing sku. 
 
 ## Version 5.0.5
 * Fixed issue with default resource groups not being set.

src/ResourceManager/Cdn/Commands.Cdn/ChangeLog.md

@@ -20,6 +20,7 @@ public enum PSSkuName
         Premium_Verizon,
         Custom_Verizon,
         Standard_Akamai,
-        Standard_ChinaCdn
+        Standard_ChinaCdn,
+        Standard_Microsoft
     }
 }

src/ResourceManager/Cdn/Commands.Cdn/Models/Profile/PSSkuName.cs

@@ -52,7 +52,7 @@ public class NewAzureRmCdnProfile : AzureCdnCmdletBase
         /// <summary>
         /// The pricing sku name of the profile.
         /// </summary>
-        [Parameter(Mandatory = true, HelpMessage = "The pricing sku name of the Azure CDN profile. Valid values are StandardVerizon, StandardAkamai, and PremiumVerizon.")]
+        [Parameter(Mandatory = true, HelpMessage = "The pricing sku name of the Azure CDN profile. Valid values are StandardVerizon, StandardAkamai, Standard_Microsoft and PremiumVerizon.")]
         public PSSkuName Sku { get; set; }
 
         /// <summary>