Skip to content

Commit 623bd77

Browse files
VeryEarlyVeryEarly
authored
Merge pull request Azure#10597 from leonardbf/master
Update for new API 2019-08-01 (#29)
2 parents dd10ff9 + cf5a3a5 commit 623bd77

File tree

22 files changed

+5096
-5135
lines changed

22 files changed

+5096
-5135
lines changed

‎src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.2.0" />
14+
<PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.3.0" />
1515
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.17.0-preview" />
1616
</ItemGroup>
1717

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/Common.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ function Get-ProviderLocation($provider)
4646

4747
if ($location -eq $null)
4848
{
49-
return "westcentralus"
49+
return "westus2"
5050
} else
5151
{
5252
return $location.Locations[0]
5353
}
5454
}
5555

56-
return "westcentralus"
56+
return "westus2"
5757
}
5858

59-
return "westcentralus"
59+
return "westus2"
6060
}
6161

6262
<#

‎src/NetAppFiles/NetAppFiles.Test/ScenarioTests/VolumeTests.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ function Test-VolumeCrud
127127
Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[1].AllowedClients '1.2.3.0/24'
128128
Assert-AreEqual $retrievedVolume.ProtocolTypes[0] 'NFSv3'
129129
Assert-NotNull $retrievedVolume.MountTargets
130+
Assert-Null $retrievedVolume.VolumeType
131+
Assert-Null $retrievedVolume.DataProtection
130132

131133
# use the NFSv4.1
132134
$protocolTypesv4 = New-Object string[] 1

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.AccountTests/TestAccountActiveDirectory.json

Lines changed: 222 additions & 621 deletions
Large diffs are not rendered by default.

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.AccountTests/TestAccountCrud.json

Lines changed: 233 additions & 290 deletions
Large diffs are not rendered by default.

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.AccountTests/TestAccountPipelines.json

Lines changed: 186 additions & 186 deletions
Large diffs are not rendered by default.

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.PoolTests/TestPoolCrud.json

Lines changed: 358 additions & 358 deletions
Large diffs are not rendered by default.

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.PoolTests/TestPoolPipelines.json

Lines changed: 470 additions & 470 deletions
Large diffs are not rendered by default.

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.SnapshotTests/TestSnapshotCrud.json

Lines changed: 1593 additions & 804 deletions
Large diffs are not rendered by default.

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.SnapshotTests/TestSnapshotPipelines.json

Lines changed: 559 additions & 562 deletions
Large diffs are not rendered by default.

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.VolumeTests/TestVolumeCrud.json

Lines changed: 817 additions & 1210 deletions
Large diffs are not rendered by default.

‎src/NetAppFiles/NetAppFiles.Test/SessionRecords/Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.VolumeTests/TestVolumePipelines.json

Lines changed: 552 additions & 621 deletions
Large diffs are not rendered by default.

‎src/NetAppFiles/NetAppFiles/Account/NewNetAppFilesAccount.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using Microsoft.Azure.Management.NetApp;
2121
using Microsoft.Azure.Management.NetApp.Models;
2222
using Microsoft.Azure.Commands.NetAppFiles.Helpers;
23+
using System.Collections.Generic;
2324

2425
namespace Microsoft.Azure.Commands.NetAppFiles.Account
2526
{
@@ -68,11 +69,23 @@ public class NewAzureRmNetAppFilesAccount : AzureNetAppFilesCmdletBase
6869

6970
public override void ExecuteCmdlet()
7071
{
72+
IDictionary<string, string> tagPairs = null;
73+
74+
if (Tag != null)
75+
{
76+
tagPairs = new Dictionary<string, string>();
77+
78+
foreach (string key in Tag.Keys)
79+
{
80+
tagPairs.Add(key, Tag[key].ToString());
81+
}
82+
}
83+
7184
var netAppAccountBody = new NetAppAccount()
7285
{
7386
Location = Location,
7487
ActiveDirectories = (ActiveDirectory != null) ? ModelExtensions.ConvertActiveDirectoriesFromPs(ActiveDirectory) : null,
75-
Tags = Tag
88+
Tags = tagPairs
7689
};
7790

7891
if (ShouldProcess(Name, string.Format(PowerShell.Cmdlets.NetAppFiles.Properties.Resources.CreateResourceMessage, ResourceGroupName)))

‎src/NetAppFiles/NetAppFiles/Account/SetNetAppFilesAccount.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,23 @@ public class SetAzureRmNetAppFilesAccount : AzureNetAppFilesCmdletBase
7575

7676
public override void ExecuteCmdlet()
7777
{
78+
IDictionary<string, string> tagPairs = null;
79+
80+
if (Tag != null)
81+
{
82+
tagPairs = new Dictionary<string, string>();
83+
84+
foreach (string key in Tag.Keys)
85+
{
86+
tagPairs.Add(key, Tag[key].ToString());
87+
}
88+
}
89+
7890
var netAppAccountBody = new NetAppAccount()
7991
{
8092
Location = Location,
8193
ActiveDirectories = (ActiveDirectory != null) ? ModelExtensions.ConvertActiveDirectoriesFromPs(ActiveDirectory) : new List<ActiveDirectory>(),
82-
Tags = Tag
94+
Tags = tagPairs
8395
};
8496

8597
if (ShouldProcess(Name, string.Format(PowerShell.Cmdlets.NetAppFiles.Properties.Resources.CreateResourceMessage, ResourceGroupName)))

‎src/NetAppFiles/NetAppFiles/Account/UpdateNetAppFilesAccount.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using Microsoft.Azure.Management.NetApp.Models;
2222
using Microsoft.Azure.Commands.NetAppFiles.Helpers;
2323
using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
24+
using System.Collections.Generic;
2425

2526
namespace Microsoft.Azure.Commands.NetAppFiles.Account
2627
{
@@ -86,6 +87,18 @@ public class UpdateAzureRmNetAppFilesAccount : AzureNetAppFilesCmdletBase
8687

8788
public override void ExecuteCmdlet()
8889
{
90+
IDictionary<string, string> tagPairs = null;
91+
92+
if (Tag != null)
93+
{
94+
tagPairs = new Dictionary<string, string>();
95+
96+
foreach (string key in Tag.Keys)
97+
{
98+
tagPairs.Add(key, Tag[key].ToString());
99+
}
100+
}
101+
89102
if (ParameterSetName == ResourceIdParameterSet)
90103
{
91104
var resourceIdentifier = new ResourceIdentifier(this.ResourceId);
@@ -102,7 +115,7 @@ public override void ExecuteCmdlet()
102115
{
103116
Location = Location,
104117
ActiveDirectories = (ActiveDirectory != null) ? ModelExtensions.ConvertActiveDirectoriesFromPs(ActiveDirectory) : null,
105-
Tags = Tag,
118+
Tags =tagPairs,
106119

107120
};
108121

‎src/NetAppFiles/NetAppFiles/Az.NetAppFiles.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ PrivateData = @{
125125
* Snapshot creation date now named just ''created'''
126126

127127
# Prerelease string of this module
128-
# Prerelease = ''
128+
Prerelease = 'preview'
129129

130130
# Flag to indicate whether the module requires explicit user acceptance for install/update/save
131131
# RequireLicenseAcceptance = $false

‎src/NetAppFiles/NetAppFiles/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
-->
2020
## Upcoming Release
2121

22+
* Includes some additional volume properties associated with upcoming replication operations
23+
2224
## Version 0.1.3
2325

2426
* Volume creation --protocol-types accepts now "NFSv4.1" not "NFSv4"

‎src/NetAppFiles/NetAppFiles/NetAppFiles.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Import Project="$(MSBuildThisFileDirectory)..\..\Az.props" />
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.2.0" />
10+
<PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.3.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/NetAppFiles/NetAppFiles/Pool/NewNetAppFilesPool.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using System.Collections;
16+
using System.Collections.Generic;
1617
using System.Management.Automation;
1718
using Microsoft.Azure.Commands.NetAppFiles.Common;
1819
using Microsoft.Azure.Commands.NetAppFiles.Models;
@@ -97,6 +98,18 @@ public class NewAzureRmNetAppFilesPool : AzureNetAppFilesCmdletBase
9798

9899
public override void ExecuteCmdlet()
99100
{
101+
IDictionary<string, string> tagPairs = null;
102+
103+
if (Tag != null)
104+
{
105+
tagPairs = new Dictionary<string, string>();
106+
107+
foreach (string key in Tag.Keys)
108+
{
109+
tagPairs.Add(key, Tag[key].ToString());
110+
}
111+
}
112+
100113
if (ParameterSetName == ParentObjectParameterSet)
101114
{
102115
ResourceGroupName = AccountObject.ResourceGroupName;
@@ -109,7 +122,7 @@ public override void ExecuteCmdlet()
109122
ServiceLevel = ServiceLevel,
110123
Size = PoolSize,
111124
Location = Location,
112-
Tags = Tag
125+
Tags = tagPairs
113126
};
114127

115128
if (ShouldProcess(Name, string.Format(PowerShell.Cmdlets.NetAppFiles.Properties.Resources.CreateResourceMessage, ResourceGroupName)))

‎src/NetAppFiles/NetAppFiles/Pool/UpdateNetAppFilesPool.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using Microsoft.Azure.Management.NetApp.Models;
2121
using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
2222
using System.Collections;
23+
using System.Collections.Generic;
2324

2425
namespace Microsoft.Azure.Commands.NetAppFiles.Pool
2526
{
@@ -118,6 +119,18 @@ public class UpdateAzureRmNetAppFilesPool : AzureNetAppFilesCmdletBase
118119

119120
public override void ExecuteCmdlet()
120121
{
122+
IDictionary<string, string> tagPairs = null;
123+
124+
if (Tag != null)
125+
{
126+
tagPairs = new Dictionary<string, string>();
127+
128+
foreach (string key in Tag.Keys)
129+
{
130+
tagPairs.Add(key, Tag[key].ToString());
131+
}
132+
}
133+
121134
if (ParameterSetName == ResourceIdParameterSet)
122135
{
123136
var resourceIdentifier = new ResourceIdentifier(ResourceId);
@@ -146,7 +159,7 @@ public override void ExecuteCmdlet()
146159
ServiceLevel = ServiceLevel,
147160
Size = PoolSize,
148161
Location = Location,
149-
Tags = Tag
162+
Tags = tagPairs
150163
};
151164

152165
if (ShouldProcess(Name, string.Format(PowerShell.Cmdlets.NetAppFiles.Properties.Resources.UpdateResourceMessage, ResourceGroupName)))

‎src/NetAppFiles/NetAppFiles/Volume/NewNetAppFilesVolume.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,18 @@ public class NewAzureRmNetAppFilesVolume : AzureNetAppFilesCmdletBase
140140

141141
public override void ExecuteCmdlet()
142142
{
143+
IDictionary<string, string> tagPairs = null;
144+
145+
if (Tag != null)
146+
{
147+
tagPairs = new Dictionary<string, string>();
148+
149+
foreach (string key in Tag.Keys)
150+
{
151+
tagPairs.Add(key, Tag[key].ToString());
152+
}
153+
}
154+
143155
if (ParameterSetName == ParentObjectParameterSet)
144156
{
145157
ResourceGroupName = PoolObject.ResourceGroupName;
@@ -158,7 +170,7 @@ public override void ExecuteCmdlet()
158170
Location = Location,
159171
ExportPolicy = (ExportPolicy != null) ? ModelExtensions.ConvertExportPolicyFromPs(ExportPolicy) : null,
160172
ProtocolTypes = ProtocolType,
161-
Tags = Tag
173+
Tags = tagPairs
162174
};
163175

164176
if (ShouldProcess(Name, string.Format(PowerShell.Cmdlets.NetAppFiles.Properties.Resources.CreateResourceMessage, ResourceGroupName)))

‎src/NetAppFiles/NetAppFiles/Volume/UpdateNetAppFilesVolume.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using Microsoft.Azure.Management.NetApp;
2222
using Microsoft.Azure.Management.NetApp.Models;
2323
using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
24+
using System.Collections.Generic;
2425

2526
namespace Microsoft.Azure.Commands.NetAppFiles.Volume
2627
{
@@ -137,6 +138,18 @@ public class UpdateAzureRmNetAppFilesVolume : AzureNetAppFilesCmdletBase
137138

138139
public override void ExecuteCmdlet()
139140
{
141+
IDictionary<string, string> tagPairs = null;
142+
143+
if (Tag != null)
144+
{
145+
tagPairs = new Dictionary<string, string>();
146+
147+
foreach (string key in Tag.Keys)
148+
{
149+
tagPairs.Add(key, Tag[key].ToString());
150+
}
151+
}
152+
140153
if (ParameterSetName == ResourceIdParameterSet)
141154
{
142155
var resourceIdentifier = new ResourceIdentifier(this.ResourceId);
@@ -169,7 +182,7 @@ public override void ExecuteCmdlet()
169182
ServiceLevel = ServiceLevel,
170183
UsageThreshold = UsageThreshold,
171184
ExportPolicy = (ExportPolicy != null) ? ModelExtensions.ConvertExportPolicyPatchFromPs(ExportPolicy) : null,
172-
Tags = Tag
185+
Tags = tagPairs
173186
};
174187

175188
if (ShouldProcess(Name, string.Format(PowerShell.Cmdlets.NetAppFiles.Properties.Resources.UpdateResourceMessage, ResourceGroupName)))

0 commit comments

Comments
 (0)