Merge pull request #188924 from djrmetaswitch/final-fixes

Fixing links and restoring Fusion Core

Author: laurabren

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

@@ -45,10 +45,8 @@ Collect all the values in the following table to define the packet core instance
    |Value  |Field name in Azure portal  |
    |---------|---------|
    |<p>The IP address for the packet core instance N2 signaling interface.</p><p>You identified this in [Allocate subnets and IP addresses](complete-private-mobile-network-prerequisites.md#allocate-subnets-and-ip-addresses) and it must match the value you used when deploying the AKS-HCI cluster.</p>                 |**N2 address (signaling)**
-   |<p>The IP address for the packet core instance N3 interface.</p><p>You identified this in [Allocate subnets and IP addresses](complete-private-mobile-network-prerequisites.md#allocate-subnets-and-ip-addresses) and it must match the value you used when deploying the AKS-HCI cluster.</p>                |**N3 address**|
    |<p>The network address of the access subnet in Classless Inter-Domain Routing (CIDR) notation.</p><p>You identified this in [Allocate subnets and IP addresses](complete-private-mobile-network-prerequisites.md#allocate-subnets-and-ip-addresses) and it must match the value you used when deploying the AKS-HCI cluster.</p>          |**N2 subnet** and **N3 subnet**|
    |<p>The access subnet default gateway.</p><p>You identified this in [Allocate subnets and IP addresses](complete-private-mobile-network-prerequisites.md#allocate-subnets-and-ip-addresses) and it must match the value you used when deploying the AKS-HCI cluster.</p>                        |**N2 gateway** and **N3 gateway**|
-   |The Tracking Area Codes the packet core instance must support, given as a comma-separated list. For example, *0001,0002*.    |**Tracking area codes**|
 
 ## Collect data network values
 
@@ -60,7 +58,6 @@ Collect all the values in the following table to define the packet core instance
    |Value  |Field name in Azure portal  |
    |---------|---------|
    |The name of the data network.                  |**Data network**|
-   |<p>The IP address for the packet core instance N6 interface.</p><p>You identified this in [Allocate subnets and IP addresses](complete-private-mobile-network-prerequisites.md#allocate-subnets-and-ip-addresses) and it must match the value you used when deploying the AKS-HCI cluster.</p>                      |**N6 address**|
    |<p>The network address of the data subnet in CIDR notation.</p><p>You identified this in [Allocate subnets and IP addresses](complete-private-mobile-network-prerequisites.md#allocate-subnets-and-ip-addresses) and it must match the value you used when deploying the AKS-HCI cluster.</p>                  |**N6 subnet**|
    |<p>The data subnet default gateway.</p><p>You identified this in [Allocate subnets and IP addresses](complete-private-mobile-network-prerequisites.md#allocate-subnets-and-ip-addresses) and it must match the value you used when deploying the AKS-HCI cluster.</p>                                |**N6 gateway**|
    |<p>The network address of the subnet from which IP addresses must be allocated to User Equipment (UEs), given in CIDR notation. You identified this in [Allocate subnets and IP addresses](complete-private-mobile-network-prerequisites.md#allocate-subnets-and-ip-addresses).</p><p> The following example shows the network address format.</p><p>`198.51.100.0/24`</p><p>Note that the UE subnets aren't related to the access subnet.</p>    |**UE IP subnet**|

articles/private-5g-core/configure-service-azure-portal.md

@@ -28,7 +28,7 @@ In this how-to guide, we'll configure a service using the Azure portal.
 In this step, you'll configure basic settings for your new service using the Azure portal.
 
 1. Sign in to the Azure portal at [https://aka.ms/AP5GCPortal](https://aka.ms/AP5GCPortal).
-1. Search for and select the Mobile Network resource representing the private mobile network for which you want to configure a service.
+1. Search for and select the **Mobile Network** resource representing the private mobile network for which you want to configure a service.
 :::image type="content" source="media/mobile-network-search.png" alt-text="Screenshot of the Azure portal. It shows the results of a search for a Mobile Network resource.":::
 1. In the **Resource** menu, select **Services**.
 

articles/private-5g-core/create-a-site.md

@@ -75,6 +75,6 @@ In this step, you'll create the **Mobile Network Site** resource representing th
 
 ## Next steps
 
-If you haven't already done so, you should now design the policy control configuration for your private mobile network. This allows you to customize how your packet core instances apply Quality of Service (QoS) characteristics to traffic. You can also block or limit certain flows.
+If you haven't already done so, you should now design the policy control configuration for your private mobile network. This allows you to customize how your packet core instances apply quality of service (QoS) characteristics to traffic. You can also block or limit certain flows.
 
 - [Learn more about designing the policy control configuration for your private mobile network](policy-control.md)

articles/private-5g-core/key-components-of-a-private-mobile-network.md

@@ -32,7 +32,7 @@ The following diagram shows the key resources you'll use to manage your private
 
 - The *mobile network* resource represents the private mobile network as a whole.
 - Each *SIM* resource represents a physical SIM or eSIM. The physical SIMs and eSIMs are used by UEs that will be served by the private mobile network.
-- *SIM policy* resources are a key component of Azure Private 5G Core's customizable policy control, which allows you to provide flexible traffic handling. You can determine exactly how your packet core instance applies Quality of Service (QoS) characteristics to Service Data Flows (SDFs) to meet your deployment's needs. You can also use policy control to block or limit certain flows.
+- *SIM policy* resources are a key component of Azure Private 5G Core's customizable policy control, which allows you to provide flexible traffic handling. You can determine exactly how your packet core instance applies quality of service (QoS) characteristics to service data flows (SDFs) to meet your deployment's needs. You can also use policy control to block or limit certain flows.
 
     Each SIM policy defines a set of policies and interoperability settings, which can each be assigned to a group of SIMs. You'll need to assign a SIM policy to a SIM before the UE using that SIM can access the private mobile network.
 

articles/private-5g-core/media/azure-private-5g-core/packet-core-architecture.png

@@ -48,7 +48,7 @@ Azure Private 5G Core allows you to use Azure to easily carry out the following
 The following diagram shows the network functions supported by a packet core instance. It also shows the interfaces these network functions use to interoperate with third-party components.
 
 :::image type="complex" source="media/azure-private-5g-core/packet-core-architecture.png" alt-text="Packet core architecture diagram displaying each of the supported network functions and their interfaces.":::
-   Diagram displaying the packet core architecture. The packet core includes the following network functions: the A M F, the S M F, the U P F, the U D R, the N R F, the P C F, the U D M, and the A U S F. The A M F communicates with 5G user equipment over the N1 interface. A G Node B provided by a Microsoft partner communicates with the A M F over the N2 interface and the U P F over the N3 interface. The U P F communicates with the data network over the N6 interface. Several network functions use the N A F interface to communicate with the Application Function, which is provided by a service provider or enterprise.
+   Diagram displaying the packet core architecture. The packet core includes the following 5G network functions: the A M F, the S M F, the U P F, the U D R, the N R F, the P C F, the U D M, and the A U S F. The A M F communicates with 5G user equipment over the N1 interface. A G Node B provided by a Microsoft partner communicates with the A M F over the N2 interface and the U P F over the N3 interface. The U P F communicates with the data network over the N6 interface. Several network functions use the N A F interface to communicate with the Application Function, which is provided by a service provider or enterprise. When operating in 4G mode, the packet core includes S 11 I W F and M M E network functions. The S 11 I W F communicates with the M M E over the S 11 interface. An E Node B provided by a Microsoft partner communicates with the M M E over the S 1 M M E interface and the U P F over the S 1 U interface. 
 :::image-end:::
 
 ## Why use Azure Private 5G Core?
@@ -117,4 +117,4 @@ Azure Private 5G Core includes and utilizes the following Azure services:
 ## Next steps
 
 - [Learn more about the key components of a private mobile network](key-components-of-a-private-mobile-network.md)
-- [Learn more about the prerequisites for deploying a private mobile network](complete-private-mobile-network-prerequisites.md)
+- [Learn more about the prerequisites for deploying a private mobile network](complete-private-mobile-network-prerequisites.md)

articles/private-5g-core/media/how-to-guide-deploy-a-private-mobile-network-azure-portal/create-site-packet-core-tab.png

@@ -69,7 +69,7 @@ Prepare the JSON file using the information you collected for your SIMs in [Coll
 You'll now begin the SIM provisioning process through the Azure portal.
 
 1. Sign in to the Azure portal at [https://aka.ms/AP5GCPortal](https://aka.ms/AP5GCPortal).
-1. Search for and select the Mobile Network resource representing the private mobile network for which you want to provision SIMs.
+1. Search for and select the **Mobile Network** resource representing the private mobile network for which you want to provision SIMs.
 
     :::image type="content" source="media/mobile-network-search.png" alt-text="Screenshot of the Azure portal. It shows the results of a search for a Mobile Network resource.":::
 
@@ -99,7 +99,7 @@ In this step, you'll enter provisioning values for your SIMs directly into the A
     :::image type="content" source="media/provision-sims-azure-portal/new-sim-resource.png" alt-text="Screenshot of the Azure portal showing the configuration a new SIM resource." lightbox="media/provision-sims-azure-portal/new-sim-resource.png":::
 
 1. Repeat this entire step for any other SIMs that you want to provision.
-1. If you decided in [Prerequisites](#prerequisites) that you wanted to assign a SIM policy to any of your provisioned SIMs, move to [Optionally, assign a SIM policy](#optionally-assign-a-sim-policy). Otherwise, you've finished your provisioning.
+1. If you decided in [Prerequisites](#prerequisites) that you wanted to assign a SIM policy to any of your provisioned SIMs, move to [Assign a SIM policy](#assign-a-sim-policy). Otherwise, you've finished your provisioning.
 
 ## Provision SIMs using a JSON file
 
@@ -117,13 +117,13 @@ In this step, you'll provision SIMs using a JSON file.
 
     :::image type="content" source="media/provision-sims-azure-portal/sims-list.png" alt-text="Screenshot of the Azure portal. It shows a list of currently provisioned SIMs for a private mobile network." lightbox="media/provision-sims-azure-portal/sims-list.png":::
 
-1. If you decided in [Prerequisites](#prerequisites) that you wanted to assign a SIM policy to any of your provisioned SIMs, move to [Optionally, assign a SIM policy](#optionally-assign-a-sim-policy). Otherwise, you've finished your provisioning.
+1. If you decided in [Prerequisites](#prerequisites) that you wanted to assign a SIM policy to any of your provisioned SIMs, move to [Assign a SIM policy](#assign-a-sim-policy). Otherwise, you've finished your provisioning.
 
-## Optionally, assign a SIM policy
+## Assign a SIM policy
 
-In this step, you'll assign a SIM policy to your SIMs. SIMs need an assigned SIM policy before they can use your private mobile network.
+In this step, you'll assign a SIM policy to your SIMs. SIMs need an assigned SIM policy before they can use your private mobile network. You can skip this step and come back to it later if you don't want the SIMs to be able to access the private mobile network straight away. 
 
-1. Search for and select the Mobile Network resource representing the private mobile network for which you want to provision SIMs.
+1. Search for and select the **Mobile Network** resource representing the private mobile network for which you want to provision SIMs.
 
     :::image type="content" source="media/mobile-network-search.png" alt-text="Screenshot of the Azure portal. It shows the results of a search for a Mobile Network resource.":::
 
@@ -139,7 +139,7 @@ In this step, you'll assign a SIM policy to your SIMs. SIMs need an assigned SIM
 1. The Azure portal will now begin deploying the configuration change. When the deployment is complete, select **Go to resource** (if you have assigned a SIM policy to a single SIM) or **Go to resource group** (if you have assigned a SIM policy to multiple SIMs).
 
     - If you assigned a SIM policy to a single SIM, you'll be taken to that SIM resource. Check the **SIM policy** field in the **Management** section to confirm that the correct SIM policy has been assigned successfully.
-    - If you assigned a SIM policy to multiple SIMs, you'll be taken to the resource group containing your private mobile network. Select the private Mobile Network resource, and then select **SIMs** in the resource menu. Check the **SIM policy** column in the SIMs list to confirm the correct SIM policy has been assigned to your chosen SIMs.
+    - If you assigned a SIM policy to multiple SIMs, you'll be taken to the resource group containing your private mobile network. Select the **Mobile Network** resource, and then select **SIMs** in the resource menu. Check the **SIM policy** column in the SIMs list to confirm the correct SIM policy has been assigned to your chosen SIMs.
 
 1. Repeat this step for any other SIM policies you want to assign to SIMs.
 

articles/private-5g-core/private-5g-core-overview.md

@@ -20,13 +20,13 @@ Azure Private 5G Core consists of two main components that interact with each ot
 
 ## Secure platform
 
-Azure Private 5G Core requires deployment of packet core instances onto a secure platform, Azure Stack Edge. For more information on Azure Stack Edge security, see [Azure Stack Edge security and data protection](/databox-online/azure-stack-edge-security).
+Azure Private 5G Core requires deployment of packet core instances onto a secure platform, Azure Stack Edge. For more information on Azure Stack Edge security, see [Azure Stack Edge security and data protection](../databox-online/azure-stack-edge-security.md).
 
 ## Encryption at rest
 
-The Azure Private 5G Core service stores all data securely at rest, including SIM credentials. It provides [encryption of data at rest](/security/fundamentals/encryption-overview) using platform-managed encryption keys, managed by Microsoft.
+The Azure Private 5G Core service stores all data securely at rest, including SIM credentials. It provides [encryption of data at rest](../security/fundamentals/encryption-overview.md) using platform-managed encryption keys, managed by Microsoft.
 
-Azure Private 5G Core packet core instances are deployed on Azure Stack Edge devices, which handle [protection of data](/databox-online/azure-stack-edge-security#protect-your-data). 
+Azure Private 5G Core packet core instances are deployed on Azure Stack Edge devices, which handle [protection of data](../databox-online/azure-stack-edge-security.md#protect-your-data). 
 
 ## Write-only SIM credentials
 

articles/private-5g-core/provision-sims-azure-portal.md

@@ -18,6 +18,16 @@
       items:
       - name: Deploy Affirmed Private Network Service on Azure
         href: deploy-affirmed-private-network-service-solution.md
+  - name: Edge connectivity using Metaswitch 5G Fusion Core
+    items:
+    - name: Overview
+      items:
+        - name: What is Fusion Core?
+          href: metaswitch-fusion-core-overview.md
+    - name: How-to guides
+      items:
+        - name: Deploy Fusion Core on Azure Stack Edge
+          href: deploy-metaswitch-fusion-core-solution.md
   - name: Related
     items:
     - name: Azure Network Function Manager