merge VLAN feature, resolve conflicts

Author: robswain

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

@@ -6,7 +6,7 @@ author: robswain
 ms.author: robswain
 ms.service: private-5g-core
 ms.topic: how-to
-ms.date: 01/31/2023
+ms.date: 03/30/2023
 ms.custom: template-how-to 
 zone_pivot_groups: ase-pro-version
 ---
@@ -124,7 +124,8 @@ You can input all the settings on this page before selecting **Apply** at the bo
     - User plane access interface
     - User plane data interface(s)
 
-    You can name these networks yourself, but the name **must** match what you configure in the Azure portal when deploying Azure Private 5G Core. For example, you can use the names **N2**, **N3** and **N6-DN1**, **N6-DN2**, **N6-DN3** (for a 5G deployment with multiple data networks (DNs); just **N6** for a single DN deployment). The following example is for a 5G multi-DN deployment.
+<<<<<<< HEAD
+    You can name these networks yourself, but the name **must** match what you configure in the Azure portal when deploying Azure Private 5G Core. For example, you can use the names **N2**, **N3** and **N6-DN1**, **N6-DN2**, **N6-DN3** (for a 5G deployment with multiple data networks (DNs); just **N6** for a single DN deployment). You can optionally configure each virtual network with a virtual local area network identifier (VLAN ID) to enable layer 2 traffic separation. The following example is for a 5G multi-DN deployment without VLANs.
 :::zone pivot="ase-pro-2"
 3. Carry out the following procedure three times, plus once for each of the supplementary data networks (so five times in total if you have three data networks):
     1. Select **Add virtual network** and fill in the side panel:
@@ -145,7 +146,7 @@ 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-port5** for N2 and N3, and select **vswitch-port6** for N6-DN1, N6-DN2, and N6-DN3.
           - **Name**: *N2*, *N3*, *N6-DN1*, *N6-DN2*, or *N6-DN3*.
-          - **VLAN**: 0
+          - **VLAN**: VLAN ID, or 0 if not using VLANs
           - **Subnet mask** and **Gateway** must match the external values for the port.
             - For example, *255.255.255.0* and *10.232.44.1*
             - If there's no gateway between the access interface and gNB/RAN, use the gNB/RAN IP address as the gateway address. If there's more than one gNB connected via a switch, choose one of the IP addresses for the gateway.

articles/private-5g-core/complete-private-mobile-network-prerequisites.md

@@ -2,11 +2,11 @@
 title: Prepare to deploy a private mobile network
 titleSuffix: Azure Private 5G Core
 description: Learn how to complete the prerequisite tasks for deploying a private mobile network with Azure Private 5G Core.
-author: djrmetaswitch
-ms.author: drichards
+author: robswain
+ms.author: robswain
 ms.service: private-5g-core
 ms.topic: how-to 
-ms.date: 01/31/2023
+ms.date: 03/30/2023
 ms.custom: template-how-to
 zone_pivot_groups: ase-pro-version
 ---
@@ -102,6 +102,12 @@ The following IP address must be shared by all the data networks in the site:
 
 :::zone-end
 
+### VLANs
+
+You can optionally configure your Azure Stack Edge Pro device with virtual local area network (VLAN) tags. You can use this to enable layer 2 traffic separation on the N2, N3 and N6 interfaces, or their 4G equivalents. For example, you might want to separate N2 and N3 traffic (which share a port on the ASE device) or separate traffic for each connected data network.
+
+Allocate VLAN IDs for each network as required.
+
 ## Allocate user equipment (UE) IP address pools
 
 Azure Private 5G Core supports the following IP address allocation methods for UEs.

articles/private-5g-core/media/private-mobile-network-design-requirements/layer-3-network-with-vlans.png

@@ -2,11 +2,11 @@
 title: Private mobile network design requirements
 titleSuffix: Azure Private 5G Core
 description: Learn how to design a private mobile network for Azure Private 5G Core.
-author: b-branco
-ms.author: biancabranco
+author: robswain
+ms.author: robswain
 ms.service: private-5g-core
 ms.topic: conceptual 
-ms.date: 10/25/2022
+ms.date: 03/30/2023
 ms.custom: template-concept 
 ---
 
@@ -49,9 +49,9 @@ Azure Private 5G Core Packet Core supports deployments with or without L3 router
 
 - It is possible to connect ASE port 5 to RAN nodes directly (back-to-back) or via an L2 switch. When using this topology, it is required to configure the eNodeB/gNodeB address as the default gateway in the ASE network interface configuration.
 - Similarly, it is possible to connect ASE port 6 to your core network via an L2 switch. When using this topology, it is required to set up an application or an arbitrary address on the subnet as gateway on the ASE side.  
-- Alternatively, you can combine these approaches. For example: using a router on ASE port 6 with a flat L2 network on ASE port 5. If a L3 router is present in local network topology, you must set it - Alternatively, you can combine these approaches. For example: using a router on ASE port 6 with a flat L2 network on ASE port 5. If a L3 router is present in local network topology, you must set it as the gateway in ASE configuration.
+- Alternatively, you can combine these approaches. For example: using a router on ASE port 6 with a flat L2 network on ASE port 5. If a L3 router is present in local network topology, you must set it.
 
-Unless your AP5GC Packet core is using NAT, there must be a L3 router configured with static routes to the UE IP pools via the appropriate N6 IP address for the corresponding Attached Data Network.
+Unless your packet core is using NAT, there must be a L3 router configured with static routes to the UE IP pools via the appropriate N6 IP address for the corresponding Attached Data Network.
 
 #### Sample network topologies
 
@@ -74,6 +74,12 @@ There are multiple ways to set up your network for use with AP5GC packet core. T
   - This topology requires that the N6 is split into subnets per-DN or that all DNs exist in the same subnet. Due to this, this topology requires careful planning and configuration to prevent overlapping DN IP ranges or UE IP ranges that result in routing problems.  
   :::image type="content" source="media/private-mobile-network-design-requirements/layer-3-network-with-multiple-dns.png" alt-text="Diagram of L3 network topology with multiple D N s." lightbox="media/private-mobile-network-design-requirements/layer-3-network-with-multiple-dns.png":::
 
+- Layer 3 network with VLAN separation
+  - You can also separate ASE traffic into VLANs, whether or not you choose to add L3 gateways to your network. There are multiple benefits to segmenting traffic into separate VLANs, including more flexible network management and increased security.
+  - For example, you could configure separate VLANs for management, access and data traffic, or a separate VLAN for each attached data network.
+  - VLANs must be configured on the local L2 or L3 network equipment. Multiple VLANs will be carried on a single link from ASE port 5 (access network) and/or 6 (core network), so you must configure each of those links as a VLAN trunk.
+  :::image type="content" source="media/private-mobile-network-design-requirements/layer-3-network-with-vlans.png" alt-text="Diagram of L3 network topology with V L A N s." lightbox="media/private-mobile-network-design-requirements/layer-3-network-with-vlans.png":::
+  
 ### Subnets and IP addresses
 
 You may have existing IP networks at the enterprise site that the private cellular network will have to integrate with. This might mean, for example: