Merge branch 'master' of https://github.com/Azure/azure-powershell into manual-failover

Author: anusapan

src/ApiManagement/ApiManagement/ChangeLog.md

@@ -19,6 +19,7 @@
 -->
 ## Upcoming Release
 * Update `-Format` parameter description in `Set-AzApiManagementPolicy` reference documentation
+* Removed references of deprecated cmdlet `Update-AzApiManagementDeployment` from reference documentation. Use `Set-AzApiManagement` instead.
 
 ## Version 1.3.0
 * Fixed miscellaneous typos across module

src/ApiManagement/ApiManagement/help/Add-AzApiManagementRegion.md

@@ -22,7 +22,7 @@ Add-AzApiManagementRegion -ApiManagement <PsApiManagement> -Location <String> [-
 ## DESCRIPTION
 The **Add-AzApiManagementRegion** cmdlet adds new instance of type **PsApiManagementRegion** to the collection of **AdditionalRegions** of provided instance of type **Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagement**.
 This cmdlet does not deploy anything by itself but updates instance of **PsApiManagement** in-memory.
-To update a deployment of an API Management pass the modified **PsApiManagement** Instance to Update-AzApiManagementDeployment.
+To update a deployment of an API Management pass the modified **PsApiManagement** Instance to Set-AzApiManagement.
 
 ## EXAMPLES
 
@@ -34,8 +34,10 @@ PS C:\>Add-AzApiManagementRegion -ApiManagement $ApiManagement -Location "East U
 This command adds two premium SKU units and the region named East US to the **PsApiManagement** instance.
 
 ### Example 2: Add new deployment regions to a PsApiManagement instance and then update deployment
-```
-PS C:\>Get-AzApiManagement -ResourceGroupName "Contoso" -Name "ContosoApi" | Add-AzApiManagementRegion -Location "East US" -Sku "Premium" -Capacity 2 | Update-AzApiManagementDeployment
+```powershell
+PS C:\>$service = Get-AzApiManagement -ResourceGroupName "Contoso" -Name "ContosoApi"
+PS C:\>$service = Add-AzApiManagementRegion -ApiManagement $service -Location $secondarylocation -VirtualNetwork $additionalRegionVirtualNetwork
+PS C:\>$service = Set-AzApiManagement -InputObject $service -PassThru 
 ```
 
 This command gets a **PsApiManagement** object, adds two premium SKU units for the region named East US, and then updates deployment.
@@ -159,6 +161,6 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 [Update-AzApiManagementRegion](./Update-AzApiManagementRegion.md)
 
-[Update-AzApiManagementDeployment](./Update-AzApiManagementDeployment.md)
+[Set-AzApiManagement](./Set-AzApiManagement.md)
 
 

src/ApiManagement/ApiManagement/help/New-AzApiManagementVirtualNetwork.md

@@ -20,30 +20,28 @@ New-AzApiManagementVirtualNetwork -SubnetResourceId <String> [-DefaultProfile <I
 
 ## DESCRIPTION
 The **New-AzApiManagementVirtualNetwork** cmdlet is a helper command to create an instance of **PsApiManagementVirtualNetwork**.
-This command is used with **Update-AzApiManagementDeployment** cmdlet.
+This command is used with **Set-AzApiManagement** and **New-AzApiManagement** cmdlet.
 
 ## EXAMPLES
 
-### Example 1: Create a virtual network
+### Example 1: Create a virtual network and Update an existing APIM service into the VNET
+```powershell
+PS C:\> $virtualNetwork = New-AzApiManagementVirtualNetwork -Location "East US" -SubnetResourceId "/subscriptions/a8ff56dc-3bc7-4174-a1e8-3726ab15d0e2/resourceGroups/Api-Default-WestUS/providers/Microsoft.Network/virtualNetworks/dfVirtualNetwork/subnets/backendSubnet"
+PS C:\> $apim = Get-AzApiManagement -ResourceGroupName "ContosoGroup" -Name "ContosoApi"
+PS C:\> $apim.VpnType = "External"
+PS C:\> $apim.VirtualNetwork = $virtualNetwork
+PS C:\> Set-AzApiManagement -InputObject $apim
 ```
-PS C:\>$vnetName = "myvnet"
-PS C:\>$subnetName = "default"
-PS C:\>$subnet = New-AzVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24
-PS C:\>$vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $resourceGroupName -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
 
-# Create a Virtual Network Object
-PS C:\>$virtualNetwork = New-AzApiManagementVirtualNetwork -Location $location -SubnetResourceId $vnet.Subnets[0].Id
+This example creates a virtual network and then calls the **Set-AzApiManagement** cmdlet.
 
-# Get the service
-PS C:\>$service = Get-AzApiManagement -ResourceGroupName $resourceGroupName -Name $apiManagementName    
-PS C:\>$service.VirtualNetwork = $virtualNetwork
-PS C:\>$service.VpnType = "External"
-
-# Update the Deployment with Virtual Network
-PS C:\>Update-AzApiManagementDeployment -ApiManagement $service
+### Example 2: Create an API Management service for an external virtual network
+```powershell
+PS C:\> $virtualNetwork = New-AzApiManagementVirtualNetwork -Location "West US" -SubnetResourceId "/subscriptions/a8ff56dc-3bc7-4174-b1e8-3726ab15d0e2/resourceGroups/ContosoGroup/providers/Microsoft.Network/virtualNetworks/westUsVirtualNetwork/subnets/backendSubnet"
+PS C:\> New-AzApiManagement -ResourceGroupName "ContosoGroup" -Location "West US" -Name "ContosoApi" -Organization Contoso -AdminEmail [email protected] -VirtualNetwork $virtualNetwork -VpnType "External" -Sku "Premium"
 ```
 
-This example creates a virtual network and then calls the **Update-AzApiManagementDeployment** cmdlet.
+This example creates a new APIM service into a Virtual Network in `External` mode
 
 ## PARAMETERS
 
@@ -92,5 +90,6 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## RELATED LINKS
 
-[Update-AzApiManagementDeployment](./Update-AzApiManagementDeployment.md)
+[Set-AzApiManagement](./Set-AzApiManagement.md)
+[New-AzApiManagement](./New-AzApiManagement.md)
 

src/ApiManagement/ApiManagement/help/Remove-AzApiManagementRegion.md

@@ -21,7 +21,7 @@ Remove-AzApiManagementRegion -ApiManagement <PsApiManagement> -Location <String>
 ## DESCRIPTION
 The **Remove-AzApiManagementRegion** cmdlet removes instance of type **Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagementRegion** from a collection of **AdditionalRegions** of provided the instance of type **Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagement**.
 This cmdlet does not modify deployment by itself but updates the instance of **PsApiManagement** in-memory.
-To update a deployment of an API Management, pass the modified **PsApiManagementInstance** to **Update-AzApiManagement**.
+To update a deployment of an API Management, pass the modified **PsApiManagementInstance** to **Set-AzApiManagement**.
 
 ## EXAMPLES
 
@@ -34,7 +34,7 @@ This command removes the region named East US from the **PsApiManagement** insta
 
 ### Example 2: Remove a region from a PsApiManagement instance using a series of commands
 ```
-PS C:\>Get-AzApiManagement -ResourceGroupName "Contoso" -Name ContosoApi | Remove-AzApiManagementRegion -Location "East US" | Update-AzApiManagementDeployment
+PS C:\>Get-AzApiManagement -ResourceGroupName "Contoso" -Name ContosoApi | Remove-AzApiManagementRegion -Location "East US" | Set-AzApiManagement
 ```
 
 This first command gets an instance of **PsApiManagement** from the resource group named Contoso named ContosoApi.

src/ApiManagement/ApiManagement/help/Update-AzApiManagementRegion.md

@@ -22,20 +22,18 @@ Update-AzApiManagementRegion -ApiManagement <PsApiManagement> -Location <String>
 ## DESCRIPTION
 The **Update-AzApiManagementRegion** cmdlet updates an existing instance of type **Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagementRegion** in a collection of **AdditionalRegions** objects of a provided instance of type **Microsoft.Azure.Commands.ApiManagement.Models.PsApiManagement**.
 This cmdlet does not deploy anything but updates an instance of **PsApiManagement** in-memory.
-To update a deployment of an API Management use the modified **PsApiManagementInstance** to the Update-AzApiManagementDeployment cmdlet.
+To update a deployment of an API Management use the modified **PsApiManagementInstance** to the Set-AzApiManagement cmdlet.
 
 ## EXAMPLES
 
 ### Example 1: Increases capacity of Additional Region in a PsApiManagement instance
 ```powershell
 PS C:\>$apimService = Get-AzApiManagement -ResourceGroupName $resourceGroupName -Name $apiManagementName
 PS C:\>$apimService = Update-AzApiManagementRegion -ApiManagement $apimService -Location "North Central US" -Capacity 2 -Sku Premium
-
-# Set the ApiManagement service and Enable Msi idenity on the service
-PS C:\>$updatedService = Set-AzApiManagement -InputObject $apimService -PassThru
+PS C:\>$apimService = Set-AzApiManagement -InputObject $apimService -PassThru
 ```
 
-This command gets the API Management Premium SKU service, having regions in South Central US and North Central US. It then increases the Capacity of the North Central US region to 2 using the **Update-AzApiManagementRegion**. The next cmdlet Set-AzApiManagement applies the configuration change to the Api Management service.
+This command gets the API Management Premium SKU service, having regions in South Central US and North Central US. It then increases the Capacity of the North Central US region to 2 using the **Set-AzApiManagement**. The next cmdlet **Set-AzApiManagement** applies the configuration change to the Api Management service.
 
 ## PARAMETERS
 
@@ -165,4 +163,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 [Remove-AzApiManagementRegion](./Remove-AzApiManagementRegion.md)
 
-[Update-AzApiManagementDeployment](./Update-AzApiManagementDeployment.md)
+[Set-AzApiManagement](./Set-AzApiManagement.md)

src/Automation/Automation/ChangeLog.md

@@ -19,6 +19,7 @@
 -->
 ## Upcoming Release
 * Fixed example typo in reference documentation for `Register-AzAutomationDscNode`
+* Added clarification on OS restriction to Register-AzAutomationDSCNode
 
 ## Version 1.3.2
 * Fixed miscellaneous typos across module

src/Automation/Automation/help/Register-AzAutomationDscNode.md

@@ -9,7 +9,7 @@ schema: 2.0.0
 # Register-AzAutomationDscNode
 
 ## SYNOPSIS
-Registers an Azure virtual machine as a DSC node for an Automation account.
+Registers an Azure virtual machine running Windows OS as a DSC node for an Automation account.
 
 ## SYNTAX
 
@@ -22,7 +22,7 @@ Register-AzAutomationDscNode -AzureVMName <String> [-NodeConfigurationName <Stri
 ```
 
 ## DESCRIPTION
-The **Register-AzAutomationDscNode** cmdlet registers an Azure virtual machine as an APS Desired State Configuration (DSC) node in an Azure Automation account.
+The **Register-AzAutomationDscNode** cmdlet registers an Azure virtual machine as an APS Desired State Configuration (DSC) node in an Azure Automation account. This cmdlet will only register VMs running Windows OS as an Automation DSC Node for an account.
 
 If you need to register a node to an automation account in a different subscription,
 you will need to use an ARM template rather than cmdlets. 

src/EventGrid/EventGrid.Test/EventGrid.Test.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.5.0" />
     <PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
     <PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="12.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="13.1.0" />
   </ItemGroup>
 
 </Project>

src/Monitor/Monitor.Test/Alerts/NewAzureRmMetricAlertRuleV2CriteriaTests.cs

@@ -47,16 +47,47 @@ public void NewMetricAlertRuleV2CriteriaParametersProcessing()
             cmdlet.TimeAggregation = "Total";
             cmdlet.ExecuteCmdlet();
 
-            Func<PSMetricCriteria, bool> verify = r =>
+            Func<IPSMultiMetricCriteria, bool> verify = crit =>
             {
+                var r = crit as PSMetricCriteria;
                 Assert.Equal("PacketsInDDoS", r.MetricName);
                 Assert.Equal("GreaterThan", r.OperatorProperty);
                 Assert.Equal(2, r.Threshold);
                 Assert.Equal("Total", r.TimeAggregation);
                 return true;
             };
 
-            this.commandRuntimeMock.Verify(o => o.WriteObject(It.Is<PSMetricCriteria>(r => verify(r))), Times.Once);
+            this.commandRuntimeMock.Verify(o => o.WriteObject(It.Is<IPSMultiMetricCriteria>(r => verify(r))), Times.Once);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void NewDynamicMetricAlertRuleV2CriteriaParametersProcessing()
+        {
+            // Setting required parameter
+            cmdlet.MetricName = "PacketsInDDoS";
+            cmdlet.Operator = "GreaterOrLessThan";
+            cmdlet.TimeAggregation = "Total";
+            cmdlet.ThresholdSensitivity = "High";
+            cmdlet.ViolationCount= 2;
+            cmdlet.ExaminedAggregatedPointCount= 4;
+            cmdlet.IgnoreDataBefore = new DateTime(1,1,1);
+            cmdlet.DynamicThreshold = new SwitchParameter(true);
+            cmdlet.ExecuteCmdlet();
+
+            Func<IPSMultiMetricCriteria, bool> verify = crit =>
+            {
+                var r = crit as PSDynamicMetricCriteria;
+                Assert.Equal("PacketsInDDoS", r.MetricName);
+                Assert.Equal("GreaterOrLessThan", r.OperatorProperty);
+                Assert.Equal("Total", r.TimeAggregation);
+                Assert.Equal("High", r.AlertSensitivity);
+                Assert.Equal(2, r.FailingPeriods.MinFailingPeriodsToAlert);
+                Assert.Equal(4, r.FailingPeriods.NumberOfEvaluationPeriods);
+                return true;
+            };
+
+            this.commandRuntimeMock.Verify(o => o.WriteObject(It.Is<IPSMultiMetricCriteria>(r => verify(r))), Times.Once);
         }
     }
 }

src/Monitor/Monitor.Test/ScenarioTests/AlertsTests.cs

@@ -105,5 +105,12 @@ public void TestAddAzureRmMetricAlertRuleV2()
         {
             TestsController.NewInstance.RunPsTest(_logger, "Test-AddAzureRmMetricAlertRuleV2");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestAddAzureRmDynamicMetricAlertRuleV2()
+        {
+            TestsController.NewInstance.RunPsTest(_logger, "Test-AddAzureRmMetricAlertRuleV2-DynamicThreshold");
+        }
     }
 }

src/Monitor/Monitor.Test/ScenarioTests/AlertsTests.ps1

@@ -319,4 +319,41 @@ function Test-AddAzureRmMetricAlertRuleV2
 		Remove-AzureRmStorageAccount -ResourceGroupName $rgName -Name $resourceName
 		Remove-AzResourceGroup -Name $rgname -Force
     }
+}
+
+	<#
+.SYNOPSIS
+Tests adding a GenV2 dyanmic metric alert rule.
+#>
+function Test-AddAzureRmMetricAlertRuleV2-DynamicThreshold
+{
+	# Setup
+	$sub = Get-AzContext
+    $subscription = $sub.subscription.subscriptionId
+	$rgname = Get-ResourceGroupName
+	$location =Get-ProviderLocation ResourceManagement
+	$resourceName = Get-ResourceName
+	$ruleName = Get-ResourceName
+	$actionGroupName = Get-ResourceName
+	$targetResourceId = '/subscriptions/'+$subscription+'/resourceGroups/'+$rgname+'/providers/Microsoft.Storage/storageAccounts/'+$resourceName
+	New-AzResourceGroup -Name $rgname -Location $location -Force
+	New-AzStorageAccount -ResourceGroupName $rgname -Name $resourceName -Location $location -Type Standard_GRS
+	$email = New-AzActionGroupReceiver -Name 'user1' -EmailReceiver -EmailAddress '[email protected]'
+	$NewActionGroup =  Set-AzureRmActionGroup -Name $actionGroupName -ResourceGroup $rgname -ShortName ASTG -Receiver $email
+	$actionGroup = New-AzActionGroup -ActionGroupId $NewActionGroup.Id
+	$condition = New-AzMetricAlertRuleV2Criteria -MetricName "Transactions" -Operator GreaterThan -DynamicThreshold -TimeAggregation Total -Sensitivity High
+    try
+    {
+        # Test
+        $actual = Add-AzMetricAlertRuleV2 -Name $ruleName -ResourceGroupName $rgname -WindowSize 01:00:00 -Frequency 00:05:00 -TargetResourceId $targetResourceId -Condition $condition -ActionGroup $actionGroup -Severity 3 
+		Assert-AreEqual $actual.Name $ruleName
+    }
+    finally
+    {
+        # Cleanup
+        Remove-AzMetricAlertRuleV2 -ResourceGroupName $rgname -Name $ruleName
+		Remove-AzActionGroup -ResourceGroupName $rgname -Name $actionGroupName
+		Remove-AzureRmStorageAccount -ResourceGroupName $rgName -Name $resourceName
+		Remove-AzResourceGroup -Name $rgname -Force
+    }
 }

src/Monitor/Monitor.Test/ScenarioTests/ScheduledQueryRulesTests.ps1

@@ -16,6 +16,8 @@
 function Test-setup
 {
 	$global:ruleName = Get-ResourceName
+	$global:ruleName2 = Get-ResourceName
+	$global:ruleName3 = Get-ResourceName
 	$global:resourceGroupName = Get-ResourceGroupName
 	$global:location = Get-ProviderLocation("microsoft.insights")
 	$global:description = "SQR log alert rule"
@@ -237,15 +239,14 @@ function Test-PipingRemoveSetUpdateScheduledQueryRule
 		$retrieved = Get-AzScheduledQueryRule -ResourceGroup $resourceGroupName -Name $ruleName | Remove-AzScheduledQueryRule
 		Assert-Null $retrieved
 
-		$scheduledQueryRule = New-AzScheduledQueryRule -Location $location -Name $ruleName -ResourceGroupName $resourceGroupName -Action $alertingAction -Source $source -Enabled $enabled -Description $description -Schedule $schedule -Tag $tags
-		Verify-ScheduledQueryRule $scheduledQueryRule
+		$scheduledQueryRule = New-AzScheduledQueryRule -Location $location -Name $ruleName2 -ResourceGroupName $resourceGroupName -Action $alertingAction -Source $source -Enabled $enabled -Description $description -Schedule $schedule -Tag $tags
 
 		Write-Debug " ****** Removing Scheduled Query Rule by Resource Id"
-		$retrieved = Get-AzScheduledQueryRule -ResourceId $resourceId | Remove-AzScheduledQueryRule
+		$retrieved = Get-AzScheduledQueryRule -ResourceId $scheduledQueryRule.Id | Remove-AzScheduledQueryRule
 		Assert-Null $retrieved
 
-		$scheduledQueryRule = New-AzScheduledQueryRule -Location $location -Name $ruleName -ResourceGroupName $resourceGroupName -Action $alertingAction -Source $source -Enabled $enabled -Description $description -Schedule $schedule -Tag $tags
-		Verify-ScheduledQueryRule $scheduledQueryRule
+		$scheduledQueryRule = New-AzScheduledQueryRule -Location $location -Name $ruleName3 -ResourceGroupName $resourceGroupName -Action $alertingAction -Source $source -Enabled $enabled -Description $description -Schedule $schedule -Tag $tags
+		
 		Write-Debug " ****** Removing Scheduled Query Rules in ResourceGroup"
 		$retrieved = Get-AzScheduledQueryRule -ResourceGroupName $resourceGroupName | Remove-AzScheduledQueryRule
 		Assert-Null $retrieved