Merge branch 'master' into master

Author: bashahee

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,11 +6,13 @@
 
 ## Checklist
 
-- [ ] I have read the [_Submitting Changes_](https://github.com/Azure/azure-powershell/blob/master/CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](https://github.com/Azure/azure-powershell/blob/master/CONTRIBUTING.md)
+- [ ] I have read the [_Submitting Changes_](../CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](../CONTRIBUTING.md)
 - [ ] The title of the PR is clear and informative
-- [ ] The appropriate [change log has been updated](https://github.com/Azure/azure-powershell/blob/master/CONTRIBUTING.md#updating-the-change-log)
-- [ ] The PR does not introduce [breaking changes](https://github.com/Azure/azure-powershell/blob/master/documentation/breaking-changes/breaking-changes-definition.md)
+- [ ] The appropriate `ChangeLog.md` file(s) has been updated:
+    - For any service, the `ChangeLog.md` file can be found at `src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md`
+    - A snippet outlining the change(s) made in the PR should be written under the `## Upcoming Release` header -- no new version header should be added
+- [ ] The PR does not introduce [breaking changes](../documentation/breaking-changes/breaking-changes-definition.md)
 - [ ] If applicable, the changes made in the PR have proper test coverage
 - [ ] For public API changes to cmdlets:
-    - [ ] the changes have gone through a [cmdlet design review](https://github.com/Azure/azure-powershell-cmdlet-review-pr) (Microsoft internal partners only)
-    - [ ] the cmdlet markdown files were [generated using the `platyPS` module](https://github.com/Azure/azure-powershell/blob/master/documentation/development-docs/help-generation.md)
+    - [ ] a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr) (_Microsoft internal only_)
+    - [ ] the markdown help files have been regenerated using the commands listed [here](../documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)

CONTRIBUTING.md

@@ -65,12 +65,14 @@ The following is a list of guidelines that pull requests opened in the Azure Pow
 The following guidelines must be followed in **EVERY** pull request that is opened.
 
 - Title of the pull request is clear and informative
-- The appropriate `ChangeLog.md` file has been updated with a snippet describing the changes being made
+- The appropriate `ChangeLog.md` file(s) has been updated:
+    - For any service, the `ChangeLog.md` file can be found at `src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md`
+    - A snippet outlining the change(s) made in the PR should be written under the `## Upcoming Release` header -- no new version header should be added
 - There are a [small number of commits](documentation/development-docs/cleaning-up-commits.md) that each have an informative message
 - All files shipped with a module should contain a proper Microsoft license header
 - For public API changes to cmdlets:
-    - a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr)
-    - the markdown help files have been regenerated using the commands listed [here](https://github.com/Azure/azure-powershell/blob/master/documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)
+    - a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr) (_Microsoft internal only_)
+    - the markdown help files have been regenerated using the commands listed [here](documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)
 
 #### Testing guidelines
 

src/Compute/Compute/ChangeLog.md

@@ -20,6 +20,7 @@
 -->
 ## Upcoming Release
 * Fixed miscellaneous typos across module
+* Update `-VolumeType` description in `Set-AzVMDiskEncryptionExtension` and `Set-AzVmssDiskEncryptionExtension` reference documentation
 
 ## Version 2.4.1
 * Add missing properties (ComputerName, OsName, OsVersion and HyperVGeneration) of VM instance view object.

src/Compute/Compute/help/Set-AzVMDiskEncryptionExtension.md

@@ -47,14 +47,16 @@ Set-AzVMDiskEncryptionExtension [-ResourceGroupName] <String> [-VMName] <String>
 ```
 
 ## DESCRIPTION
-The **Set-AzVMDiskEncryptionExtension** cmdlet enables encryption on a running infrastructure as a service (IaaS) virtual machine in Azure.
-This cmdlet enables encryption by installing the disk encryption extension on the virtual machine. 
-
-The *VolumeType* parameter is required when encrypting Linux virtual machines, and must be set to a value ("Os", "Data", or "All") supported by the Linux distribution. The *VolumeType* parameter can be omitted when encrypting Windows virtual machines.
+The **Set-AzVMDiskEncryptionExtension** cmdlet enables encryption on a running infrastructure as a service (IaaS) virtual machine in Azure.  It enables encryption by installing the disk encryption extension on the virtual machine. 
 
 This cmdlet requires confirmation from the users as one of the steps to enable encryption requires a restart of the virtual machine.
+
 It is advised that you save your work on the virtual machine before you run this cmdlet.
 
+Linux: The **VolumeType** parameter is required when encrypting Linux virtual machines, and must be set to a value ("Os", "Data", or "All") supported by the Linux distribution. 
+
+Windows: The **VolumeType** parameter may be omitted, in which case the operation defaults to All; if the VolumeType parameter is present for a Windows virtual machine, it must be set to either All or OS.
+
 ## EXAMPLES
 
 ### Example 1: Enable encryption
@@ -456,7 +458,7 @@ Accept wildcard characters: False
 ```
 
 ### -Name
-Specifies the name of the Azure Resource Manager resource that represents the extension. If the *Name* parameter is omitted, the installed extension will be named “AzureDiskEncryption” on Windows virtual machines and “AzureDiskEncryptionForLinux” on Linux virtual machines.
+Specifies the name of the Azure Resource Manager resource that represents the extension. If the *Name* parameter is omitted, the installed extension will be named “AzureDiskEncryption” on Windows virtual machines and “AzureDiskEncryptionForLinux” on Linux virtual machines.
 
 
 ```yaml
@@ -565,10 +567,11 @@ Accept wildcard characters: False
 ```
 
 ### -VolumeType
-Specifies the type of virtual machine volumes on which to perform the encryption operation.
-Allowed values for Windows virtual machines: All, OS, and Data.
-The only allowed value for Linux virtual machines: Data.
-The VolumeType parameter is required when encrypting Linux virtual machines, but can be omitted when encrypting Windows virtual machines.
+Specifies the type of virtual machine volumes on which to perform encryption operation: OS, Data, or All. 
+
+Linux: The **VolumeType** parameter is required when encrypting Linux virtual machines, and must be set to a value ("Os", "Data", or "All") supported by the Linux distribution. 
+
+Windows: The **VolumeType** parameter may be omitted, in which case the operation defaults to All; if the VolumeType parameter is present for a Windows virtual machine, it must be set to either All or OS.
 
 ```yaml
 Type: System.String

src/Compute/Compute/help/Set-AzVmssDiskEncryptionExtension.md

@@ -24,7 +24,7 @@ Set-AzVmssDiskEncryptionExtension [-ResourceGroupName] <String> [-VMScaleSetName
 ## DESCRIPTION
 The **Set-AzVmssDiskEncryptionExtension** cmdlet enables encryption on a VM scale set. This cmdlet enables encryption by installing the disk encryption extension on the VM scale set.
 
-The *VolumeType* parameter is required when encrypting Linux virtual machines, and must be set to "Data". It can be omitted when encrypting Windows virtual machines.
+For Linux virtual machines, the *VolumeType* parameter must be present and must be set to "Data"
 
 ## EXAMPLES
 
@@ -274,7 +274,12 @@ Accept wildcard characters: False
 ```
 
 ### -VolumeType
-Type of the volume (OS or Data) on which to perform encryption operation. This parameter is required when encrypting Linux virtual machines, and must be set to a value supported by the Linux distribution. This parameter can be omitted when encrypting Windows virtual machines.
+Specifies the type of virtual machine volumes on which to perform encryption operation: OS, Data, or All. 
+
+Linux: The **VolumeType** parameter must be present and must be set to Data. 
+
+Windows: The **VolumeType** parameter, if present, must be set to either All or OS. If the **VolumeType** parameter is omitted it defaults to "All".
+
 
 ```yaml
 Type: System.String

src/DataFactory/DataFactoryV2/Changelog.md

@@ -23,6 +23,7 @@
 * Fixed miscellaneous typos across module
 * Updated ADF .Net SDK version to 4.1.1 
 * Add parameter "DataProxyIntegrationRuntimeName", "DataProxyStagingLinkedServiceName" and "DataProxyStagingPath" for "Set-AzureRmDataFactoryV2IntegrationRuntime" cmd to enable set up Self-Hosted Integration Runtime as a proxy for SSIS Integration Runtime
+* Updated PSTriggerRun to show the triggered pipelines, message and properties, and PSActivityRun to show the activity type
 
 ## Version 1.1.3
 * Updated ADF .Net SDK version to 4.1.0

src/DataFactory/DataFactoryV2/Models/PSActivityRun.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using Microsoft.Azure.Management.DataFactory.Models;
 
 namespace Microsoft.Azure.Commands.DataFactoryV2.Models
@@ -58,6 +59,14 @@ public string ActivityName
             }
         }
 
+        public string ActivityType
+        {
+            get
+            {
+                return this.activityRun.ActivityType;
+            }
+        }
+
         public string PipelineRunId
         {
             get
@@ -137,5 +146,13 @@ public object Error
                 return this.activityRun.Error;
             }
         }
+
+        public IDictionary<string, object> AdditionalProperties
+        {
+            get
+            {
+                return this.activityRun.AdditionalProperties;
+            }
+        }
     }
 }

src/DataFactory/DataFactoryV2/Models/PSTriggerRun.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using Microsoft.Azure.Management.DataFactory.Models;
 
 namespace Microsoft.Azure.Commands.DataFactoryV2.Models
@@ -81,5 +82,37 @@ public string Status
                 return this.triggerRun.Status;
             }
         }
+
+        public IDictionary<string, string> TriggeredPipelines
+        {
+            get
+            {
+                return this.triggerRun.TriggeredPipelines;
+            }
+        }
+
+        public string Message
+        {
+            get
+            {
+                return this.triggerRun.Message;
+            }
+        }
+
+        public IDictionary<string, string> Properties
+        {
+            get
+            {
+                return this.triggerRun.Properties;
+            }
+        }
+
+        public IDictionary<string, object> AdditionalProperties
+        {
+            get
+            {
+                return this.triggerRun.AdditionalProperties;
+            }
+        }
     }
 }

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

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.13.0-preview" />
   </ItemGroup>
 

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

@@ -24,9 +24,11 @@ function Test-VolumeCrud
     $resourceGroup = Get-ResourceGroupName
     $accName = Get-ResourceName
     $poolName = Get-ResourceName
+    $poolName2 = Get-ResourceName
     $volName1 = Get-ResourceName
     $volName2 = Get-ResourceName
     $volName3 = Get-ResourceName
+    $volName4 = Get-ResourceName
     $gibibyte = 1024 * 1024 * 1024
     $usageThreshold = 100 * $gibibyte
     $doubleUsage = 2 * $usageThreshold
@@ -56,13 +58,32 @@ function Test-VolumeCrud
         Nfsv4 = 'false'
         AllowedClients = '1.2.3.0/24'
     }
-
+    $rule3 = @{
+        RuleIndex = 2
+        UnixReadOnly = 'false'
+        UnixReadWrite = 'true'
+        Cifs = 'false'
+        Nfsv3 = 'true'
+        Nfsv4 = 'false'
+        AllowedClients = '2.3.4.0/24'
+    }
 
     $exportPolicy = @{
 		Rules = (
 			$rule1, $rule2
 		)
 	}
+    
+    $exportPolicyMod = @{
+		Rules = (
+			$rule3
+		)
+	}
+
+    # create the list of protocol types
+    $protocolTypes = New-Object string[] 2
+    $protocolTypes[0] = "NFSv3"
+    $protocolTypes[1] = "NFSv4"
 
     try
     {
@@ -83,19 +104,24 @@ function Test-VolumeCrud
         # create first volume and check
         $newTagName = "tag1"
         $newTagValue = "tagValue1"
-        $retrievedVolume = New-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName1 -CreationToken $volName1 -UsageThreshold $usageThreshold -ServiceLevel $serviceLevel -SubnetId $subnetId -Tag @{$newTagName = $newTagValue} -ExportPolicy $exportPolicy
+        $retrievedVolume = New-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName1 -CreationToken $volName1 -UsageThreshold $usageThreshold -ServiceLevel $serviceLevel -SubnetId $subnetId -Tag @{$newTagName = $newTagValue} -ExportPolicy $exportPolicy -ProtocolType $protocolTypes
         Assert-AreEqual "$accName/$poolName/$volName1" $retrievedVolume.Name
         Assert-AreEqual $serviceLevel $retrievedVolume.ServiceLevel
         Assert-AreEqual True $retrievedVolume.Tags.ContainsKey($newTagName)
         Assert-AreEqual "tagValue1" $retrievedVolume.Tags[$newTagName].ToString()
         Assert-NotNull $retrievedVolume.ExportPolicy
         Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[0].AllowedClients '0.0.0.0/0'
         Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[1].AllowedClients '1.2.3.0/24'
+        Assert-AreEqual $retrievedVolume.ProtocolTypes[0] 'NFSv3'
+        Assert-AreEqual $retrievedVolume.ProtocolTypes[1] 'NFSv4'
+        Assert-NotNull $retrievedVolume.MountTargets
 
         # create second volume and check using the confirm flag
         $retrievedVolume = New-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName2 -CreationToken $volName2 -UsageThreshold $usageThreshold -ServiceLevel $serviceLevel -SubnetId $subnetId -Confirm:$false
         Assert-AreEqual "$accName/$poolName/$volName2" $retrievedVolume.Name
         Assert-AreEqual $serviceLevel $retrievedVolume.ServiceLevel
+        # default protocol type for new volume
+        Assert-AreEqual $retrievedVolume.ProtocolTypes[0] 'NFSv3'
 
         # create and check a third volume  using the WhatIf - it should not be created
         $retrievedVolume = New-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName3 -CreationToken $volName2 -UsageThreshold $usageThreshold -ServiceLevel $serviceLevel -SubnetId $subnetId -WhatIf
@@ -125,21 +151,21 @@ function Test-VolumeCrud
         Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[0].AllowedClients '0.0.0.0/0'
         Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[1].AllowedClients '1.2.3.0/24'
 
-		$rule3 = @{
-			RuleIndex = 3
-			UnixReadOnly = 'false'
-			UnixReadWrite = 'true'
-			Cifs = 'false'
-			Nfsv3 = 'true'
-			Nfsv4 = 'false'
-			AllowedClients = '1.2.3.0/24'
-		}
-
-		$exportPolicyUpdate = @{
-			Rules = (
-				$rule2, $rule3
-			)
-		}
+        $rule4 = @{
+            RuleIndex = 3
+            UnixReadOnly = 'false'
+            UnixReadWrite = 'true'
+            Cifs = 'false'
+            Nfsv3 = 'true'
+            Nfsv4 = 'false'
+            AllowedClients = '1.2.3.0/24'
+        }
+
+        $exportPolicyUpdate = @{
+            Rules = (
+                $rule2, $rule4
+            )
+        }
 
         # now patch the policy
         $retrievedVolume = Update-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName -VolumeName $volName1 -ExportPolicy $exportPolicyUpdate
@@ -156,6 +182,31 @@ function Test-VolumeCrud
         Remove-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -AccountName $accName -PoolName $poolName -VolumeName $volName2
         $retrievedVolume = Get-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -AccountName $accName -PoolName $poolName
         Assert-AreEqual 0 $retrievedVolume.Length
+
+        # test export policy update with non-default volume (and "Standard" Pool)
+        # create pool
+        $retrievedPool = New-AzNetAppFilesPool -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName2 -PoolSize $poolSize -ServiceLevel "Standard"
+        
+        # create the volume and check
+        $newTagName = "tag1"
+        $newTagValue = "tagValue1"
+        $retrievedVolume = New-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName2 -VolumeName $volName4 -CreationToken $volName4 -UsageThreshold $doubleUsage -ServiceLevel "Standard" -SubnetId $subnetId -Tag @{$newTagName = $newTagValue} -ExportPolicy $exportPolicy -ProtocolType $protocolTypes
+        Assert-AreEqual "$accName/$poolName2/$volName4" $retrievedVolume.Name
+        Assert-AreEqual "Standard" $retrievedVolume.ServiceLevel
+        Assert-AreEqual True $retrievedVolume.Tags.ContainsKey($newTagName)
+        Assert-AreEqual "tagValue1" $retrievedVolume.Tags[$newTagName].ToString()
+        Assert-NotNull $retrievedVolume.ExportPolicy
+        Assert-AreEqual '0.0.0.0/0' $retrievedVolume.ExportPolicy.Rules[0].AllowedClients
+        Assert-AreEqual '1.2.3.0/24' $retrievedVolume.ExportPolicy.Rules[1].AllowedClients
+
+        # update (patch) export policy and check no change to rest of volume
+        $retrievedVolume = Update-AzNetAppFilesVolume -ResourceGroupName $resourceGroup -Location $resourceLocation -AccountName $accName -PoolName $poolName2 -VolumeName $volName4 -ExportPolicy $exportPolicyMod
+        Assert-AreEqual '2.3.4.0/24' $retrievedVolume.ExportPolicy.Rules[0].AllowedClients
+        # unchanged, not part of the patch
+        Assert-AreEqual "Standard" $retrievedVolume.ServiceLevel
+        Assert-AreEqual $doubleUsage $retrievedVolume.usageThreshold
+        Assert-AreEqual True $retrievedVolume.Tags.ContainsKey($newTagName)
+        Assert-AreEqual "tagValue1" $retrievedVolume.Tags[$newTagName].ToString()
     }
     finally
     {