Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-roles-template-spec

Author: rolyon

articles/communication-services/quickstarts/voice-video-calling/get-resource-id.md

@@ -2,7 +2,7 @@
 ms.date: 09/07/2022 
 ms.topic: quickstart
 author: dbasantes
-title: How to find immutable azure resource id
+title: How to find immutable Azure resource ID
 ms.author: dbasantes
 ms.service: azure-communication-services
 description: how to find the immutable Azure Resource ID.

articles/communication-services/quickstarts/voice-video-calling/get-server-call-id.md

@@ -2,7 +2,7 @@
 ms.date: 09/07/2022 
 ms.topic: quickstart
 author: dbasantes
-title: Get server Call Id
+title: Get server Call ID
 ms.author: dbasantes
 ms.service: azure-communication-services
 description: This section describes how to get the serverCallid from a JavaScript server app

articles/dms/faq-mysql-single-to-flex.md

@@ -58,10 +58,10 @@ To support migrations of databases that are 1 TB+, raise a support ticket with A
 Azure Database Migration Service supports cross-region migrations, so you can migrate your single server to a flexible server that is deployed in a different region using DMS.  
 
 - **Is cross-subscription migration supported?**
-A. Azure Database Migration Service supports cross-subscription migrations, so you can migrate your single server to a flexible server that deployed on a different subscription using DMS.
+Azure Database Migration Service supports cross-subscription migrations, so you can migrate your single server to a flexible server that deployed on a different subscription using DMS.
 
 - **Is cross-resource group subscription supported?**
-A. Azure Database Migration Service supports cross-resource group migrations, so you can migrate your single server to a flexible server that is deployed in a different resource group using DMS.  
+Azure Database Migration Service supports cross-resource group migrations, so you can migrate your single server to a flexible server that is deployed in a different resource group using DMS.  
 
 - **Is there cross-version support?**
 Yes, migration from lower version MySQL servers (v5.6 and above) to higher versions is supported.

articles/load-testing/how-to-test-private-endpoint.md

@@ -6,7 +6,7 @@ services: load-testing
 ms.service: load-testing
 ms.author: nicktrog
 author: ntrogh
-ms.date: 08/05/2022
+ms.date: 09/09/2022
 ms.topic: how-to
 ms.custom: references_regions
 ---
@@ -48,24 +48,29 @@ These resources are ephemeral and exist only for the duration of the load test r
 - The virtual network must be in the same subscription as the Azure Load Testing resource.
 - The subnet you use for Azure Load Testing must have enough unassigned IP addresses to accommodate the number of load test engines for your test. Learn more about [configuring your test for high-scale load](./how-to-high-scale-load.md).
 - The subnet shouldn't be delegated to any other Azure service. For example, it shouldn't be delegated to Azure Container Instances (ACI). Learn more about [subnet delegation](/azure/virtual-network/subnet-delegation-overview).
+- Azure CLI version 2.2.0 or later (if you're using CI/CD). Run `az --version` to find the version that's installed on your computer. If you need to install or upgrade the Azure CLI, see [How to install the Azure CLI](/cli/azure/install-azure-cli).
 
 ## Configure your virtual network
 
-To test private endpoints, you need an Azure virtual network and at least one subnet. In this section, you'll configure your virtual network and subnet.
+To test private endpoints, you need an existing Azure virtual network. Your virtual network should have at least one subnet, and allow access for traffic coming from the Azure Load Testing service.
 
 ### Create a subnet
 
-When you deploy Azure Load Testing in your virtual network, it's recommended to use different subnets for Azure Load Testing and the application endpoint. This approach enables you to configure network traffic access specifically for each purpose. Learn more about how to [add a subnet to a virtual network](/azure/virtual-network/virtual-network-manage-subnet#add-a-subnet).
+When you deploy Azure Load Testing in your virtual network, it's recommended to use separate subnets for Azure Load Testing and for the application endpoint. This approach enables you to configure network traffic access policies specifically for each purpose. Learn more about how to [add a subnet to a virtual network](/azure/virtual-network/virtual-network-manage-subnet#add-a-subnet).
 
 ### Configure traffic access
 
-Azure Load Testing requires both inbound and outbound access for the injected VMs in your virtual network. If you plan to restrict traffic access to your virtual network, or are already using a network security group, configure the network security group for the subnet in which you deploy the load test.
+Azure Load Testing requires both inbound and outbound access for the injected VMs in your virtual network. If you plan to restrict traffic access to your virtual network, or if you're already using a network security group, configure the network security group for the subnet in which you deploy the load test.
 
-1. If you don't have an NSG yet, create one in the same region as your virtual network and associate it with your subnet. Follow these steps to [create a network security group](/azure/virtual-network/manage-network-security-group#create-a-network-security-group).
+1. Go to the [Azure portal](https://portal.azure.com).
 
-1. Go to the [Azure portal](https://portal.azure.com) to view your network security groups. Search for and select **Network security groups**.
+1. If you don't have an NSG yet, follow these steps to [create a network security group](/azure/virtual-network/manage-network-security-group#create-a-network-security-group).
 
-1. Select the name of your network security group.
+    Create the NSG in the same region as your virtual network, and then associate it with your subnet.
+
+1. Search for and select your network security group.
+
+    <!-- TODO: add screenshot of portal -->
 
 1. Select **Inbound security rules** in the left navigation.
 
@@ -126,32 +131,77 @@ For example, for an endpoint with IP address 10.179.0.7, in a virtual network wi
 </HTTPSamplerProxy>
 ```
 
-## Set up a load test
+## Configure your load test
 
-To create a load test for testing your private endpoint, you have to specify the virtual network details in the test creation wizard.
+To include privately hosted endpoints in your load test, you need to configure the virtual network settings for the load test. You can configure the VNET settings in the Azure portal, or specify them in the [YAML test configuration file](./reference-test-config-yaml.md) for CI/CD pipelines.
+
+> [!IMPORTANT]
+> When you deploy Azure Load Testing in a virtual network, you'll incur additional charges. Azure Load Testing deploys an [Azure Load Balancer](https://azure.microsoft.com/pricing/details/load-balancer/) and a [Public IP address](https://azure.microsoft.com/pricing/details/ip-addresses/) in your subscription and there might be a cost for generated traffic. For more information, see the [Virtual Network pricing information](https://azure.microsoft.com/pricing/details/virtual-network).
+
+### Configure the VNET in the Azure portal
+
+You can specify the VNET configuration settings in the load test creation/update wizard.
 
 1. Sign in to the [Azure portal](https://portal.azure.com) by using the credentials for your Azure subscription.
 
-1. Go to your Azure Load Testing resource, select **Tests** from the left pane, and then select **+ Create new test**.
-
-    :::image type="content" source="media/how-to-test-private-endpoint/create-new-test.png" alt-text="Screenshot that shows the Azure Load Testing page and the button for creating a new test.":::
+1. Go to your Azure Load Testing resource, and select **Tests** from the left pane.
 
-1. On the **Basics** tab, enter the **Test name** and **Test description** information. Optionally, you can select the **Run test after creation** checkbox.
+1. Open the load test creation/update wizard in either of two ways:
 
-    :::image type="content" source="media/how-to-test-private-endpoint/create-new-test-basics.png" alt-text="Screenshot that shows the 'Basics' tab for creating a test.":::
+    - Select **+ Create > Upload a JMeter script**, if you want to create a new test.
 
-1. On the **Test plan** tab, select your Apache JMeter script, and then select **Upload** to upload the file to Azure.
+        :::image type="content" source="media/how-to-test-private-endpoint/create-new-test.png" alt-text="Screenshot that shows the Tests page, highlighting the button for creating a new test.":::
+    
+    - Select an existing test from the list, and then select **Edit**.
 
-    You can select and upload other Apache JMeter configuration files or other files that are referenced in the JMX file. For example, if your test script uses CSV data sets, you can upload the corresponding *.csv* file(s).
+        :::image type="content" source="media/how-to-test-private-endpoint/edit-test.png" alt-text="Screenshot that shows the Tests page, highlighting the button for editing a test.":::
+    
+1. Review or fill the load test information. Follow these steps to [create or manage a test](./how-to-create-manage-test.md).
 
 1. On the **Load** tab, select **Private** traffic mode, and then select your virtual network and subnet.
 
-    :::image type="content" source="media/how-to-test-private-endpoint/create-new-test-load-vnet.png" alt-text="Screenshot that shows the 'Load' tab for creating a test.":::
+    If you have multiple subnets in your virtual network, make sure to select the subnet that will host the injected test engine VMs.
+
+    :::image type="content" source="media/how-to-test-private-endpoint/create-new-test-load-vnet.png" alt-text="Screenshot that shows the Load tab for creating or updating a load test.":::
+
+1. Select **Review + create** and then **Create** (or **Apply**, when updating an existing test).
+
+    When the load test starts, Azure Load Testing injects the test engine VMs in your virtual network and subnet. The test script can now access the privately hosted application endpoint in your VNET.
+
+### Configure the VNET for CI/CD pipelines
+
+To configure the load test with your virtual network settings, update the [YAML test configuration file](./reference-test-config-yaml.md).
+
+1. Open a terminal, and use the Azure CLI to sign in to your Azure subscription:
+
+    ```azurecli
+    az login
+    az account set --subscription <your-Azure-Subscription-ID>
+    ```
+1. Retrieve the subnet ID and copy the resulting value:
+
+    ```azurecli
+    az network vnet subnet show -g <your-resource-group> --vnet-name <your-vnet-name> --name <your-subnet-name> --query id
+    ```
+
+1. Open your YAML test configuration file in your favorite editor.
+
+1. Add the `subnetId` property to the configuration file and provide the subnet ID you copied earlier:
+
+    ```yml
+    version: v0.1
+    testName: SampleTest
+    testPlan: SampleTest.jmx
+    description: 'Load test the website home page'
+    engineInstances: 1
+    subnetId: <your-subnet-id>
+    ```
+
+    For more information about the YAML configuration, see [test configuration YAML reference](./reference-test-config-yaml.md).
+
+1. Save the YAML configuration file, and commit your changes to the source code repository.
 
-    > [!IMPORTANT]
-    > When you deploy Azure Load Testing in a virtual network, you'll incur additional charges. Azure Load Testing deploys an [Azure Load Balancer](https://azure.microsoft.com/pricing/details/load-balancer/) and a [Public IP address](https://azure.microsoft.com/pricing/details/ip-addresses/) in your subscription and there might be a cost for generated traffic. For more information, see the [Virtual Network pricing information](https://azure.microsoft.com/pricing/details/virtual-network).
-        
-1. Select **Review + create**. Review all settings, and then select **Create** to create the load test.
+1. After the CI/CD workflow triggers, your load test starts, and can now access the privately hosted application endpoint in your VNET.
 
 ## Troubleshooting
 

articles/load-testing/media/how-to-test-private-endpoint/create-new-test-basics.png

@@ -30,6 +30,7 @@ A test configuration uses the following keys:
 | `engineInstances` | integer |  | *Required*. Number of parallel instances of the test engine to execute the provided test plan. You can update this property to increase the amount of load that the service can generate. |
 | `configurationFiles` | array |  | List of relevant configuration files or other files that you reference in the Apache JMeter script. For example, a CSV data set file, images, or any other data file. These files will be uploaded to the Azure Load Testing resource alongside the test script. If the files are in a subfolder on your local machine, use file paths that are relative to the location of the test script. <BR><BR>Azure Load Testing currently doesn't support the use of file paths in the JMX file. When you reference an external file in the test script, make sure to only specify the file name. |
 | `description` | string |  | Short description of the test run. |
+| `subnetId` | string |  | Resource ID of the subnet for testing privately hosted endpoints (VNET injection). This subnet will host the injected test engine VMs. For more information, see [how to load test privately hosted endpoints](./how-to-test-private-endpoint.md). |
 | `failureCriteria` | object |  | Criteria that indicate when a test should fail. The structure of a pass/fail criterion is: `Request: Aggregate_function (client_metric) condition threshold`. For more information on the supported values, see [Load test pass/fail criteria](./how-to-define-test-criteria.md#load-test-passfail-criteria). |
 | `properties` | object |  | List of properties to configure the load test. |
 | `properties.userPropertyFile` | string |  | File to use as an Apache JMeter [user properties file](https://jmeter.apache.org/usermanual/test_plan.html#properties). The file will be uploaded to the Azure Load Testing resource alongside the JMeter test script and other configuration files. If the file is in a subfolder on your local machine, use a path relative to the location of the test script. |
@@ -50,6 +51,7 @@ testName: SampleTest
 testPlan: SampleTest.jmx
 description: Load test website home page
 engineInstances: 1
+subnetId: /subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/sample-rg/providers/Microsoft.Network/virtualNetworks/load-testing-vnet/subnets/load-testing
 properties:
   userPropertyFile: 'user.properties'
 configurationFiles: