AETHER-3328 minor reorganization and hyperlinking between sections
Change-Id: I5b5d65302c234568fca578a410c8db1a34e65f49
diff --git a/operations/application.rst b/operations/application.rst
index 228de33..b925a29 100644
--- a/operations/application.rst
+++ b/operations/application.rst
@@ -2,6 +2,8 @@
SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
SPDX-License-Identifier: Apache-2.0
+.. _application:
+
Application Management
======================
@@ -14,6 +16,15 @@
this could be one application with five endpoints, five applications with one endpoint
each, or any other combination that is less than or equal to five endpoints total.
+Each application has an address field which may be
+set to an IPv4 address or an IPv4 subnet, which may in turn match several IPv4
+addresses. This address is common to all endpoints for the application.
+Each endpoint is a port range, specified by its start and end port. A range of
+exactly one port is also acceptable. The protocol may be set to either TCP or UDP. Each
+endpoint may also have associated with it a maximum bitrate and a traffic-class. The
+maximum bitrate (MBR) is per-device to the application; it is not the sum of all devices to the
+application. For more information see the section on :ref:`metering`.
+
In addition to
these five user configurable endpoints, the default behavior can be set to either
ALLOW-ALL, DENY-ALL, or ALLOW-PUBLIC. ALLOW-PUBLIC is a special rule that denies traffic
@@ -31,18 +42,13 @@
|app-add|
-Each application has an address field which may be
-set to an IPv4 address or an IPv4 subnet, which may in turn match several IPv4
-addresses. Once the address is set, move on to creating endpoints. Press the plus
+Set the address and then move on to creating endpoints. Press the *+*
button to add an endpoint.
|app-add-endpoint|
-Each endpoint is a port range, specified by its start and end port. A range of
-exactly one port is also acceptable. The protocol may be set to either TCP or UDP. Each
-endpoint may also have associated with it a maximum bitrate and a traffic-class. The
-maximum bitrate is per-device to the application; it is not the sum of all devices to the
-application.
+Specify the port range, protocol, and optionally the MBR and traffic class for the
+endpoint.
Once all endpoints have been added, they will be summarized on the application page. Update
and commit the changes.
diff --git a/operations/metering.rst b/operations/metering.rst
index 774fc62..fa73f15 100755
--- a/operations/metering.rst
+++ b/operations/metering.rst
@@ -2,6 +2,8 @@
SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
SPDX-License-Identifier: Apache-2.0
+.. _metering:
+
QoS Metering
============
diff --git a/operations/slice.rst b/operations/slice.rst
index bdd926f..9178c6b 100644
--- a/operations/slice.rst
+++ b/operations/slice.rst
@@ -6,23 +6,37 @@
================
A **Slice** is a unit of network access for a set of UEs with a defined set of
-QOS parameters.
+QOS parameters. The following properties are important to the definition of a slice:
-To define a Slice requires it to be associated with:
+* an **Enterprise** and **Site**
-* an Enterprise
-* a Site
+ Slices always exist within a site and an individual slice never spans more than one site.
+
* one or more **Filter** (Application)
+
+ See :ref:`application` for more information on application filtering.
+
* one or more **DeviceGroup**
-* a **UPF**
-and must also be created with attributes like:
+ See :ref:`subscriber_device_management` for more information on DeviceGroups.
-* **SD** (slice differentiator)
-* **SST** (slice/service type)
+* a User Plane Function (**UPF**)
+
+ UPFs are provisioned by Aether Operations.
+
+* **SD** (slice differentiator) and **SST** (slice/service type)
+
+ These are assigned by Aether Operations.
+
* **Default Behavior** (for Application Filtering)
-* **Uplink** (data rate in bps)
-* **Downlink** (data rate in bps)
+
+ The default behavior is used when no application filtering rules match.
+
+* **Uplink** and **Downlink** maximum bitrate (data rate in bps)
+
+ Slice MBRs are the aggregate
+ of all traffic within the slice and may represent the traffic of multiple devices.
+ For more information, see :ref:`metering`.
Provisioning a new Slice
------------------------
@@ -51,7 +65,8 @@
* this will copy over values from that template, which may be edited individually at this create stage
* they will not be editable afterwards.
-#. Accept the Default Behavior, SD and SST, and Uplink and Downlink values or change them.
+#. Accept the Default Behavior, SD and SST or change them.
+#. Accept the Maximum Bitrate (MBR) Uplink and Downlink values or change them.
#. Choose a *UPF* from the drop down list.
* UPFs will previously have been added to a pool - those remaining unused will appear for selection.
diff --git a/operations/subscriber.rst b/operations/subscriber.rst
index bcc8435..de695f5 100644
--- a/operations/subscriber.rst
+++ b/operations/subscriber.rst
@@ -2,6 +2,8 @@
SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
SPDX-License-Identifier: Apache-2.0
+.. _subscriber_device_management:
+
Subscriber and Device Management
================================
@@ -185,6 +187,12 @@
* Choose an *Enterprise* and *Site* from the preconfigured list
It will not be possible to add Devices until the Site is chosen
* Devices can be added at this stage or later
+* As part of the DeviceGroup, you may select a maximum bitrate (MBR)
+ that will be used for the devices in the group. This bitrate is applied
+ separately to each device within the group -- it is not an aggregate
+ of all devices within the group.
+ For more information see the section on :ref:`metering`.
+
|DEVICEGROUP-ADD|