ANF-439 update for new API 2019-08-01 (AzureRT#29)

hyonholee · Nov 25, 2019 · f5cedb0 · f5cedb0
1 parent 600be09
commit f5cedb0
Show file tree

Hide file tree

Showing 22 changed files with 5,099 additions and 5,136 deletions.
diff --git a/src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj b/src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.2.0" />
+    <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.3.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.17.0-preview" />
   </ItemGroup>
 

diff --git a/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/Common.ps1 b/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/Common.ps1
@@ -46,17 +46,17 @@ function Get-ProviderLocation($provider)
 
             if ($location -eq $null) 
             {  
-                return "westcentralus"
+                return "westus2"
             } else 
             {  
                 return $location.Locations[0]  
             }  
         }
 
-        return "westcentralus"
+        return "westus2"
     }
 
-    return "westcentralus"
+    return "westus2"
 }
 
 <#

diff --git a/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/VolumeTests.ps1 b/src/NetAppFiles/NetAppFiles.Test/ScenarioTests/VolumeTests.ps1
@@ -127,6 +127,8 @@ function Test-VolumeCrud
         Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[1].AllowedClients '1.2.3.0/24'
         Assert-AreEqual $retrievedVolume.ProtocolTypes[0] 'NFSv3'
         Assert-NotNull $retrievedVolume.MountTargets
+        Assert-Null $retrievedVolume.VolumeType
+        Assert-Null $retrievedVolume.DataProtection
 
         # use the NFSv4.1
         $protocolTypesv4 = New-Object string[] 1

diff --git a/....NetAppFiles.Test.ScenarioTests.ScenarioTest.AccountTests/TestAccountActiveDirectory.json b/....NetAppFiles.Test.ScenarioTests.ScenarioTest.AccountTests/TestAccountActiveDirectory.json
diff --git a/...re.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.AccountTests/TestAccountCrud.json b/...re.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.AccountTests/TestAccountCrud.json
diff --git a/...mmands.NetAppFiles.Test.ScenarioTests.ScenarioTest.AccountTests/TestAccountPipelines.json b/...mmands.NetAppFiles.Test.ScenarioTests.ScenarioTest.AccountTests/TestAccountPipelines.json
diff --git a/...ft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.PoolTests/TestPoolCrud.json b/...ft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.PoolTests/TestPoolCrud.json
diff --git a/...ure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.PoolTests/TestPoolPipelines.json b/...ure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.PoolTests/TestPoolPipelines.json
diff --git a/....Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.SnapshotTests/TestSnapshotCrud.json b/....Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.SnapshotTests/TestSnapshotCrud.json
diff --git a/...ands.NetAppFiles.Test.ScenarioTests.ScenarioTest.SnapshotTests/TestSnapshotPipelines.json b/...ands.NetAppFiles.Test.ScenarioTests.ScenarioTest.SnapshotTests/TestSnapshotPipelines.json
diff --git a/...zure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.VolumeTests/TestVolumeCrud.json b/...zure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.VolumeTests/TestVolumeCrud.json
diff --git a/...Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.VolumeTests/TestVolumePipelines.json b/...Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest.VolumeTests/TestVolumePipelines.json
diff --git a/src/NetAppFiles/NetAppFiles/Account/NewNetAppFilesAccount.cs b/src/NetAppFiles/NetAppFiles/Account/NewNetAppFilesAccount.cs
@@ -20,6 +20,7 @@
 using Microsoft.Azure.Management.NetApp;
 using Microsoft.Azure.Management.NetApp.Models;
 using Microsoft.Azure.Commands.NetAppFiles.Helpers;
+using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.NetAppFiles.Account
 {
@@ -68,11 +69,23 @@ public class NewAzureRmNetAppFilesAccount : AzureNetAppFilesCmdletBase
 
         public override void ExecuteCmdlet()
         {
+            IDictionary<string, string> tagPairs = null;
+
+            if (Tag != null)
+            {
+                tagPairs = new Dictionary<string, string>();
+
+                foreach (string key in Tag.Keys)
+                {
+                    tagPairs.Add(key, Tag[key].ToString());
+                }
+            }
+
             var netAppAccountBody = new NetAppAccount()
             {
                 Location = Location,
                 ActiveDirectories = (ActiveDirectory != null) ? ModelExtensions.ConvertActiveDirectoriesFromPs(ActiveDirectory) : null,
-                Tags = Tag
+                Tags = tagPairs
             };
 
             if (ShouldProcess(Name, string.Format(PowerShell.Cmdlets.NetAppFiles.Properties.Resources.CreateResourceMessage, ResourceGroupName)))

diff --git a/src/NetAppFiles/NetAppFiles/Account/SetNetAppFilesAccount.cs b/src/NetAppFiles/NetAppFiles/Account/SetNetAppFilesAccount.cs
@@ -75,11 +75,23 @@ public class SetAzureRmNetAppFilesAccount : AzureNetAppFilesCmdletBase
 
         public override void ExecuteCmdlet()
         {
+            IDictionary<string, string> tagPairs = null;
+
+            if (Tag != null)
+            {
+                tagPairs = new Dictionary<string, string>();
+
+                foreach (string key in Tag.Keys)
+                {
+                    tagPairs.Add(key, Tag[key].ToString());
+                }
+            }
+
             var netAppAccountBody = new NetAppAccount()
             {
                 Location = Location,
                 ActiveDirectories = (ActiveDirectory != null) ? ModelExtensions.ConvertActiveDirectoriesFromPs(ActiveDirectory) : new List<ActiveDirectory>(),
-                Tags = Tag
+                Tags = tagPairs
             };
 
             if (ShouldProcess(Name, string.Format(PowerShell.Cmdlets.NetAppFiles.Properties.Resources.CreateResourceMessage, ResourceGroupName)))

diff --git a/src/NetAppFiles/NetAppFiles/Account/UpdateNetAppFilesAccount.cs b/src/NetAppFiles/NetAppFiles/Account/UpdateNetAppFilesAccount.cs
@@ -21,6 +21,7 @@
 using Microsoft.Azure.Management.NetApp.Models;
 using Microsoft.Azure.Commands.NetAppFiles.Helpers;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
+using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.NetAppFiles.Account
 {
@@ -86,6 +87,18 @@ public class UpdateAzureRmNetAppFilesAccount : AzureNetAppFilesCmdletBase
 
         public override void ExecuteCmdlet()
         {
+            IDictionary<string, string> tagPairs = null;
+
+            if (Tag != null)
+            {
+                tagPairs = new Dictionary<string, string>();
+
+                foreach (string key in Tag.Keys)
+                {
+                    tagPairs.Add(key, Tag[key].ToString());
+                }
+            }
+
             if (ParameterSetName == ResourceIdParameterSet)
             {
                 var resourceIdentifier = new ResourceIdentifier(this.ResourceId);
@@ -102,7 +115,7 @@ public override void ExecuteCmdlet()
             {
                 Location = Location,
                 ActiveDirectories = (ActiveDirectory != null) ? ModelExtensions.ConvertActiveDirectoriesFromPs(ActiveDirectory) : null,
-                Tags = Tag,
+                Tags =tagPairs,
 
             };
 

diff --git a/src/NetAppFiles/NetAppFiles/Az.NetAppFiles.psd1 b/src/NetAppFiles/NetAppFiles/Az.NetAppFiles.psd1
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.1.2'
+ModuleVersion = '0.1.4'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -126,7 +126,7 @@ PrivateData = @{
 * Fixed miscellaneous typos across module'
 
         # Prerelease string of this module
-        # Prerelease = ''
+        Prerelease = 'preview'
 
         # Flag to indicate whether the module requires explicit user acceptance for install/update/save
         # RequireLicenseAcceptance = $false

diff --git a/src/NetAppFiles/NetAppFiles/ChangeLog.md b/src/NetAppFiles/NetAppFiles/ChangeLog.md
@@ -19,6 +19,10 @@
 -->
 ## Upcoming Release
 
+* Includes some additional volume properties associated with upcoming replication operations
+
+## Version 0.1.3
+
 * Volume creation --protocol-types accepts now "NFSv4.1" not "NFSv4"
 * Volume export policy property now named 'nfsv41' not 'nfsv4'
 * Snapshot creation date now named just 'created'

diff --git a/src/NetAppFiles/NetAppFiles/NetAppFiles.csproj b/src/NetAppFiles/NetAppFiles/NetAppFiles.csproj
@@ -7,7 +7,7 @@
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.props" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.2.0" />
+    <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NetAppFiles/NetAppFiles/Pool/NewNetAppFilesPool.cs b/src/NetAppFiles/NetAppFiles/Pool/NewNetAppFilesPool.cs
@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System.Collections;
+using System.Collections.Generic;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.NetAppFiles.Common;
 using Microsoft.Azure.Commands.NetAppFiles.Models;
@@ -97,6 +98,18 @@ public class NewAzureRmNetAppFilesPool : AzureNetAppFilesCmdletBase
 
         public override void ExecuteCmdlet()
         {
+            IDictionary<string, string> tagPairs = null;
+
+            if (Tag != null)
+            {
+                tagPairs = new Dictionary<string, string>();
+
+                foreach (string key in Tag.Keys)
+                {
+                    tagPairs.Add(key, Tag[key].ToString());
+                }
+            }
+
             if (ParameterSetName == ParentObjectParameterSet)
             {
                 ResourceGroupName = AccountObject.ResourceGroupName;
@@ -109,7 +122,7 @@ public override void ExecuteCmdlet()
                 ServiceLevel = ServiceLevel,
                 Size = PoolSize,
                 Location = Location,
-                Tags = Tag
+                Tags = tagPairs
             };
 
             if (ShouldProcess(Name, string.Format(PowerShell.Cmdlets.NetAppFiles.Properties.Resources.CreateResourceMessage, ResourceGroupName)))

diff --git a/src/NetAppFiles/NetAppFiles/Pool/UpdateNetAppFilesPool.cs b/src/NetAppFiles/NetAppFiles/Pool/UpdateNetAppFilesPool.cs
@@ -20,6 +20,7 @@
 using Microsoft.Azure.Management.NetApp.Models;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.NetAppFiles.Pool
 {
@@ -118,6 +119,18 @@ public class UpdateAzureRmNetAppFilesPool : AzureNetAppFilesCmdletBase
 
         public override void ExecuteCmdlet()
         {
+            IDictionary<string, string> tagPairs = null;
+
+            if (Tag != null)
+            {
+                tagPairs = new Dictionary<string, string>();
+
+                foreach (string key in Tag.Keys)
+                {
+                    tagPairs.Add(key, Tag[key].ToString());
+                }
+            }
+
             if (ParameterSetName == ResourceIdParameterSet)
             {
                 var resourceIdentifier = new ResourceIdentifier(ResourceId);
@@ -146,7 +159,7 @@ public override void ExecuteCmdlet()
                 ServiceLevel = ServiceLevel,
                 Size = PoolSize,
                 Location = Location,
-                Tags = Tag
+                Tags = tagPairs
             };
 
             if (ShouldProcess(Name, string.Format(PowerShell.Cmdlets.NetAppFiles.Properties.Resources.UpdateResourceMessage, ResourceGroupName)))

diff --git a/src/NetAppFiles/NetAppFiles/Volume/NewNetAppFilesVolume.cs b/src/NetAppFiles/NetAppFiles/Volume/NewNetAppFilesVolume.cs
@@ -140,6 +140,18 @@ public class NewAzureRmNetAppFilesVolume : AzureNetAppFilesCmdletBase
 
         public override void ExecuteCmdlet()
         {
+            IDictionary<string, string> tagPairs = null;
+
+            if (Tag != null)
+            {
+                tagPairs = new Dictionary<string, string>();
+
+                foreach (string key in Tag.Keys)
+                {
+                    tagPairs.Add(key, Tag[key].ToString());
+                }
+            }
+
             if (ParameterSetName == ParentObjectParameterSet)
             {
                 ResourceGroupName = PoolObject.ResourceGroupName;
@@ -158,7 +170,7 @@ public override void ExecuteCmdlet()
                 Location = Location,
                 ExportPolicy = (ExportPolicy != null) ? ModelExtensions.ConvertExportPolicyFromPs(ExportPolicy) : null,
                 ProtocolTypes = ProtocolType,
-                Tags = Tag
+                Tags = tagPairs
             };
 
             if (ShouldProcess(Name, string.Format(PowerShell.Cmdlets.NetAppFiles.Properties.Resources.CreateResourceMessage, ResourceGroupName)))

diff --git a/src/NetAppFiles/NetAppFiles/Volume/UpdateNetAppFilesVolume.cs b/src/NetAppFiles/NetAppFiles/Volume/UpdateNetAppFilesVolume.cs
@@ -21,6 +21,7 @@
 using Microsoft.Azure.Management.NetApp;
 using Microsoft.Azure.Management.NetApp.Models;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
+using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.NetAppFiles.Volume
 {
@@ -137,6 +138,18 @@ public class UpdateAzureRmNetAppFilesVolume : AzureNetAppFilesCmdletBase
 
         public override void ExecuteCmdlet()
         {
+            IDictionary<string, string> tagPairs = null;
+
+            if (Tag != null)
+            {
+                tagPairs = new Dictionary<string, string>();
+
+                foreach (string key in Tag.Keys)
+                {
+                    tagPairs.Add(key, Tag[key].ToString());
+                }
+            }
+
             if (ParameterSetName == ResourceIdParameterSet)
             {
                 var resourceIdentifier = new ResourceIdentifier(this.ResourceId);
@@ -169,7 +182,7 @@ public override void ExecuteCmdlet()
                 ServiceLevel = ServiceLevel,
                 UsageThreshold = UsageThreshold,
                 ExportPolicy = (ExportPolicy != null) ? ModelExtensions.ConvertExportPolicyPatchFromPs(ExportPolicy) : null,
-                Tags = Tag
+                Tags = tagPairs
             };
 
             if (ShouldProcess(Name, string.Format(PowerShell.Cmdlets.NetAppFiles.Properties.Resources.UpdateResourceMessage, ResourceGroupName)))