Skip to content

Commit 29122f5

Browse files
karravi-msftkarravi-msft
committed
addressing review comments
1 parent 299a5ab commit 29122f5

File tree

6 files changed

+26
-29
lines changed

6 files changed

+26
-29
lines changed

‎src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/DnsTestsBase.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,20 @@ public class DnsTestsBase : RMTestBase
3939
{
4040
private LegacyTest.CSMTestEnvironmentFactory csmTestFactory;
4141

42-
4342
private readonly EnvironmentSetupHelper helper;
44-
45-
43+
4644
public ResourceManagementClient ResourceManagementClient { get; private set; }
4745

4846
public SubscriptionClient SubscriptionClient { get; private set; }
4947

50-
5148
public GalleryClient GalleryClient { get; private set; }
5249

53-
5450
public AuthorizationManagementClient AuthorizationManagementClient { get; private set; }
5551

56-
5752
public DnsManagementClient DnsClient { get; private set; }
5853

5954
public NetworkManagementClient NetworkManagementClient { get; private set; }
6055

61-
6256
public static DnsTestsBase NewInstance
6357
{
6458
get
@@ -67,13 +61,11 @@ public static DnsTestsBase NewInstance
6761
}
6862
}
6963

70-
7164
protected DnsTestsBase()
7265
{
7366
this.helper = new EnvironmentSetupHelper();
7467
}
7568

76-
7769
protected void SetupManagementClients(MockContext context)
7870
{
7971
this.ResourceManagementClient = this.GetResourceManagementClient();
@@ -156,6 +148,7 @@ public void RunPsTestWorkflow(
156148
helper.RMProfileModule,
157149
helper.RMResourceModule,
158150
helper.GetRMModulePath("AzureRM.Dns.psd1"),
151+
helper.GetRMModulePath("AzureRM.Network.psd1"),
159152
"AzureRM.Resources.ps1");
160153

161154
try

‎src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/ZoneTests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function Test-ZoneCrudPrivateResolutionVnet
9090
$virtualNetwork = TestSetup-CreateVirtualNetwork $resourceGroup
9191
sleep 60
9292

93-
$createdZone = New-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Tags @{tag1="value1"} -ZoneType Private -ResolutionVirtualNetworkIds @($virtualNetwork.Id)
93+
$createdZone = New-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Tags @{tag1="value1"} -ZoneType Private -ResolutionVirtualNetworkId @($virtualNetwork.Id)
9494
Assert-NotNull $createdZone
9595
Assert-NotNull $createdZone.Etag
9696
Assert-AreEqual $zoneName $createdZone.Name
@@ -115,7 +115,7 @@ function Test-ZoneCrudPrivateResolutionVnet
115115
Assert-AreEqual $createdZone.ResolutionVirtualNetworkIds.Count $retrievedZone.ResolutionVirtualNetworkIds.Count
116116
Assert-AreEqual $createdZone.RegistrationVirtualNetworkIds.Count $retrievedZone.RegistrationVirtualNetworkIds.Count
117117

118-
$updatedZone = Set-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Tags @{tag1="value1";tag2="value2"} -ResolutionVirtualNetworkIds @()
118+
$updatedZone = Set-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Tags @{tag1="value1";tag2="value2"} -ResolutionVirtualNetworkId @()
119119
Assert-NotNull $updatedZone
120120
Assert-NotNull $updatedZone.Etag
121121
Assert-AreEqual $zoneName $updatedZone.Name
@@ -168,7 +168,7 @@ function Test-ZoneCrudPrivateRegistrationVnet
168168
$resourceGroup = TestSetup-CreateResourceGroup
169169
$virtualNetwork = TestSetup-CreateVirtualNetwork $resourceGroup
170170

171-
$createdZone = New-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Tags @{tag1="value1"} -ZoneType Private -RegistrationVirtualNetworkIds @($virtualNetwork.Id)
171+
$createdZone = New-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Tags @{tag1="value1"} -ZoneType Private -RegistrationVirtualNetworkId @($virtualNetwork.Id)
172172
Assert-NotNull $createdZone
173173
Assert-NotNull $createdZone.Etag
174174
Assert-AreEqual $zoneName $createdZone.Name
@@ -193,7 +193,7 @@ function Test-ZoneCrudPrivateRegistrationVnet
193193
Assert-AreEqual $createdZone.ResolutionVirtualNetworkIds.Count $retrievedZone.ResolutionVirtualNetworkIds.Count
194194
Assert-AreEqual $createdZone.RegistrationVirtualNetworkIds.Count $retrievedZone.RegistrationVirtualNetworkIds.Count
195195

196-
$updatedZone = Set-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Tags @{tag1="value1";tag2="value2"} -RegistrationVirtualNetworkIds @()
196+
$updatedZone = Set-AzureRmDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Tags @{tag1="value1";tag2="value2"} -RegistrationVirtualNetworkId @()
197197
Assert-NotNull $updatedZone
198198
Assert-NotNull $updatedZone.Etag
199199
Assert-AreEqual $zoneName $updatedZone.Name

‎src/ResourceManager/Dns/Commands.Dns/Zones/NewAzureDnsZone.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ public class NewAzureDnsZone : DnsBaseCmdlet
4343
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "A hash table which represents resource tags.")]
4444
public Hashtable Tag { get; set; }
4545

46-
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The list of virtual networks able to resolve records in this DNS zone, only available for private zones.", ParameterSetName = "Fields")]
46+
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The list of virtual networks able to resolve records in this DNS zone, only available for private zones.")]
4747
[ValidateNotNull]
48-
public List<string> ResolutionVirtualNetworkIds { get; set; }
48+
public List<string> ResolutionVirtualNetworkId { get; set; }
4949

50-
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The list of virtual networks that will register VM hostnames records in this DNS zone, only available for private zones.", ParameterSetName = "Fields")]
50+
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The list of virtual networks that will register VM hostnames records in this DNS zone, only available for private zones.")]
5151
[ValidateNotNull]
52-
public List<string> RegistrationVirtualNetworkIds { get; set; }
52+
public List<string> RegistrationVirtualNetworkId { get; set; }
5353

5454

5555
public override void ExecuteCmdlet()
@@ -72,8 +72,8 @@ public override void ExecuteCmdlet()
7272
this.ResourceGroupName,
7373
this.Tag,
7474
this.ZoneType != null ? this.ZoneType.Value : Management.Dns.Models.ZoneType.Public,
75-
this.RegistrationVirtualNetworkIds,
76-
this.ResolutionVirtualNetworkIds);
75+
this.RegistrationVirtualNetworkId,
76+
this.ResolutionVirtualNetworkId);
7777
this.WriteVerbose(ProjectResources.Success);
7878
this.WriteVerbose(string.Format(ProjectResources.Success_NewZone, this.Name, this.ResourceGroupName));
7979
this.WriteObject(result);

‎src/ResourceManager/Dns/Commands.Dns/Zones/SetAzureDnsZone.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ public class SetAzureDnsZone : DnsBaseCmdlet
4040

4141
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The list of virtual networks able to resolve records in this DNS zone, only available for private zones.", ParameterSetName = "Fields")]
4242
[ValidateNotNull]
43-
public List<string> ResolutionVirtualNetworkIds { get; set; }
43+
public List<string> ResolutionVirtualNetworkId { get; set; }
4444

4545
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The list of virtual networks that will register VM hostnames records in this DNS zone, only available for private zones.", ParameterSetName = "Fields")]
4646
[ValidateNotNull]
47-
public List<string> RegistrationVirtualNetworkIds { get; set; }
47+
public List<string> RegistrationVirtualNetworkId { get; set; }
4848

4949
[Parameter(Mandatory = true, ValueFromPipeline = true, HelpMessage = "The zone object to set.", ParameterSetName = "Object")]
5050
[ValidateNotNullOrEmpty]
@@ -72,14 +72,14 @@ public override void ExecuteCmdlet()
7272
zoneToUpdate.Etag = "*";
7373

7474
// Change mutable fields if value is passed
75-
if (this.RegistrationVirtualNetworkIds != null)
75+
if (this.RegistrationVirtualNetworkId != null)
7676
{
77-
zoneToUpdate.RegistrationVirtualNetworkIds = this.RegistrationVirtualNetworkIds;
77+
zoneToUpdate.RegistrationVirtualNetworkIds = this.RegistrationVirtualNetworkId;
7878
}
7979

80-
if (this.ResolutionVirtualNetworkIds != null)
80+
if (this.ResolutionVirtualNetworkId != null)
8181
{
82-
zoneToUpdate.ResolutionVirtualNetworkIds = this.ResolutionVirtualNetworkIds;
82+
zoneToUpdate.ResolutionVirtualNetworkIds = this.ResolutionVirtualNetworkId;
8383
}
8484

8585
zoneToUpdate.Tags = this.Tag;

‎src/ResourceManager/Dns/Commands.Dns/help/New-AzureRmDnsZone.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ Accept wildcard characters: False
5656
```
5757
5858
### -RegistrationVirtualNetworkIds
59-
The list of virtual networks that will register VM hostnames records in this DNS zone, only available for private zones.```yaml
59+
The list of virtual networks that will register VM hostnames records in this DNS zone, only available for private zones.
60+
```yaml
6061
Type: System.Collections.Generic.List`1[System.String]
6162
Parameter Sets: (All)
6263
Aliases:
@@ -69,7 +70,8 @@ Accept wildcard characters: False
6970
```
7071
7172
### -ResolutionVirtualNetworkIds
72-
The list of virtual networks able to resolve records in this DNS zone, only available for private zones.```yaml
73+
The list of virtual networks able to resolve records in this DNS zone, only available for private zones.
74+
```yaml
7375
Type: System.Collections.Generic.List`1[System.String]
7476
Parameter Sets: (All)
7577
Aliases:

‎src/ResourceManager/Dns/Commands.Dns/help/Set-AzureRmDnsZone.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ Accept wildcard characters: False
103103
```
104104
105105
### -RegistrationVirtualNetworkIds
106-
The list of virtual networks that will register VM hostnames records in this DNS zone, only available for private zones.```yaml
106+
The list of virtual networks that will register VM hostnames records in this DNS zone, only available for private zones.
107+
```yaml
107108
Type: System.Collections.Generic.List`1[System.String]
108109
Parameter Sets: Fields
109110
Aliases:
@@ -116,7 +117,8 @@ Accept wildcard characters: False
116117
```
117118
118119
### -ResolutionVirtualNetworkIds
119-
The list of virtual networks able to resolve records in this DNS zone, only available for private zones.```yaml
120+
The list of virtual networks able to resolve records in this DNS zone, only available for private zones.
121+
```yaml
120122
Type: System.Collections.Generic.List`1[System.String]
121123
Parameter Sets: Fields
122124
Aliases:

0 commit comments

Comments
 (0)