Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/DnsResolver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ In this directory, run AutoRest:
> see https://aka.ms/autorest

``` yaml
branch: c02f047046403abdcf578e38780b612c11ef6b0c
branch: 37072829f795ce840b8085035e8adf4721602f34
require:
- $(this-folder)/../readme.azure.noprofile.md
input-file:
- $(repo)/specification/dnsresolver/resource-manager/Microsoft.Network/preview/2020-04-01-preview/dnsresolver.json
- $(repo)/specification/dnsresolver/resource-manager/Microsoft.Network/stable/2022-07-01/dnsresolver.json

module-version: 0.1.6
module-version: 0.2.1
title: DnsResolver
subject-prefix: $(service-name)
subject-prefix: DnsResolver

inlining-threshold: 50
# If there are post APIs for some kinds of actions in the RP, you may need to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ Create a in-memory object for IPConfiguration
Create a in-memory object for IPConfiguration

.Outputs
Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20200401Preview.IPConfiguration
Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701.IPConfiguration
.Link
https://docs.microsoft.com/powershell/module/az.dnsresolver/new-azdnsresolveripconfigurationobject
#>
function New-AzDnsResolverIPConfigurationObject {
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20200401Preview.IPConfiguration')]
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701.IPConfiguration')]
[CmdletBinding(PositionalBinding=$false)]
Param(

Expand All @@ -41,7 +41,7 @@ function New-AzDnsResolverIPConfigurationObject {
)

process {
$Object = [Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20200401Preview.IPConfiguration]::New()
$Object = [Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701.IPConfiguration]::New()

$Object.PrivateIPAddress = $PrivateIPAddress
$Object.PrivateIPAllocationMethod = $PrivateIPAllocationMethod
Expand Down
6 changes: 3 additions & 3 deletions src/DnsResolver/custom/New-AzDnsResolverTargetDnsServer.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ Create a in-memory object for Target DNS server
Create a in-memory object for Target DNS server

.Outputs
Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20200401Preview.TargetDnsServer
Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701.TargetDnsServer
.Link
https://docs.microsoft.com/powershell/module/az.dnsresolver/new-azdnsresolvertargetdnsserverobject
#>
function New-AzDnsResolverTargetDnsServerObject {
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20200401Preview.TargetDnsServer')]
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701.TargetDnsServer')]
[CmdletBinding(PositionalBinding=$false)]
Param(

Expand All @@ -38,7 +38,7 @@ function New-AzDnsResolverTargetDnsServerObject {
)

process {
$Object = [Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20200401Preview.TargetDnsServer]::New()
$Object = [Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701.TargetDnsServer]::New()

$Object.IPAddress = $IPAddress
$Object.Port = $Port
Expand Down
3 changes: 2 additions & 1 deletion src/DnsResolver/test/Constants.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$NRP_SIMULATOR_URI = "https://eastus2.test.azuremresolver.net:9002"
$LOCATION = "eastus2"
$SUBSCRIPTION_ID = "0e5a46b1-de0b-4ec3-a5d7-dda908b4e076"
$RESOURCE_GROUP_NAME = "rg-dev-eastus2-sdk-powershell"
$RESOURCE_GROUP_NAME = "rg-dev-eastus2-sdk-powershell"
$SUBNET_NAME = "snet-sim2"
112 changes: 56 additions & 56 deletions src/DnsResolver/test/Get-AzDnsForwardingRuleset.Recording.json

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions src/DnsResolver/test/Get-AzDnsForwardingRuleset.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ function CreateDnsForwardingRuleset([String]$DnsForwardingRulesetName, [String]$
$subnet = CreateSubnet -SubscriptionId $SUBSCRIPTION_ID -ResourceGroupName $RESOURCE_GROUP_NAME -VirtualNetworkName $VirtualNetworkName;
}

New-AzDnsResolver -Name $DnsResolverName -ResourceGroupName $RESOURCE_GROUP_NAME -VirtualNetworkId $virtualNetwork.Id -Location $LOCATION
New-AzDnsResolver -Name $DnsResolverName -ResourceGroupName $RESOURCE_GROUP_NAME -VirtualNetworkId $virtualNetworkId -Location $LOCATION

$outboundEndpoint = New-AzDnsResolverOutboundEndpoint -Name $OutboundEndpointName -DnsResolverName $DnsResolverName -ResourceGroupName $RESOURCE_GROUP_NAME -SubnetId $subnet.Id -Location $LOCATION
$outboundEndpoint = New-AzDnsResolverOutboundEndpoint -Name $OutboundEndpointName -DnsResolverName $DnsResolverName -ResourceGroupName $RESOURCE_GROUP_NAME -SubnetId $subnetId -Location $LOCATION

New-AzDnsForwardingRuleset -Name $DnsForwardingRulesetName -ResourceGroupName $RESOURCE_GROUP_NAME -Location $LOCATION -DnsResolverOutboundEndpoint @{id = $outboundEndpoint.id;}
}
Expand All @@ -41,7 +41,8 @@ Describe 'Get-AzDnsForwardingRuleset' {
$dnsForwardingRulesetName = "psdnsforwardingrulesetname28"
$virtualNetworkName = "psvirtualnetworkname28";
$virtualNetworkId = "/subscriptions/$SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP_NAME/providers/Microsoft.Network/virtualNetworks/$virtualNetworkName"

$subnetId = $virtualNetworkId + "/subnets" + $SUBNET_NAME;

CreateDnsForwardingRuleset -DnsForwardingRulesetName $dnsForwardingRulesetName -OutboundEndpointName $outboundEndpointName -DnsResolverName $dnsResolverName -VirtualNetworkName $virtualNetworkName

# ACT
Expand All @@ -58,6 +59,7 @@ Describe 'Get-AzDnsForwardingRuleset' {
$dnsForwardingRulesetName = "psdnsforwardingrulesetname29"
$virtualNetworkName = "psvirtualnetworkname29";
$virtualNetworkId = "/subscriptions/$SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP_NAME/providers/Microsoft.Network/virtualNetworks/$virtualNetworkName"
$subnetId = $virtualNetworkId + "/subnets" + $SUBNET_NAME;

CreateDnsForwardingRuleset -DnsForwardingRulesetName $dnsForwardingRulesetName -OutboundEndpointName $outboundEndpointName -DnsResolverName $dnsResolverName -VirtualNetworkName $virtualNetworkName

Expand Down
Loading