Peer VNet & Cleanup

spelluru · spelluru · commit a249766d5ff0 · 2020-05-15T17:19:27.000-04:00
diff --git a/articles/lab-services/classroom-labs/TOC.yml b/articles/lab-services/classroom-labs/TOC.yml
@@ -28,6 +28,24 @@
     items:  
     - name: Use labs for conducting classes
       href: classroom-labs-scenarios.md
+    - name: Classroom labs - class types
+      items:
+      - name: Class types overview
+        href: class-types.md
+      - name: Deep learning in natural language processing
+        href: class-type-deep-learning-natural-language-processing.md
+      - name: Shell scripting on Linux
+        href: class-type-shell-scripting-linux.md
+      - name: Ethical hacking
+        href: class-type-ethical-hacking.md
+      - name: Database management
+        href: class-type-database-management.md
+      - name: Python and Jupyter Notebooks
+        href: class-type-jupyter-notebook.md
+      - name: Mobile app development with Android Studio
+        href: class-type-mobile-dev-android-studio.md
+      - name: Big data analytics
+        href: class-type-big-data-analytics.md
 - name: How-to guides
   items:
   - name: Administrator guide
@@ -36,29 +54,14 @@
     href: account-setup-guide.md
   - name: Accelerated lab set up guide
     href: setup-guide.md
-  - name: Classroom labs - class types
-    items:
-    - name: Class types overview
-      href: class-types.md
-    - name: Deep learning in natural language processing
-      href: class-type-deep-learning-natural-language-processing.md
-    - name: Shell scripting on Linux
-      href: class-type-shell-scripting-linux.md
-    - name: Ethical hacking
-      href: class-type-ethical-hacking.md
-    - name: Database management
-      href: class-type-database-management.md
-    - name: Python and Jupyter Notebooks
-      href: class-type-jupyter-notebook.md
-    - name: Mobile app development with Android Studio
-      href: class-type-mobile-dev-android-studio.md
-    - name: Big data analytics
-      href: class-type-big-data-analytics.md
   - name: Create and configure lab accounts (lab account owner)
     items:
     - name: Create and manage lab accounts
       href: how-to-manage-lab-accounts.md
-    - name: Configure lab accounts
+    - name: Manage labs in a lab account
+      href: manage-labs-lab-account.md
+      href: how-to-manage-lab-accounts.md      
+    - name: Configure automatic shutdown of VMs
       href: how-to-configure-lab-accounts.md
     - name: Add a lab creator
       href: add-lab-creator.md
diff --git a/articles/lab-services/classroom-labs/how-to-configure-lab-accounts.md b/articles/lab-services/classroom-labs/how-to-configure-lab-accounts.md
@@ -1,6 +1,6 @@
 ---
-title: Configure lab accounts in Azure Lab Services | Microsoft Docs
-description: This article describes how to create a lab account, view all lab accounts, or delete a lab account in Azure Lab Services. 
+title: Configure automatic shutdown of VMs in Azure Lab Services
+description: This article describes how to configure automatic shutdown of VMs in the lab account. 
 services: lab-services
 documentationcenter: na
 author: spelluru
@@ -12,50 +12,24 @@ ms.workload: na
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 02/14/2020
+ms.date: 05/15/2020
 ms.author: spelluru
 
 ---
-# Configure lab accounts in Azure Lab Services 
-In Azure Lab Services, a lab account is a container for managed lab types such as classroom labs. An administrator sets up a lab account with Azure Lab Services and provides access to lab owners who can create labs in the account. 
+# Configure automatic shutdown of VMs on disconnect setting for a lab account
+You can enable or disable automatic shutdown of Windows lab VMs (template or student) after a remote desktop connection is disconnected. You can also specify how long Lab Services should wait for the user to reconnect before automatically shutting down.
 
-This article shows how to perform the following tasks: 
-
-- Specify an address range for VMs in the lab
-- Configure automatic shutdown of VMs on disconnect
-
-## Specify an address range for VMs in the lab
-The following procedure has steps to specify an address range for VMs in the lab. If you update the range that you previously specified, the modified address range applies only to VMs that are created after the change was made. 
-
-Here are some restrictions when specifying the address range that you should keep in mind. 
-
-- The prefix must be smaller than or equal to 23. 
-- If a virtual network is peered to the lab account, the provided address range cannot overlap with address range from peered virtual network.
+## Enable automatic shutdown
 
 1. On the **Lab Account** page, select **Labs settings** on the left menu.
-2. For the **Address range** field, specify the address range for VMs that will be created in the lab. The address range should be in the classless inter-domain routing (CIDR) notation (example: 10.20.0.0/23). Virtual machines in the lab will be created in this address range.
-
-    > [!NOTE]
-    > The Address range property only applies if Peer virtual network is enabled for the lab. 
-3. Select **Save** on the toolbar. 
+2. Select the **Automatically shut down virtual machines when users disconnect** option.
+3. Specify how long Lab Services should wait for the user to reconnect before automatically shutting down the VMs.
 
-    ![Configure address range](../media/how-to-manage-lab-accounts/labs-configuration-page-address-range.png)
+    ![Automatic shutdown setting at lab account](../media/how-to-configure-lab-accounts/automatic-shutdown-vm-disconnect.png)
 
+    This setting applies to all the labs created in the lab account. A lab creator (educator) can override this setting at the lab level. The change to this setting at the lab account will only affect labs that are created after the change is made.
 
-## Automatic shutdown of VMs on disconnect
-You can enable or disable automatic shutdown of Windows lab VMs (template or student) after a remote desktop connection is disconnected. You can also specify how long the VMs should wait for the user to reconnect before automatically shutting down.
-
-![Automatic shutdown setting at lab account](../media/how-to-configure-lab-accounts/automatic-shutdown-vm-disconnect.png)
-
-This setting applies to all the labs created in the lab account. A lab owner can override this setting at the lab level. The change to this setting at the lab account will only affect labs that are created after the change is made.
-
-To learn about how a lab owner can configure this setting at the lab level, see [this article](how-to-enable-shutdown-disconnect.md)
+    To disable this setting, uncheck the checkbox for the **Automatically shutdown virtual machines when users disconnect** option on this page. 
 
 ## Next steps
-See the following articles:
-
-- [Allow lab creator to pick lab location](allow-lab-creator-pick-lab-location.md)
-- [Connect your lab's network with a peer virtual network](how-to-connect-peer-virtual-network.md)
-- [Attach a shared image gallery to a lab](how-to-attach-detach-shared-image-gallery.md)
-- [Add a user as a lab owner](how-to-add-user-lab-owner.md)
-- [View firewall settings for a lab](how-to-configure-firewall-settings.md)
+To learn about how a lab owner can configure or override this setting at the lab level, see [this article](how-to-enable-shutdown-disconnect.md)
diff --git a/articles/lab-services/classroom-labs/how-to-connect-peer-virtual-network.md b/articles/lab-services/classroom-labs/how-to-connect-peer-virtual-network.md
@@ -1,6 +1,6 @@
 ---
 title: Connect to a peer network in Azure Lab Services | Microsoft Docs
-description: Learn how to connect your lab network with another network as a peer. For example, connect your on-premises school/university network with Lab's virtual network in Azure.  
+description: Learn how to connect your lab network with another network as a peer. For example, connect your on-premises organization/university network with Lab's virtual network in Azure.  
 services: lab-services
 documentationcenter: na
 author: spelluru
@@ -12,7 +12,7 @@ ms.workload: na
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 03/31/2020
+ms.date: 05/15/2020
 ms.author: spelluru
 
 ---
@@ -43,11 +43,16 @@ During the new [lab account creation](tutorial-setup-lab-account.md), you can pi
 
 ### Address range
 
-There is also an option to provide **Address range** for virtual machines for the labs.  The **Address range** property only applies if **Peer virtual network** is enabled for the lab.  If the address range is provided, all the virtual machines in the labs under the lab account will be created in that address range. The address range should be in CIDR notation (e.g. 10.20.0.0/20) and not overlap with any existing address ranges.  When providing an address range, it's important to think about the number of *labs* that will be created and provide an address range to accommodate that. Lab Services assumes a maximum of 512 virtual machines per lab.  For example, an ip range with '/23' can create only one lab.  A range with a '/21' will allow for the creation of four labs.
+There is also an option to provide **Address range** for virtual machines for the labs.  The **address range** property applies only if a **peer virtual network** is enabled for the lab. If the address range is provided, all the virtual machines in the labs under the lab account will be created in that address range. The address range should be in CIDR notation (for example, 10.20.0.0/20) and not overlap with any existing address ranges.  When providing an address range, it's important to think about the number of *labs* that will be created and provide an address range to accommodate that. Lab Services assumes a maximum of 512 virtual machines per lab.  For example, an ip range with '/23' can create only one lab.  A range with a '/21' will allow for the creation of four labs.
 
 If the **Address range** is not specified, Lab Services will use the default address range given to it by Azure when creating the virtual network to be peered with your virtual network.  The range is often something like 10.x.0.0/16.  This may lead to ip range overlap, so make sure to either specify an address range in the lab settings or check the address range of your virtual network being peered.
 
-## Configure after the lab is created
+> [!NOTE]
+> Lab creation can fail if the lab account is peered to a virtual network but has too narrow of an IP address range. You can run out of space in the address range if there are too many labs in the lab account (each lab uses 512 addresses). 
+> 
+> If the lab creation fails, contact your lab account owner/admin and request for the address range to be increased. The admin can increase the address range using steps mentioned in the [Specify an address range for VMs in a lab account](#specify-an-address-range-for-vms-in-the-lab-account) section. 
+
+## Configure after the lab account is created
 
 The same property can be enabled from the **Labs configuration** tab of the **Lab Account** page if you didn't set up a peer network at the time of lab account creation. Change made to this setting applies only to the labs that are created after the change. As you can see in the image, you can enable or disable **Peer virtual network** for labs in the lab account.
 
@@ -58,6 +63,21 @@ When you select a virtual network for the **Peer virtual network** field, the **
 > [!IMPORTANT]
 > The peered virtual network setting applies only to labs that are created after the change is made, not to the existing labs.
 
+
+## Specify an address range for VMs in the lab account
+The following procedure has steps to specify an address range for VMs in the lab. If you update the range that you previously specified, the modified address range applies only to VMs that are created after the change was made. 
+
+Here are some restrictions when specifying the address range that you should keep in mind. 
+
+- The prefix must be smaller than or equal to 23. 
+- If a virtual network is peered to the lab account, the provided address range cannot overlap with address range from peered virtual network.
+
+1. On the **Lab Account** page, select **Labs settings** on the left menu.
+2. For the **Address range** field, specify the address range for VMs that will be created in the lab. The address range should be in the classless inter-domain routing (CIDR) notation (example: 10.20.0.0/23). Virtual machines in the lab will be created in this address range.
+3. Select **Save** on the toolbar. 
+
+    ![Configure address range](../media/how-to-manage-lab-accounts/labs-configuration-page-address-range.png)
+
 ## Next steps
 
 See the following articles:
diff --git a/articles/lab-services/classroom-labs/how-to-enable-shutdown-disconnect.md b/articles/lab-services/classroom-labs/how-to-enable-shutdown-disconnect.md
@@ -12,15 +12,15 @@ ms.workload: na
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 12/13/2019
+ms.date: 05/15/2020
 ms.author: spelluru
 
 ---
 
 # Enable automatic shutdown of VMs on disconnect
 This article shows you how you can enable or disable automatic shutdown of **Windows 10** lab VMs (template or student) after a remote desktop connection is disconnected. You can also specify how long the VMs should wait for the user to reconnect before automatically shutting down.
 
-A lab account administrator can configure this setting for the lab account in which you create labs. For more information, see [Configure automatic shutdown of VMs on disconnect for a lab account](how-to-configure-lab-accounts.md#automatic-shutdown-of-vms-on-disconnect). As a lab owner, you can override the setting when creating a lab or after the lab is created. 
+A lab account administrator can configure this setting for the lab account in which you create labs. For more information, see [Configure automatic shutdown of VMs on disconnect for a lab account](how-to-configure-lab-accounts.md). As a lab owner, you can override the setting when creating a lab or after the lab is created. 
 
 ## Configure when creating a lab
 On the step 3 page of lab creation wizard, you can enable or disable this feature and also specify how long the VM should wait for the user to reconnect before automatically shutting down. 
diff --git a/articles/lab-services/classroom-labs/how-to-manage-lab-accounts.md b/articles/lab-services/classroom-labs/how-to-manage-lab-accounts.md
@@ -12,7 +12,7 @@ ms.workload: na
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 02/14/2020
+ms.date: 05/15/2020
 ms.author: spelluru
 
 ---
@@ -41,7 +41,10 @@ The following steps illustrate how to use the Azure portal to create a lab accou
     1. Select an existing **shared image gallery** or create one. You can save the template VM in the shared image gallery for it to be reused by others. For detailed information on shared image galleries, see [Use a shared image gallery in Azure Lab Services](how-to-use-shared-image-gallery.md).
     2. Specify whether you want to **automatically shut down Windows virtual machines** when users disconnect from them. Specify how long the virtual machines should wait for the user to reconnect before automatically shutting down. 
     3. For **Peer virtual network**, select a peer virtual network (VNet) for the lab network. Labs created in this account are connected to the selected VNet and have access to the resources in the selected VNet. For more information, see [Connect your lab's virtual network with a peer virtual network](how-to-connect-peer-virtual-network.md).    
-    8. Specify an **address range** for VMs in the lab. The address range should be in the classless inter-domain routing (CIDR) notation (example: 10.20.0.0/23). Virtual machines in the lab will be created in this address range. For more information, see [Specify an address range for VMs in the lab](how-to-configure-lab-accounts.md#specify-an-address-range-for-vms-in-the-lab)  
+    8. Specify an **address range** for VMs in the lab. The address range should be in the classless inter-domain routing (CIDR) notation (example: 10.20.0.0/23). Virtual machines in the lab will be created in this address range. For more information, see [Specify an address range for VMs in the lab](how-to-connect-peer-virtual-network.md#specify-an-address-range-for-vms-in-the-lab-account)  
+
+        > [!NOTE]
+        > The **address range** property applies only if a **peer virtual network** is enabled for the lab.
 
         ![Create lab account -> Advanced](../media/how-to-manage-lab-accounts/create-lab-account-advanced.png)  
 6. Select **Next: Tags** at the bottom of the page to switch to the **Tags** tab. Add any tags you want to associate with the lab account. Tags are name/value pairs that enable you to categorize resources and view consolidated billing by applying the same tag to multiple resources and resource groups. For more information, see [Use tags to organize your Azure resources](../../azure-resource-manager/management/tag-resources.md).
@@ -70,28 +73,6 @@ The following steps illustrate how to use the Azure portal to create a lab accou
 
     ![All resources -> Lab Accounts](../media/how-to-manage-lab-accounts/all-resources-lab-accounts.png)
 
-## View and manage labs in the lab account
-
-1. On the **Lab Account** page, select **All labs** on the left menu.
-
-    ![Labs in the account](../media/how-to-manage-lab-accounts/labs-in-account.png)
-1. You see a **list of labs** in the account with the following information: 
-    1. Name of the lab.
-    2. The date on which the lab was created. 
-    3. Email address of the user who created the lab. 
-    4. Maximum number of users allowed into the lab. 
-    5. Status of the lab. 
-    6. Role assignments. 
-
-## Delete a lab in the lab account
-Follow instructions in the previous section to see a list of the labs in the lab account.
-
-1. Select **... (ellipsis)**, and select **Delete**. 
-
-    ![Delete a lab - button](../media/how-to-manage-lab-accounts/delete-lab-button.png)
-2. Select **Yes** on the warning message. 
-
-    ![Confirm lab deletion](../media/how-to-manage-lab-accounts/confirm-lab-delete.png)
 
 ## Delete a lab account
 Follow instructions from the previous section that displays lab accounts in a list. Use the following instructions to delete a lab account: 
@@ -109,11 +90,4 @@ Follow instructions from the previous section that displays lab accounts in a li
 > You can also use the Az.LabServices PowerShell module (preview) to manage lab accounts. For more information, see the [Az.LabServices home page on GitHub](https://github.com/Azure/azure-devtestlab/tree/master/samples/ClassroomLabs/Modules/Library).
 
 ## Next steps
-See the following articles:
-
-- [Allow lab creator to pick lab location](allow-lab-creator-pick-lab-location.md)
-- [Connect your lab's network with a peer virtual network](how-to-connect-peer-virtual-network.md)
-- [Attach a shared image gallery to a lab](how-to-attach-detach-shared-image-gallery.md)
-- [Add a user as a lab owner](how-to-add-user-lab-owner.md)
-- [View firewall settings for a lab](how-to-configure-firewall-settings.md)
-- [Configure other settings for a lab](how-to-configure-lab-accounts.md)
+See other articles in the **How-to guides** -> **Create and configure lab accounts (lab account owner)** section of the table-of-content (TOC). 
diff --git a/articles/lab-services/classroom-labs/manage-labs-lab-account.md b/articles/lab-services/classroom-labs/manage-labs-lab-account.md
@@ -0,0 +1,46 @@
+---
+title: View and delete labs in a lab account in Azure Lab Services
+description: Learn how to view all labs in a lab account and delete a lab from the lab account. 
+services: lab-services
+documentationcenter: na
+author: spelluru
+manager: 
+editor: ''
+
+ms.service: lab-services
+ms.workload: na
+ms.tgt_pltfrm: na
+ms.devlang: na
+ms.topic: article
+ms.date: 05/15/2020
+ms.author: spelluru
+
+---
+# View and delete labs in a lab account
+This article shows you how a lab account owner or administrator can view all the labs in a lab account, and delete a lab in the lab account. 
+
+## View labs in a lab account
+
+1. On the **Lab Account** page, select **All labs** on the left menu.
+
+    ![Labs in the account](../media/how-to-manage-lab-accounts/labs-in-account.png)
+1. You see a **list of labs** in the account with the following information: 
+    1. Name of the lab.
+    2. The date on which the lab was created. 
+    3. Email address of the user who created the lab. 
+    4. Maximum number of users allowed into the lab. 
+    5. Status of the lab. 
+    6. Role assignments. 
+
+## Delete a lab in a lab account
+Follow instructions in the previous section to see a list of the labs in the lab account.
+
+1. Select **... (ellipsis)**, and select **Delete**. 
+
+    ![Delete a lab - button](../media/how-to-manage-lab-accounts/delete-lab-button.png)
+2. Select **Yes** on the warning message. 
+
+    ![Confirm lab deletion](../media/how-to-manage-lab-accounts/confirm-lab-delete.png)
+
+## Next steps
+See other articles in the **How-to guides** -> **Create and configure lab accounts (lab account owner)** section of the table-of-content (TOC). 
