report: edits in aws methodology section

Edits include:
- add description of used testbed topologies.
- cleaned up references.
- other editing nits.

Change-Id: I43069541f3da8e844529a00a127fb1a360197647
Signed-off-by: Maciek Konstantynowicz <mkonstan@cisco.com>

1 files changed, 39 insertions, 33 deletions

diff --git a/docs/report/introduction/methodology_aws/aws_ami.rst b/docs/report/introduction/methodology_aws/aws_ami.rst
index 0eebdf9d9c..264da01a1f 100644
--- a/docs/report/introduction/methodology_aws/aws_ami.rst
+++ b/docs/report/introduction/methodology_aws/aws_ami.rst
@@ -1,35 +1,40 @@
-Amazon Machine Images
----------------------
-
-An :abbr:`AMI (Amazon Machine Image)` provides the information required to
-launch an instance. CSIT is using Amazon :abbr:`EBS (Elastic Block Store)` where
-the root device for an instance launched from the AMI is a volume created from
-an Amazon EBS snapshot.
-
-A the TG and SUT instances have slightly different software requirements,
-we are defining two AMIs for TG and SUT separately. AMI details examples:
-
-TG:
-- AMI Name: csit_c5n_ubuntu_focal_tg
-- Platform details: Linux/UNIX
-- Architecture: x86_64
-- Usage operation: RunInstances
-- Image Type: machine
-- Virtualization type: hvm
-- Description: CSIT TG image based on Ubuntu Focal
-- Root Device Name: /dev/sda1
-- Root Device Type: ebs
-
-SUT:
-- AMI Name: csit_c5n_ubuntu_focal_sut
-- Platform details: Linux/UNIX
-- Architecture: x86_64
-- Usage operation: RunInstances
-- Image Type: machine
-- Virtualization type: hvm
-- Description: CSIT SUT image based on Ubuntu Focal
-- Root Device Name: /dev/sda1
-- Root Device Type: ebs
+.. _csit_ami:
+
+CSIT Amazon Machine Images
+--------------------------
+
+An Amazon Machine Image (AMI) provides the information required to
+launch an instance. CSIT is using Amazon Elastic Block Store (EBS) where
+the root device for an instance launched from the AMI is a volume
+created from an Amazon EBS snapshot.
+
+A the TG and SUT instances have slightly different software
+requirements, we are defining two AMIs for TG and SUT separately. AMI
+details examples:
+
+- TG:
+
+  - AMI Name: csit_c5n_ubuntu_focal_tg
+  - Platform details: Linux/UNIX
+  - Architecture: x86_64
+  - Usage operation: RunInstances
+  - Image Type: machine
+  - Virtualization type: hvm
+  - Description: CSIT TG image based on Ubuntu Focal
+  - Root Device Name: /dev/sda1
+  - Root Device Type: ebs
+
+- SUT:
+
+  - AMI Name: csit_c5n_ubuntu_focal_sut
+  - Platform details: Linux/UNIX
+  - Architecture: x86_64
+  - Usage operation: RunInstances
+  - Image Type: machine
+  - Virtualization type: hvm
+  - Description: CSIT SUT image based on Ubuntu Focal
+  - Root Device Name: /dev/sda1
+  - Root Device Type: ebs
 
 Both TG and SUT AMIs are created manually before launching topology and are not
 part of automated scripts. To create CSIT AMIs:
@@ -42,4 +47,5 @@ part of automated scripts. To create CSIT AMIs:
 
 Building AMIs requires Hashicorp Packer with Amazon plugin installed.
 
-.. [aws_ami] `Amazon Machine Images <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AMIs.html>`_
+For more information, see
+`Amazon Machine Images <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AMIs.html>`_.