Merge pull request #7909 from solankisamir/remove-obsoletecmdlets

[ApiManagement] Deprecates obsolete cmdlets and update help

Author: markcowl

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.Netcore.csproj

@@ -29,7 +29,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
-    <PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.5-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.6-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.Netcore.csproj

@@ -25,7 +25,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.5-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.6-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.cs

@@ -87,20 +87,6 @@ public void TestBackupRestoreApiManagement()
             RunPowerShellTest("Test-BackupRestoreApiManagement");
         }
 
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestUpdateApiManagementDeployment()
-        {
-            RunPowerShellTest("Test-UpdateApiManagementDeployment");
-        }
-
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestSetApiManagementHostnames()
-        {
-            RunPowerShellTest("Test-SetApiManagementHostnames");
-        }
-
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestApiManagementHostnamesCrud()

src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.ps1

@@ -171,7 +171,7 @@ function Test-ApiManagementVirtualNetworkCRUD {
         New-AzureRmResourceGroup -Name $resourceGroupName -Location $primarylocation
 
         # Create a Virtual Network Object
-        $virtualNetwork = New-AzureRmApiManagementVirtualNetwork -Location $primarylocation -SubnetResourceId $primarySubnetResourceId
+        $virtualNetwork = New-AzureRmApiManagementVirtualNetwork -SubnetResourceId $primarySubnetResourceId
 
         # Create API Management service in External VNET
         $result = New-AzureRmApiManagement -ResourceGroupName $resourceGroupName -Location $primarylocation -Name $apiManagementName -Organization $organization -AdminEmail $adminEmail -VpnType $vpnType -VirtualNetwork $virtualNetwork -Sku $sku -Capacity $capacity
@@ -196,7 +196,7 @@ function Test-ApiManagementVirtualNetworkCRUD {
         $service.Sku = $sku
 
         # Create Virtual Network Object for Additional region
-        $additionalRegionVirtualNetwork = New-AzureRmApiManagementVirtualNetwork -Location $secondarylocation -SubnetResourceId $additionalSubnetResourceId
+        $additionalRegionVirtualNetwork = New-AzureRmApiManagementVirtualNetwork -SubnetResourceId $additionalSubnetResourceId
 
         $service = Add-AzureRmApiManagementRegion -ApiManagement $service -Location $secondarylocation -VirtualNetwork $additionalRegionVirtualNetwork
         # Update the Deployment into Internal Virtual Network
@@ -373,124 +373,6 @@ function Test-ApiManagementHostnamesCRUD {
     }
 }
 
-
-<#
-.SYNOPSIS
-Tests UpdateAzureApiManagementDeployment using pipeline and helper cmdlets.
-#>
-function Test-UpdateApiManagementDeployment {
-    # Setup
-    $location = Get-ProviderLocation "Microsoft.ApiManagement/service"
-    $resourceGroupName = Get-ResourceGroupName
-    $apiManagementName = Get-ApiManagementServiceName
-    $organization = "apimpowershellorg"
-    $adminEmail = "[email protected]"
-    $sku = "Developer"
-    $capacity = 1
-    
-    try {
-        # Create a resource group
-        New-AzureRmResourceGroup -Name $resourceGroupName -Location $location    
-
-        # Create API Management service
-        $service = New-AzureRmApiManagement -ResourceGroupName $resourceGroupName -Location $location -Name $apiManagementName -Organization $organization -AdminEmail $adminEmail -Sku $sku -Capacity $capacity
-
-        # Get API Management and:
-        #- 1) Scale master region to 'Premium' 2
-        $sku = "Premium"
-        $capacity = 2
-
-        # - 2) Add new 'Premium' region 1 unit
-        $region1Location = Get-ProviderLocations "Microsoft.ApiManagement/service" | Where {$_ -ne $location} | Select -First 1
-        $region1Sku = "Premium"
-
-        Get-AzureRmApiManagement -ResourceGroupName $resourceGroupName -Name $apiManagementName |
-            Update-AzureRmApiManagementRegion -Sku $sku -Capacity $capacity |
-            Add-AzureRmApiManagementRegion -Location $region1Location -Sku $region1Sku |
-            Update-AzureRmApiManagementDeployment
-
-        $service = Get-AzureRmApiManagement -ResourceGroupName $resourceGroupName -Name $apiManagementName
-
-        Assert-AreEqual $resourceGroupName $service.ResourceGroupName
-        Assert-AreEqual $apiManagementName $service.Name
-        Assert-AreEqual $location $service.Location
-        Assert-AreEqual $sku $service.Sku
-        Assert-AreEqual $capacity $service.Capacity
-        Assert-AreEqual "Succeeded" $service.ProvisioningState
-
-        Assert-AreEqual 1 $service.AdditionalRegions.Count
-
-        $found = 0
-        for ($i = 0; $i -lt $service.AdditionalRegions.Count; $i++) {
-            if ($service.AdditionalRegions[$i].Location -eq $region1Location) {
-                $found = $found + 1
-                Assert-AreEqual $region1Sku $service.AdditionalRegions[$i].Sku
-                Assert-AreEqual 1 $service.AdditionalRegions[$i].Capacity
-                Assert-Null $service.AdditionalRegions[$i].VirtualNetwork
-            }
-        }
-        
-        Assert-True {$found -eq 1} "Api Management regions created earlier is not found."
-    }
-    finally {
-        # Cleanup
-        Clean-ResourceGroup $resourceGroupName
-    }
-}
-
-<#
-.SYNOPSIS
-Tests SetApiManagementHostnames.
-#>
-function Test-SetApiManagementHostnames {
-    # Setup
-    $location = "North Central US"
-    $certFilePath = "$TestOutputRoot/powershelltest.pfx";
-    $certPassword = "Password";
-    $certSubject = "CN=*.msitesting.net"
-    $certThumbprint = "8E989652CABCF585ACBFCB9C2C91F1D174FDB3A2"
-    $portalHostName = "onesdk.msitesting.net"
-    $resourceGroupName = Get-ResourceGroupName
-    $apiManagementName = Get-ApiManagementServiceName
-    $organization = "apimpowershellorg"
-    $adminEmail = "[email protected]"
-    $sku = "Developer"
-    $capacity = 1
-    
-    try {
-        # Create resource group    
-        New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
-        
-        # Create API Management service
-        $result = New-AzureRmApiManagement -ResourceGroupName $resourceGroupName -Location $location -Name $apiManagementName -Organization $organization -AdminEmail $adminEmail -Sku $sku -Capacity $capacity
-
-        #Import the Custom Domain Certificate
-        $certUploadResult = Import-AzureRmApiManagementHostnameCertificate -ResourceGroupName $resourceGroupName -Name $apiManagementName -HostnameType "Portal" -PfxPath $certFilePath -PfxPassword $certPassword -PassThru
-
-        Assert-AreEqual $certSubject $certUploadResult.Subject
-        Assert-AreEqual $certThumbprint $certUploadResult.Thumbprint
-
-        # set portal hostname
-        $portalHostnameConf = New-AzureRmApiManagementHostnameConfiguration -CertificateThumbprint $certThumbprint -Hostname $portalHostName
-        $result = Set-AzureRmApiManagementHostnames -Name $apiManagementName -ResourceGroupName $resourceGroupName –PortalHostnameConfiguration $portalHostnameConf -PassThru
-
-        Assert-AreEqual $portalHostName $result.PortalHostnameConfiguration.Hostname
-        Assert-AreEqual $certSubject $result.PortalHostnameConfiguration.HostnameCertificate.Subject
-        Assert-Null $result.ProxyHostnameConfiguration
-
-        # set default hostnames
-        $result = Set-AzureRmApiManagementHostnames -Name $apiManagementName -ResourceGroupName $resourceGroupName
-
-        Assert-Null $result.ProxyHostnameConfiguration
-        Assert-Null $result.PortalHostnameConfiguration
-    }
-    finally {
-        # Cleanup
-        Clean-ResourceGroup $resourceGroupName   
-    }
-}
-
-
 <#
 .SYNOPSIS
 Tests API Management Create with 2 Additional Region