markup comments

Author: nsant15

articles/private-5g-core/collect-required-information-for-a-site.md

@@ -61,28 +61,28 @@ Collect all the values in the following table to define the packet core instance
    |---------|---------|
    | The IP address for the control plane interface on the access network. For 5G, this interface is the N2 interface; for 4G, it's the S1-MME interface; for combined 4G and 5G, it's the N2 and S1-MME interfaces. You identified this address in [Allocate subnets and IP addresses](complete-private-mobile-network-prerequisites.md#allocate-subnets-and-ip-addresses). </br></br> This IP address must match the value you used when deploying the AKS-HCI cluster on your Azure Stack Edge Pro device. You did this as part of the steps in [Order and set up your Azure Stack Edge Pro device(s)](complete-private-mobile-network-prerequisites.md#order-and-set-up-your-azure-stack-edge-pro-devices). |**N2 address (Signaling)** (for 5G), **S1-MME address** (for 4G), or **S1-MME/N2 address (Signaling)** (for combined 4G and 5G). |
    | The virtual network name on port 5 on your Azure Stack Edge Pro device corresponding to the control plane interface on the access network. For 5G, this interface is the N2 interface; for 4G, it's the S1-MME interface; for combined 4G and 5G, it's the N2/S1-MME interface; for combined 4G and 5G, it's the N2/S1-MME interface. | **ASE N2 virtual subnet** (for 5G), **ASE S1-MME virtual subnet** (for 4G), or **ASE N2/S1-MME virtual subnet** (for combined 4G and 5G). |
-   | (in VLAN-trunking mode) The ID number of the VLAN for the N2 network | S1-MME/N2 VLAN ID |
-   | (in VLAN-trunking mode) The subnet for the IP address configured for the N2 interface e.g. 10.232.44.0/24 | S1-MME/N2 subnet |
-   | (in VLAN-trunking mode) The gateway for the IP address configured for the N2 interface e.g. 10.232.44.1. If the subnet does not have a default gateway, use another IP address in the subnet which will respond to ARP requests (such as one of the RAN IP addresses). If there's more than one gNB connected via a switch, choose one of the IP addresses for the gateway. | S1-MME/N2 gateway |
+   | The ID number of the VLAN for the N2 network | S1-MME/N2 VLAN ID |
+   | The subnet for the IP address configured for the N2 interface e.g. 10.232.44.0/24 | S1-MME/N2 subnet |
+   | The gateway for the IP address configured for the N2 interface e.g. 10.232.44.1. If the subnet does not have a default gateway, use another IP address in the subnet which will respond to ARP requests (such as one of the RAN IP addresses). If there's more than one gNB connected via a switch, choose one of the IP addresses for the gateway. | S1-MME/N2 gateway |
    | The virtual network name on port 5 on your Azure Stack Edge Pro device corresponding to the user plane interface on the access network. For 5G, this interface is the N3 interface; for 4G, it's the S1-U interface; for combined 4G and 5G, it's the N3/S1-U interface. | **ASE N3 virtual subnet** (for 5G), **ASE S1-U virtual subnet** (for 4G), or **ASE N3/S1-U virtual subnet** (for combined 4G and 5G). |
-   | (in VLAN-trunking mode) The ID number of the VLAN for the N3 network | S1-U/N3 VLAN ID |
-   | (in VLAN-trunking mode) The local IP address for the N3 interface | S1-U/N3 address |
-   | (in VLAN-trunking mode) The subnet for the IP address configured for the N3 interface e.g. 10.232.44.0/24 | S1-U/N3 subnet |
-   | (in VLAN-trunking mode) The gateway for the IP address configured for the N3 interface e.g. 10.232.44.1. If the subnet does not have a default gateway, use another IP address in the subnet which will respond to ARP requests (such as one of the RAN IP addresses). If there's more than one gNB connected via a switch, choose one of the IP addresses for the gateway. | S1-U/N3 gateway |
+   | The ID number of the VLAN for the N3 network | S1-U/N3 VLAN ID |
+   | The local IP address for the N3 interface | S1-U/N3 address |
+   | The subnet for the IP address configured for the N3 interface e.g. 10.232.44.0/24 | S1-U/N3 subnet |
+   | The gateway for the IP address configured for the N3 interface e.g. 10.232.44.1. If the subnet does not have a default gateway, use another IP address in the subnet which will respond to ARP requests (such as one of the RAN IP addresses). If there's more than one gNB connected via a switch, choose one of the IP addresses for the gateway. | S1-U/N3 gateway |
 :::zone-end
 :::zone pivot="ase-pro-2"
    |Value  |Field name in Azure portal  |
    |---------|---------|
    | The IP address for the control plane interface on the access network. For 5G, this interface is the N2 interface; for 4G, it's the S1-MME interface; for combined 4G and 5G, it's the N2 and S1-MME interfaces. You identified this address in [Allocate subnets and IP addresses](complete-private-mobile-network-prerequisites.md?pivots=ase-pro-2#allocate-subnets-and-ip-addresses). </br></br> This IP address must match the value you used when deploying the AKS-HCI cluster on your Azure Stack Edge Pro device. You did this as part of the steps in [Order and set up your Azure Stack Edge Pro device(s)](complete-private-mobile-network-prerequisites.md?pivots=ase-pro-2#order-and-set-up-your-azure-stack-edge-pro-devices). |**N2 address (Signaling)** (for 5G), **S1-MME address** (for 4G), or **S1-MME/N2 address (Signaling)** (for combined 4G and 5G). |
    | The virtual network name on port 3 on your Azure Stack Edge Pro 2 corresponding to the control plane interface on the access network. For 5G, this interface is the N2 interface; for 4G, it's the S1-MME interface; for combined 4G and 5G, it's the N2/S1-MME interface. | **ASE N2 virtual subnet** (for 5G), **ASE S1-MME virtual subnet** (for 4G), or **ASE N2/S1-MME virtual subnet** (for combined 4G and 5G). |
-   | (in VLAN-trunking mode) The ID number of the VLAN for the N2 network | S1-MME/N2 VLAN ID |
-   | (in VLAN-trunking mode) The subnet for the IP address configured for the N2 interface e.g. 10.232.44.0/24 | S1-MME/N2 subnet |
-   | (in VLAN-trunking mode) The gateway for the IP address configured for the N2 interface e.g. 10.232.44.1. If the subnet does not have a default gateway, use another IP address in the subnet which will respond to ARP requests (such as one of the RAN IP addresses). If there's more than one gNB connected via a switch, choose one of the IP addresses for the gateway. | S1-MME/N2 gateway |
-   | The virtual network name on port 5 on your Azure Stack Edge Pro 2 corresponding to the user plane interface on the access network. For 5G, this interface is the N3 interface; for 4G, it's the S1-U interface; for combined 4G and 5G, it's the N3/S1-U interface. | **ASE N3 virtual subnet** (for 5G), **ASE S1-U virtual subnet** (for 4G), or **ASE N3/S1-U virtual subnet** (for combined 4G and 5G). |
-   | (in VLAN-trunking mode) The ID number of the VLAN for the N3 network | S1-U/N3 VLAN ID |
-   | (in VLAN-trunking mode) The local IP address for the N3 interface | S1-U/N3 address |
-   | (in VLAN-trunking mode) The subnet for the IP address configured for the N3 interface e.g. 10.232.44.0/24 | S1-U/N3 subnet |
-   | (in VLAN-trunking mode) The gateway for the IP address configured for the N3 interface e.g. 10.232.44.1. If the subnet does not have a default gateway, use another IP address in the subnet which will respond to ARP requests (such as one of the RAN IP addresses). If there's more than one gNB connected via a switch, choose one of the IP addresses for the gateway. | S1-U/N3 gateway |
+   | The ID number of the VLAN for the N2 network | S1-MME/N2 VLAN ID |
+   | The subnet for the IP address configured for the N2 interface e.g. 10.232.44.0/24 | S1-MME/N2 subnet |
+   | The gateway for the IP address configured for the N2 interface e.g. 10.232.44.1. If the subnet does not have a default gateway, use another IP address in the subnet which will respond to ARP requests (such as one of the RAN IP addresses). If there's more than one gNB connected via a switch, choose one of the IP addresses for the gateway. | S1-MME/N2 gateway |
+   | The virtual network name on port 3 on your Azure Stack Edge Pro 2 corresponding to the user plane interface on the access network. For 5G, this interface is the N3 interface; for 4G, it's the S1-U interface; for combined 4G and 5G, it's the N3/S1-U interface. | **ASE N3 virtual subnet** (for 5G), **ASE S1-U virtual subnet** (for 4G), or **ASE N3/S1-U virtual subnet** (for combined 4G and 5G). |
+   | The ID number of the VLAN for the N3 network | S1-U/N3 VLAN ID |
+   | The local IP address for the N3 interface | S1-U/N3 address |
+   | The subnet for the IP address configured for the N3 interface e.g. 10.232.44.0/24 | S1-U/N3 subnet |
+   | The gateway for the IP address configured for the N3 interface e.g. 10.232.44.1. If the subnet does not have a default gateway, use another IP address in the subnet which will respond to ARP requests (such as one of the RAN IP addresses). If there's more than one gNB connected via a switch, choose one of the IP addresses for the gateway. | S1-U/N3 gateway |
 :::zone-end
 
 ## Collect UE usage tracking values
@@ -111,9 +111,9 @@ For each data network that you want to configure, collect all the values in the
    |Value  |Field name in Azure portal  |
    |---------|---------|
    | The name of the data network. This could be an existing data network or a new one you'll create during packet core configuration.                 |**Data network name**|
-   | The ID number of the VLAN for the data network | SGi/N6 VLAN IDA |
+   | The ID number of the VLAN for the data network | SGi/N6 VLAN ID |
    | The IP address of the N6 interface | SGi/N6 address |
-   | The virtual network name on port 6 (or port 5 if you plan to have more than six data networks) on your Azure Stack Edge Pro GPU device corresponding to the user plane interface on the data network. For 5G, this interface is the N6 interface; for 4G, it's the SGi interface; for combined 4G and 5G, it's the N6/SGi interface. | **ASE N6 virtual subnet** (for 5G) or **ASE SGi virtual subnet** (for 4G), or **ASE N6/SGi virtual subnet** (for combined 4G and 5G). |
+   | __THIS LINE NEEDS CHANGING AND PULLING OUT FROM THE LIST. THERE IS NOW A VIRTUAL NETWORK NAME SHARED ACROSS ALL DATA NETWORKS__ The virtual network name on port 6 (or port 5 if you plan to have more than six data networks) on your Azure Stack Edge Pro GPU device corresponding to the user plane interface on the data network. For 5G, this interface is the N6 interface; for 4G, it's the SGi interface; for combined 4G and 5G, it's the N6/SGi interface. | **ASE N6 virtual subnet** (for 5G) or **ASE SGi virtual subnet** (for 4G), or **ASE N6/SGi virtual subnet** (for combined 4G and 5G). |
    | The gateway of the IP address configured for the N6 interface | SGi/N6 gateway | 
    | The network address of the subnet from which dynamic IP addresses must be allocated to user equipment (UEs), given in CIDR notation. You don't need this address if you don't want to support dynamic IP address allocation for this site. You identified this in [Allocate user equipment (UE) IP address pools](complete-private-mobile-network-prerequisites.md?pivots=ase-pro-gpu#allocate-user-equipment-ue-ip-address-pools). The following example shows the network address format. </br></br>`192.0.2.0/24` </br></br>Note that the UE subnets aren't related to the access subnet.    |**Dynamic UE IP pool prefixes**|
    | The network address of the subnet from which static IP addresses must be allocated to user equipment (UEs), given in CIDR notation. You don't need this address if you don't want to support static IP address allocation for this site. You identified this in [Allocate user equipment (UE) IP address pools](complete-private-mobile-network-prerequisites.md?pivots=ase-pro-gpu#allocate-user-equipment-ue-ip-address-pools). The following example shows the network address format. </br></br>`203.0.113.0/24` </br></br>Note that the UE subnets aren't related to the access subnet.    |**Static UE IP pool prefixes**|
@@ -124,9 +124,9 @@ For each data network that you want to configure, collect all the values in the
    |Value  |Field name in Azure portal  |
    |---------|---------|
    | The name of the data network. This could be an existing data network or a new one you'll create during packet core configuration.                 |**Data network name**|
-   | The ID number of the VLAN for the data network | SGi/N6 VLAN IDA |
+   | The ID number of the VLAN for the data network | SGi/N6 VLAN ID |
    | The IP address of the N6 interface | SGi/N6 address |
-   | The virtual network name on port 4 (or port 3 if you plan to have more than six data networks) on your Azure Stack Edge Pro 2 device corresponding to the user plane interface on the data network. For 5G, this interface is the N6 interface; for 4G, it's the SGi interface; for combined 4G and 5G, it's the N6/SGi interface. |  **ASE N6 virtual subnet** (for 5G) or **ASE SGi virtual subnet** (for 4G), or **ASE N6/SGi virtual subnet** (for combined 4G and 5G). |
+   | __THIS LINE NEEDS CHANGING AND PULLING OUT FROM THE LIST. THERE IS NOW A VIRTUAL NETWORK NAME SHARED ACROSS ALL DATA NETWORKS__ The virtual network name on port 4 (or port 3 if you plan to have more than six data networks) on your Azure Stack Edge Pro 2 device corresponding to the user plane interface on the data network. For 5G, this interface is the N6 interface; for 4G, it's the SGi interface; for combined 4G and 5G, it's the N6/SGi interface. |  **ASE N6 virtual subnet** (for 5G) or **ASE SGi virtual subnet** (for 4G), or **ASE N6/SGi virtual subnet** (for combined 4G and 5G). |
    | The gateway of the IP address configured for the N6 interface | SGi/N6 gateway | 
    | The network address of the subnet from which dynamic IP addresses must be allocated to user equipment (UEs), given in CIDR notation. You don't need this address if you don't want to support dynamic IP address allocation for this site. You identified this in [Allocate user equipment (UE) IP address pools](complete-private-mobile-network-prerequisites.md?pivots=ase-pro-2#allocate-user-equipment-ue-ip-address-pools). The following example shows the network address format. </br></br>`192.0.2.0/24` </br></br>Note that the UE subnets aren't related to the access subnet.    |**Dynamic UE IP pool prefixes**|
    | The network address of the subnet from which static IP addresses must be allocated to user equipment (UEs), given in CIDR notation. You don't need this address if you don't want to support static IP address allocation for this site. You identified this in [Allocate user equipment (UE) IP address pools](complete-private-mobile-network-prerequisites.md?pivots=ase-pro-2#allocate-user-equipment-ue-ip-address-pools). The following example shows the network address format. </br></br>`203.0.113.0/24` </br></br>Note that the UE subnets aren't related to the access subnet.    |**Static UE IP pool prefixes**|

articles/private-5g-core/commission-cluster.md

@@ -85,12 +85,11 @@ You can input all the settings on this page before selecting **Apply** at the bo
     1. Select **Add virtual network** and fill in the side panel:
         - **Virtual switch**: select **vswitch-port3** for N2 and N3. Select **vswitch-port4** for N6.
         - **Name**: *N2*, *N3*, or *N6*.
-        - **VLAN**: VLAN ID
-        - **Network** and **Gateway** should be left blank.
-        - **DNS server** and **DNS suffix** should be left blank.
-    1. Select **Modify** to save the configuration for this virtual network.
-    1. Select **Apply** at the bottom of the page and wait for the notification (a bell icon) to confirm that the settings have been applied. Applying the settings will take approximately 8 minutes. 
-3. If using Access VLAN or non-VLAN mode, carry out the following procedure three times, plus once for each of the supplementary data networks (twelve times in total if you have the maximum ten data networks):
+        - **VLAN type**: Trunk VLAN
+        - **Allowed VLAN ID Range**: Fill in the set of VLAN-IDs you want to configure.
+    2. Select **Modify** to save the configuration for this virtual network.
+    3. Select **Apply** at the bottom of the page and wait for the notification (a bell icon) to confirm that the settings have been applied. Applying the settings will take approximately 8 minutes. 
+4. If using Access VLAN or non-VLAN mode, carry out the following procedure three times, plus once for each of the supplementary data networks (twelve times in total if you have the maximum ten data networks):
     > [!IMPORTANT]
     > If you are using port 3 for data networks, we recommend that it is used for the lowest expected load.
     1. Select **Add virtual network** and fill in the side panel:
@@ -110,26 +109,26 @@ You can input all the settings on this page before selecting **Apply** at the bo
 :::zone pivot="ase-pro-gpu"
 3. If using the recommended setup of VLAN-trunking mode, carry out the following procedure 3 times:
     1. Select **Add virtual network** and fill in the side panel:
-        - **Virtual switch**: select **vswitch-port3** for N2 and N3. Select **vswitch-port4** for N6.
+        - **Virtual switch**: select **vswitch-port5** for N2 and N3. Select **vswitch-port6** for N6.
         - **Name**: *N2*, *N3*, or *N6*.
-        - **VLAN**: VLAN ID
-        - **Network** and **Gateway** should be left blank.
-        - **DNS server** and **DNS suffix** should be left blank.
-    1. Select **Modify** to save the configuration for this virtual network.
-    1. Select **Apply** at the bottom of the page and wait for the notification (a bell icon) to confirm that the settings have been applied. Applying the settings will take approximately 8 minutes. 
-3. If using Access VLAN or non-VLAN mode, carry out the following procedure three times, plus once for each of the supplementary data networks (twelve times in total if you have the maximum ten data networks):
+        - **VLAN type**: Trunk VLAN
+        - **Allowed VLAN ID Range**: Fill in the set of VLAN-IDs you want to configure.
+    2. Select **Modify** to save the configuration for this virtual network.
+    3. Select **Apply** at the bottom of the page and wait for the notification (a bell icon) to confirm that the settings have been applied. Applying the settings will take approximately 8 minutes. 
+4. If using Access VLAN or non-VLAN mode, carry out the following procedure three times, plus once for each of the supplementary data networks (twelve times in total if you have the maximum ten data networks):
     > [!IMPORTANT]
     > If you are using port 5 for data networks, we recommend that it is used for the lowest expected load.
     1. Select **Add virtual network** and fill in the side panel:
         - **Virtual switch**: select **vswitch-port5** for N2, N3 and up to four DNs, and select **vswitch-port6** for up to six DNs.
         - **Name**: *N2*, *N3*, or *N6-DNX* (where *X* is the DN number 1-10).
+        - **VLAN type**: select as appropriate.
         - **VLAN**: VLAN ID, or 0 if not using VLANs
         - **Network** and **Gateway**: Use the correct subnet and gateway for the IP address configured on the ASE port (even if the gateway is not set on the ASE port itself).
             - For example, *10.232.44.0/24* and *10.232.44.1*
             - If the subnet does not have a default gateway, use another IP address in the subnet which will respond to ARP requests (such as one of the RAN IP addresses). If there's more than one gNB connected via a switch, choose one of the IP addresses for the gateway.
         - **DNS server** and **DNS suffix** should be left blank.
-    1. Select **Modify** to save the configuration for this virtual network.
-    1. Select **Apply** at the bottom of the page and wait for the notification (a bell icon) to confirm that the settings have been applied. Applying the settings will take approximately 8 minutes.
+    2. Select **Modify** to save the configuration for this virtual network.
+    3. Select **Apply** at the bottom of the page and wait for the notification (a bell icon) to confirm that the settings have been applied. Applying the settings will take approximately 8 minutes.
 
 The page should now look like the following image: