Update Istanbul branch to fix doc errors

Some changes were missed in the cherry picks, this review fixes up the
Istanbul documentation.

Issue-ID: POLICY-3770
Change-Id: I974af7f95b826c9695cbf7201b1f11cebf871215
Signed-off-by: liamfallon <liam.fallon@est.tech>

4 files changed, 137 insertions, 24 deletions

diff --git a/docs/development/devtools/clamp-cl-participant-protocol-smoke.rst b/docs/development/devtools/clamp-cl-participant-protocol-smoke.rst
index 98d7fcda..67005fa3 100644
--- a/docs/development/devtools/clamp-cl-participant-protocol-smoke.rst
+++ b/docs/development/devtools/clamp-cl-participant-protocol-smoke.rst
@@ -1,9 +1,12 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. _clamp-gui-controlloop-smoke-tests:
+.. _clamp-participant-protocol-smoke-tests:
+
 CLAMP Participant Protocol Smoke Tests
----------------------------
+--------------------------------------
+
 1. Introduction
 ***************
+
 The CLAMP Control Loop Participant protocol is an asynchronous protocol that is used by the CLAMP runtime
 to coordinate life cycle management of Control Loop instances.
 This document will serve as a guide to do smoke tests on the different usecases that are involved when
@@ -12,10 +15,14 @@ It will also show a developer how to set up their environment for carrying out s
 
 2. Setup Guide
 **************
-This section will show the developer how to set up their environment to start testing participants with some instruction on how to carry out the tests. There are a number of prerequisites. Note that this guide is written by a Linux user - although the majority of the steps show will be exactly the same in Windows or other systems.
+
+This section will show the developer how to set up their environment to start testing participants with some
+instructions on how to carry out the tests. There are a number of prerequisites. Note that this guide is written by a
+Linux user - although the majority of the steps show will be exactly the same in Windows or other systems.
 
 2.1 Prerequisites
 =================
+
 - Java 11
 - Docker
 - Maven 3
@@ -24,56 +31,75 @@ This section will show the developer how to set up their environment to start te
 
 2.2 Setting up the components
 =============================
+
 - Controlloop runtime component docker image is started and running.
 - Participant docker images policy-clamp-cl-pf-ppnt, policy-clamp-cl-http-ppnt, policy-clamp-cl-k8s-ppnt are started and running.
 - Dmaap simulator for communication between components.
 - mariadb docker container for policy and controlloop database.
 - policy-api for communication between policy participant and policy-framework
-In this setup guide, we will be setting up all the components technically required for a working convenient dev environment. We will not be setting up all of the participants - we will setup only the policy participant as an example.
+
+In this setup guide, we will be setting up all the components technically required for a working convenient
+dev environment. We will not be setting up all of the participants - we will setup only the policy participant as an
+example.
 
 2.2.1 MariaDB Setup
 ===================
+
 We will be using Docker to run our mariadb instance. It will have a total of two databases running in it.
+
 - controlloop: the runtime-controlloop db
 - policyadmin: the policy-api db
 
 3. Running Tests of protocol dialogues
 **************************************
-lloop type definitions and common property values for participant types
+
+loop type definitions and common property values for participant types.
+
 In this section, we will run through the functionalities mentioned at the start of this document is section 1. Each functionality will be tested and we will confirm that they were carried out successfully. There is a tosca service template that can be used for this test
 :download:`Tosca Service Template <tosca/tosca-for-gui-smoke-tests.yaml>`
 
 3.1 Participant Registration
 ============================
+
 Action: Bring up the participant
+
 Test result:
+
 - Observe PARTICIPANT_REGISTER going from participant to runtime
 - Observe PARTICIPANT_REGISTER_ACK going from runtime to participant
 - Observe PARTICIPANT_UPDATE going from runtime to participant
 
 3.2 Participant Deregistration
 ==============================
+
 Action: Bring down the participant
 Test result:
+
 - Observe PARTICIPANT_DEREGISTER going from participant to runtime
 - Observe PARTICIPANT_DEREGISTER_ACK going from runtime to participant
 
 3.3 Participant Priming
 =======================
+
 When a control loop is primed, the portion of the Control Loop Type Definition and Common Property values for the participants
 of each participant type mentioned in the Control Loop Definition are sent to the participants.
 Action: Invoke a REST API to prime controlloop type definitions and set values of common properties
+
 Test result:
+
 - Observe PARTICIPANT_UPDATE going from runtime to participant with controlloop type definitions and common property values for participant types
 - Observe that the controlloop type definitions and common property values for participant types are stored on ParticipantHandler
 - Observe PARTICIPANT_UPDATE_ACK going from runtime to participant
 
 3.4 Participant DePriming
 =========================
+
 When a control loop is de-primed, the portion of the Control Loop Type Definition and Common Property values for the participants
 of each participant type mentioned in the Control Loop Definition are deleted on participants.
 Action: Invoke a REST API to deprime controlloop type definitions
+
 Test result:
+
 - If controlloop instances exist in runtime database, return a response for the REST API with error response saying "Cannot decommission controlloop type definition"
 - If no controlloop instances exist in runtime database, Observe PARTICIPANT_UPDATE going from runtime to participant with definitions as null
 - Observe that the controlloop type definitions and common property values for participant types are removed on ParticipantHandler
@@ -81,9 +107,12 @@ Test result:
 
 3.5 Control Loop Update
 =======================
+
 Control Loop Update handles creation, change, and deletion of control loops on participants.
 Action: Trigger controlloop instantiation from GUI
+
 Test result:
+
 - Observe CONTROL_LOOP_UPDATE going from runtime to participant
 - Observe that the controlloop type instances and respective property values for participant types are stored on ControlLoopHandler
 - Observe that the controlloop state is UNINITIALISED
@@ -91,9 +120,12 @@ Test result:
 
 3.6 Control Loop state change to PASSIVE
 ========================================
+
 Control Loop Update handles creation, change, and deletion of control loops on participants.
 Action: Change state of the controlloop to PASSIVE
+
 Test result:
+
 - Observe CONTROL_LOOP_STATE_CHANGE going from runtime to participant
 - Observe that the ControlLoopElements state is PASSIVE
 - Observe that the controlloop state is PASSIVE
@@ -101,9 +133,12 @@ Test result:
 
 3.7 Control Loop state change to RUNNING
 ========================================
+
 Control Loop Update handles creation, change, and deletion of control loops on participants.
 Action: Change state of the controlloop to RUNNING
+
 Test result:
+
 - Observe CONTROL_LOOP_STATE_CHANGE going from runtime to participant
 - Observe that the ControlLoopElements state is RUNNING
 - Observe that the controlloop state is RUNNING
@@ -111,9 +146,12 @@ Test result:
 
 3.8 Control Loop state change to PASSIVE
 ========================================
+
 Control Loop Update handles creation, change, and deletion of control loops on participants.
 Action: Change state of the controlloop to PASSIVE
+
 Test result:
+
 - Observe CONTROL_LOOP_STATE_CHANGE going from runtime to participant
 - Observe that the ControlLoopElements state is PASSIVE
 - Observe that the controlloop state is PASSIVE
@@ -121,9 +159,12 @@ Test result:
 
 3.9 Control Loop state change to UNINITIALISED
 ==============================================
+
 Control Loop Update handles creation, change, and deletion of control loops on participants.
 Action: Change state of the controlloop to UNINITIALISED
+
 Test result:
+
 - Observe CONTROL_LOOP_STATE_CHANGE going from runtime to participant
 - Observe that the ControlLoopElements state is UNINITIALISED
 - Observe that the controlloop state is UNINITIALISED
@@ -133,12 +174,15 @@ Test result:
 
 3.10 Control Loop monitoring and reporting
 ==========================================
+
 This dialogue is used as a heartbeat mechanism for participants, to monitor the status of Control Loop Elements, and to gather statistics on control loops. The ParticipantStatus message is sent periodically by each participant. The reporting interval for sending the message is configurable
 Action: Bring up participant
+
 Test result:
+
 - Observe that PARTICIPANT_STATUS message is sent from participants to runtime in a regular interval
 - Trigger a PARTICIPANT_STATUS_REQ from runtime and observe a PARTICIPANT_STATUS message with tosca definitions of control loop type definitions sent
-from all the participants to runtime
+  from all the participants to runtime
 
 This concluded the required smoke tests
 
diff --git a/docs/development/devtools/clamp-smoke.rst b/docs/development/devtools/clamp-smoke.rst
index 06ec6db7..764c9ff2 100644
--- a/docs/development/devtools/clamp-smoke.rst
+++ b/docs/development/devtools/clamp-smoke.rst
@@ -2,7 +2,7 @@
 .. Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
-.. _policy-development-tools-label:
+.. _policy-clamp-runtime-smoke-label:
 
 CLAMP control loop runtime Smoke Tests
 ######################################
diff --git a/docs/development/devtools/devtools.rst b/docs/development/devtools/devtools.rst
index 578bdbec..97acac48 100644
--- a/docs/development/devtools/devtools.rst
+++ b/docs/development/devtools/devtools.rst
@@ -58,7 +58,7 @@ ONAP Policy Framework has dependencies to the ONAP Parent *oparent* module, the
     policy/xacml-pdp \
     policy/distribution \
     policy/gui \
-    policy/engine "
+    policy/clamp "
 
     ##
     ## Help screen and exit condition (i.e. too few arguments)
@@ -152,7 +152,7 @@ Execution of the script above results in the following directory hierarchy in yo
     *  ~/git/onap/policy/docker
     *  ~/git/onap/policy/drools-applications
     *  ~/git/onap/policy/drools-pdp
-    *  ~/git/onap/policy/engine
+    *  ~/git/onap/policy/clamp
     *  ~/git/onap/policy/apex-pdp
     *  ~/git/onap/policy/xacml-pdp
     *  ~/git/onap/policy/distribution
@@ -198,10 +198,7 @@ Building ONAP Policy Framework Components
             <module>drools-applications</module>
             <module>distribution</module>
             <module>gui</module>
-            <!-- The engine repo is being deprecated,
-            and can be ommitted if not working with
-            legacy api and components. -->
-            <module>engine</module>
+            <module>clamp</module>
         </modules>
     </project>
 
@@ -279,6 +276,8 @@ familiar with the Policy Framework components and test any local changes.
    policy-gui-controlloop-smoke.rst
    db-migrator-smoke.rst
    cl-participants-smoke.rst
+   clamp-smoke.rst
+   clamp-cl-participant-protocol-smoke.rst
    policy-participant-smoke.rst
 
 ..
@@ -299,11 +298,6 @@ familiar with the Policy Framework components and test any local changes.
 ..
    distribution-smoke.rst
 
-..
-   clamp-smoke.rst
-
-..
-   clamp-cl-participant-protocol-smoke.rst
 
 Running the Stability/Performance Tests
 ***************************************
diff --git a/docs/development/devtools/policy-participant-smoke.rst b/docs/development/devtools/policy-participant-smoke.rst
index 0aeb089e..5838c034 100644
--- a/docs/development/devtools/policy-participant-smoke.rst
+++ b/docs/development/devtools/policy-participant-smoke.rst
@@ -7,14 +7,17 @@ CLAMP Policy Participant Smoke Tests
 
 1. Introduction
 ***************
+
 The Smoke testing of the policy participant is executed in a local CLAMP/Policy environment. The CLAMP-Controlloop interfaces interact with the Policy Framework to perform actions based on the state of the policy participant. The goal of the Smoke tests is the ensure that CLAMP Policy Participant and Policy Framework work together as expected.
 
 2. Setup Guide
 **************
+
 This section will show the developer how to set up their environment to start testing in GUI with some instruction on how to carry out the tests. There are a number of prerequisites. Note that this guide is written by a Linux user - although the majority of the steps show will be exactly the same in Windows or other systems.
 
 2.1 Prerequisites
 =================
+
 - Java 11
 - Maven 3
 - Git
@@ -22,9 +25,12 @@ This section will show the developer how to set up their environment to start te
 
 2.2 Assumptions
 ===============
+
 - You are accessing the policy repositories through gerrit
 - You are using "git review".
+
 The following repositories are required for development in this project. These repositories should be present on your machine and you should run "mvn clean install" on all of them so that the packages are present in your .m2 repository.
+
 - policy/parent
 - policy/common
 - policy/models
@@ -32,17 +38,24 @@ The following repositories are required for development in this project. These r
 - policy/docker
 - policy/gui
 - policy/api
+
 In this setup guide, we will be setting up all the components technically required for a working convenient dev environment.
 
 2.3 Setting up the components
 =============================
+
 2.3.1 MariaDB Setup
 ^^^^^^^^^^^^^^^^^^^
+
 We will be using Docker to run our mariadb instance. It will have a total of two databases running in it.
+
 - controlloop: the runtime-controlloop db
 - policyadmin: the policy-api db
+
 The easiest way to do this is to perform a small alteration on an SQL script provided by the clamp backend in the file "runtime/extra/sql/bulkload/create-db.sql"
+
 .. code-block:: mysql
+
     CREATE DATABASE `controlloop`;
     USE `controlloop`;
     DROP USER 'policy';
@@ -54,17 +67,24 @@ The easiest way to do this is to perform a small alteration on an SQL script pro
     CREATE USER 'policy_user';
     GRANT ALL on controlloop.* to 'policy_user' identified by 'policy_user' with GRANT OPTION;
     FLUSH PRIVILEGES;
+
 Once this has been done, we can run the bash script provided here: "runtime/extra/bin-for-dev/start-db.sh"
+
 .. code-block:: bash
+
     ./start-db.sh
+
 This will setup the two databases needed. The database will be exposed locally on port 3306 and will be backed by an anonymous docker volume.
 
 2.3.2 DMAAP Simulator
 ^^^^^^^^^^^^^^^^^^^^^
+
 For convenience, a dmaap simulator has been provided in the policy/models repository. To start the simulator, you can do the following:
 1. Navigate to /models-sim/policy-models-simulators in the policy/models repository.
 2. Add a configuration file to src/test/resources with the following contents:
+
 .. code-block:: json
+
     {
        "dmaapProvider":{
           "name":"DMaaP simulator",
@@ -80,15 +100,22 @@ For convenience, a dmaap simulator has been provided in the policy/models reposi
           }
        ]
     }
+
 3. You can then start dmaap with:
+
 .. code-block:: bash
+
     mvn exec:java  -Dexec.mainClass=org.onap.policy.models.simulators.Main -Dexec.args="src/test/resources/YOUR_CONF_FILE.json"
+
 At this stage the dmaap simulator should be running on your local machine on port 3904.
 
 2.3.3 Policy API
 ^^^^^^^^^^^^^^^^
+
 In the policy-api repo, you should find the file "src/main/resources/etc/defaultConfig.json". This file must be altered slightly - as below with the restServerParameters and databaseProviderParameters shown. Note how the database parameters match-up with what you setup in Mariadb:
+
 .. code-block:: json
+
     {
         "restServerParameters": {
             "host": "0.0.0.0",
@@ -109,14 +136,20 @@ In the policy-api repo, you should find the file "src/main/resources/etc/default
             "persistenceUnit": "PolicyMariaDb"
         },
     }
+
 Next, navigate to the "/main" directory. You can then run the following command to start the policy api:
+
 .. code-block:: bash
+
     mvn exec:java -Dexec.mainClass=org.onap.policy.api.main.startstop.Main -Dexec.args=" -c ../packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json"
 
 2.3.4 Policy PAP
 ^^^^^^^^^^^^^^^^
+
 In the policy-pap repo, you should find the file 'main/src/test/resources/parameters/PapConfigParameters.json'. This file may need to be altered slightly as below:
+
 .. code-block:: json
+
     {
         "name": "PapGroup",
         "restServerParameters": {
@@ -181,20 +214,29 @@ In the policy-pap repo, you should find the file 'main/src/test/resources/parame
             "basePath": "healthcheck"
         }]
     }
+
 Next, navigate to the "/main" directory. You can then run the following command to start the policy pap
+
 .. code-block:: bash
+
     mvn -q -e clean compile exec:java -Dexec.mainClass="org.onap.policy.pap.main.startstop.Main" -Dexec.args="-c /src/test/resources/parameters/PapConfigParameters.json"
 
 2.3.5 Controlloop Runtime
 ^^^^^^^^^^^^^^^^^^^^^^^^^
+
 To start the controlloop runtime we need to go the "runtime-controlloop" directory in the clamp repo. There is a config file that is used, by default, for the controlloop runtime. That config file is here: "src/main/resources/application.yaml". For development in your local environment, it shouldn't need any adjustment and we can just run the controlloop runtime with:
+
 .. code-block:: bash
+
     mvn spring-boot:run
 
 2.3.6 Controlloop Policy Participant
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 To start the policy participant we need to go to the "participant-impl/participant-impl-policy" directory in the clamp repo. There is a config file under "src/main/resources/config/application.yaml". For development in your local environment, we will need to adjust this file slightly:
+
 .. code-block:: yaml
+
     server:
         port: 8082
 
@@ -240,15 +282,21 @@ To start the policy participant we need to go to the "participant-impl/participa
               servers:
                 - ${topicServer:localhost}
               topicCommInfrastructure: dmaap
+
 Navigate to the participant-impl/particpant-impl-policy/main directory. We can then run the policy-participant with the following command:
+
 .. code-block:: bash
+
     mvn spring-boot:run -Dspring-boot.run.arguments="--server.port=8082 --topicServer=localhost"
 
 3. Testing Procedure
 ====================
+
 3.1 Testing Outline
 ^^^^^^^^^^^^^^^^^^^
+
 To perform the Smoke testing of the policy-participant we will be verifying the behaviours of the participant when the control loop changes state. The scenarios are:
+
 - UNINITIALISED to PASSIVE: participant creates policies and policyTypes specified in the ToscaServiceTemplate using policy-api
 - PASSIVE to RUNNING: participant deploys created policies specified in the ToscaServiceTemplate
 - RUNNING to PASSIVE: participant undeploys policies which have been deployed
@@ -259,17 +307,25 @@ To perform the Smoke testing of the policy-participant we will be verifying the
 
 Creation of Controlloop:
 ************************
+
 A Control Loop is created by commissioning a Tosca template with Control loop definitions and instantiating the Control Loop with the state "UNINITIALISED".
 Using postman, commision a TOSCA template and instantiate using the following template:
-:download:'Tosca Service Template <tosca/tosca_service_template_pptnt_smoke.yaml>'
-:download:'Instantiate Controlloop <tosca/instantiation_pptnt_smoke.json>'
+
+:download:`Tosca Service Template <tosca/tosca_service_template_pptnt_smoke.yaml>`
+
+:download:`Instantiate Controlloop <tosca/instantiation_pptnt_smoke.json>`
+
 To verify this, we check that the Controlloop has been created and is in state UNINITIALISED.
+
     .. image:: images/pol-part-controlloop-creation-ver.png
 
 Creation of policies and policyTypes:
 *************************************
+
 The Controlloop STATE is changed from UNINITIALISED to PASSIVE using postman:
-.. code-block::json
+
+.. code-block:: json
+
     {
         "orderedState": "PASSIVE",
         "controlLoopIdentifierList": [
@@ -279,15 +335,22 @@ The Controlloop STATE is changed from UNINITIALISED to PASSIVE using postman:
             }
         ]
     }
+
 This state change will trigger the creation of policies and policyTypes using the policy-api. To verify this we will check, using policy-api endpoints, that the "Sirisha" policyType, which is specified in the service template, has been created.
+
     .. image:: images/pol-part-controlloop-sirisha-ver.png
+
 We can also check that the pm-control policy has been created.
+
     .. image:: images/pol-part-controlloop-pmcontrol-ver.png
 
 Deployment of policies:
 ***********************
+
 The Controlloop STATE is changed from PASSIVE to RUNNING using postman:
-.. code-block::json
+
+.. code-block:: json
+
     {
         "orderedState": "RUNNING",
         "controlLoopIdentifierList": [
@@ -297,14 +360,18 @@ The Controlloop STATE is changed from PASSIVE to RUNNING using postman:
             }
         ]
     }
+
 This state change will trigger the deployment of the policies specified in the ToscaServiceTemplate. To verify this, we will check that the apex pmcontrol policy has been deployed to the defaultGroup. We check this using pap:
+
     .. image:: images/pol-part-controlloop-pmcontrol-deploy-ver.png
 
 Undeployment of policies:
 *************************
 
 The Controlloop STATE is changed from RUNNING to PASSIVE using postman:
-.. code-block::json
+
+.. code-block:: json
+
     {
         "orderedState": "PASSIVE",
         "controlLoopIdentifierList": [
@@ -314,13 +381,18 @@ The Controlloop STATE is changed from RUNNING to PASSIVE using postman:
             }
         ]
     }
+
 This state change will trigger the undeployment of the pmcontrol policy which was deployed previously. To verifiy this we do a PdpGroup Query as before and check that the pmcontrol policy has been undeployed and removed from the defaultGroup:
+
     .. image:: images/pol-part-controlloop-pmcontrol-undep-ver.png
 
 Deletion of policies and policyTypes:
 *************************************
+
 The Controlloop STATE is changed from PASSIVE to UNINITIALISED using postman:
-.. code-block::json
+
+.. code-block:: json
+
     {
         "orderedState": "UNINITIALISED",
         "controlLoopIdentifierList": [
@@ -330,6 +402,9 @@ The Controlloop STATE is changed from PASSIVE to UNINITIALISED using postman:
             }
         ]
     }
+
 This state change will trigger the deletion of the previously created policies and policyTypes. To verify this, as before, we can check that the Sirisha policyType is not found this time and likewise for the pmcontrol policy:
+
     .. image:: images/pol-part-controlloop-sirisha-nf.png
+
     .. image:: images/pol-part-controlloop-pmcontrol-nf.png