cherry pick Azure#7

Author: dexiang-ms

src/Network/Network.Test/ScenarioTests/CustomIpPrefixTests.ps1

@@ -15,38 +15,57 @@
 <#
 .SYNOPSIS
 Tests CRUD operations on a simple customIpPrefix.
+
+NOTE: This feature is currently in private preview, so updated binaries are on test slice in canary only and is currently un-reacheable via the production manifest.
+Testing has been done locally using the brazilus ARM endpoint and a specific subscription that has the necessary flags to run these cmdlets. 
 #>
 function Test-CustomIpPrefixCRUD
 {
     # Setup
     $rgname = "powershell-test-rg"
-    $rname = "testCip"
-
-    # currently in private preview, updated binaries are on test slice in canary only
+    $rname = "testCustomIpPrefix"
     $location = "eastus2euap"
+    $cidr = "40.40.40.0/24"
 
     try
     {
         # Create the resource group
-        $resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" }
-
-        # Create the masterCustomIpPrefix
-        $job = New-AzMasterCustomIpPrefix -Name $rname -ResourceGroupName $rgname -Cidr "40.40.40.0/22" -ValidationMessage "123" -SignedValidationMessage "456" -Location $location -AsJob
-        $job | Wait-Job
-        $mcip = $job | Receive-Job
+        $resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation
 
         # Create customIpPrefix
-        $job = New-AzCustomIpPrefix -Name $rname -ResourceGroupName $rgname -location $location -Cidr "40.40.40.0/24" -MasterCustomIpPrefix $mcip -AsJob
+        $job = New-AzCustomIpPrefix -Name $rname -ResourceGroupName $rgname -location $location -Cidr $cidr -AsJob
         $job | Wait-Job
-        $actual = $job | Receive-Job
-        $expected = Get-AzCustomIpPrefix -ResourceGroupName $rgname -name $rname
-        Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
-        Assert-AreEqual $expected.Name $actual.Name
-        Assert-AreEqual $expected.Location $actual.Location
-        Assert-AreEqual $expected.Cidr $actual.Cidr
-        Assert-AreEqual 0 $expected.PublicIpPrefixes.Count
-        Assert-NotNull $expected.ResourceGuid
-        Assert-AreEqual "Succeeded" $expected.ProvisioningState
+        $job | Receive-Job
+
+        # get by name and resource group
+        $actual = Get-AzCustomIpPrefix -ResourceGroupName $rgname -name $rname
+        Assert-AreEqual $actual.ResourceGroupName $rgname
+        Assert-AreEqual $actual.Name $rname
+        Assert-AreEqual $actual.Location $location
+        Assert-AreEqual $actual.Cidr $cidr
+        Assert-AreEqual $actual.PublicIpPrefixes.Count 0
+        Assert-NotNull  $actual.ResourceGuid
+        Assert-AreEqual $actual.ProvisioningState "Succeeded"
+
+        # get by resource id
+        $actual = Get-AzCustomIpPrefix -ResourceId $actual.Id
+        Assert-AreEqual $actual.ResourceGroupName $rgname
+        Assert-AreEqual $actual.Name $rname
+        Assert-AreEqual $actual.Location $location
+        Assert-AreEqual $actual.Cidr $cidr
+        Assert-AreEqual $actual.PublicIpPrefixes.Count 0
+        Assert-NotNull  $actual.ResourceGuid
+        Assert-AreEqual $actual.ProvisioningState "Succeeded"
+
+        # get by input object
+        $actual = Get-AzCustomIpPrefix -InputObject $actual
+        Assert-AreEqual $actual.ResourceGroupName $rgname
+        Assert-AreEqual $actual.Name $rname
+        Assert-AreEqual $actual.Location $location
+        Assert-AreEqual $actual.Cidr $cidr
+        Assert-AreEqual $actual.PublicIpPrefixes.Count 0
+        Assert-NotNull  $actual.ResourceGuid
+        Assert-AreEqual $actual.ProvisioningState "Succeeded"
 
         # list
         $list = Get-AzCustomIpPrefix -ResourceGroupName $rgname
@@ -56,35 +75,36 @@ function Test-CustomIpPrefixCRUD
         Assert-AreEqual $list[0].Location $actual.Location
         Assert-AreEqual $list[0].Cidr $actual.Cidr
         Assert-AreEqual $list[0].PublicIpPrefixes.Count 0
-        Assert-AreEqual "Succeeded" $list[0].ProvisioningState
-
-        $list = Get-AzCustomIpPrefix -ResourceId $actual.Id
-        Assert-AreEqual 1 @($list).Count
-        Assert-AreEqual $list[0].ResourceGroupName $actual.ResourceGroupName
-        Assert-AreEqual $list[0].Name $actual.Name
-        Assert-AreEqual $list[0].Location $actual.Location
-        Assert-AreEqual $list[0].Cidr $actual.Cidr
-        Assert-AreEqual $list[0].PublicIpPrefixes.Count 0
-        Assert-AreEqual "Succeeded" $list[0].ProvisioningState
+        Assert-AreEqual $list[0].ProvisioningState "Succeeded"
 
         # delete
         $job = Remove-AzCustomIpPrefix -InputObject $actual -PassThru -Force -AsJob
         $job | Wait-Job
         $delete = $job | Receive-Job
         Assert-AreEqual true $delete
 
-        $list = Get-AzPublicIpPrefix -ResourceGroupName $actual.ResourceGroupName
+        $list = Get-AzPublicIpPrefix -ResourceGroupName $rgname
         Assert-AreEqual 0 @($list).Count
 
         # Try setting unexisting
-        Assert-ThrowsLike { Set-AzPublicIpPrefix -PublicIpPrefix $expected } "*not found*"
+        Assert-ThrowsLike { Update-AzPublicIpPrefix -PublicIpPrefix $expected } "*not found*"
+
+        # Create one more time to test deletion with resource id parameter set
+        $job = New-AzCustomIpPrefix -Name $rname -ResourceGroupName $rgname -location $location -Cidr $cidr -AsJob
+        $job | Wait-Job
+        $expected = $job | Receive-Job
+
+        $job = Remove-AzPublicIpPrefix -ResourceId $expected.Id -PassThru -Force -AsJob
+        $job | Wait-Job
+        $delete = $job | Receive-Job
+        Assert-AreEqual true $delete
 
-        # Create one more time to test deletion with another parameter set
-        $job = New-AzPublicIpPrefix -ResourceGroupName $rgname -name $rname -location $location -Sku Standard -PrefixLength 30 -AsJob
+        # Create one more time to test deletion with resource group and name
+        $job = New-AzCustomIpPrefix -Name $rname -ResourceGroupName $rgname -location $location -Cidr $cidr -AsJob
         $job | Wait-Job
-        $actual = $job | Receive-Job
+        $expected = $job | Receive-Job
 
-        $job = Remove-AzPublicIpPrefix -ResourceId $actual.Id -PassThru -Force -AsJob
+        $job = Remove-AzPublicIpPrefix -Name $rname -ResourceGroupName $rgname
         $job | Wait-Job
         $delete = $job | Receive-Job
         Assert-AreEqual true $delete

src/Network/Network/Az.Network.psd1

@@ -501,7 +501,7 @@ CmdletsToExport = 'Add-AzApplicationGatewayAuthenticationCertificate',
                'New-AzOffice365PolicyProperty',
                'Get-AzNetworkVirtualApplianceSku',
                'New-AzVirtualApplianceSkuProperty'
-			   'New-AzCustomIpPrefix','Set-AzCustomIpPrefix',
+			   'New-AzCustomIpPrefix','Update-AzCustomIpPrefix',
 			   'Get-AzCustomIpPrefix','Remove-AzCustomIpPrefix'
 
 # Variables to export from this module

…pPrefix/SetAzureCustomIpPrefixCommand.cs …efix/UpdateAzureCustomIpPrefixCommand.cssrc/Network/Network/BYOIP/CustomIpPrefix/SetAzureCustomIpPrefixCommand.cs renamed to src/Network/Network/BYOIP/CustomIpPrefix/UpdateAzureCustomIpPrefixCommand.cs src/Network/Network/BYOIP/CustomIpPrefix/SetAzureCustomIpPrefixCommand.cs renamed to src/Network/Network/BYOIP/CustomIpPrefix/UpdateAzureCustomIpPrefixCommand.cs

@@ -25,8 +25,8 @@ namespace Microsoft.Azure.Commands.Network
     using System.Management.Automation;
     using MNM = Microsoft.Azure.Management.Network.Models;
 
-    [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "CustomIpPrefix", SupportsShouldProcess = true), OutputType(typeof(PSCustomIpPrefix))]
-    public class SetAzureCustomIpPrefixCommand : CustomIpPrefixBaseCmdlet
+    [Cmdlet(VerbsData.Update, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "CustomIpPrefix", SupportsShouldProcess = true), OutputType(typeof(PSCustomIpPrefix))]
+    public class UpdateAzureCustomIpPrefixCommand : CustomIpPrefixBaseCmdlet
     {
         private const string SetByNameParameterSet = "SetByNameParameterSet";
         private const string SetByInputObjectParameterSet = "SetByInputObjectParameterSet";
@@ -131,7 +131,7 @@ public override void Execute()
                 sdkModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);
             }
 
-            if (this.ShouldProcess($"Name: {this.Name} ResourceGroup: {this.ResourceGroupName}", "Set existing MasterCustomIpPrefix"))
+            if (this.ShouldProcess($"Name: {this.Name} ResourceGroup: {this.ResourceGroupName}", "Update existing MasterCustomIpPrefix"))
             {
                 // Execute the PUT MasterCustomIpPrefix Policy call
                 this.CustomIpPrefixClient.CreateOrUpdate(this.ResourceGroupName, this.Name, sdkModel);