Merge "Documented and Tested API & PAP form Istanbul to Jakarta"

[policy/parent.git] / docs / development / devtools / clamp-dcae.rst

diff --git a/docs/development/devtools/clamp-dcae.rst b/docs/development/devtools/clamp-dcae.rst
index 679db69..0d48c2b 100644 (file)
--- a/docs/development/devtools/clamp-dcae.rst
+++ b/docs/development/devtools/clamp-dcae.rst
@@ -27,7 +27,7 @@ The worker VM hosting the policy components has the following spec:
 
 The ONAP components used during the pairwise tests are:
 
-- CLAMP control loop runtime, policy participant, kubernetes participant.
+- CLAMP acm runtime, policy participant, kubernetes participant.
 - DCAE for running dcaegen2-service via kubernetes participant.
 - ChartMuseum service from platform, initialised with DCAE helm charts.
 - DMaaP for the communication between Automation Composition runtime and participants.
@@ -54,14 +54,16 @@ The test set focused on the following use cases:
 - Undeployment of PMSH
 
 Creation of the Automation Composition:
------------------------------
-A Automation Composition is created by commissioning a Tosca template with Automation Composition definitions and instantiating the Automation Composition with the state "UNINITIALISED".
+---------------------------------------
+An Automation Composition is created by commissioning a Tosca template with Automation Composition definitions and instantiating the Automation Composition with the state "UNINITIALISED".
 
-- Upload a TOSCA template from the POLICY GUI. The definitions includes a kubernetes participant and control loop elements that deploys and configures a microservice in the kubernetes cluster.
+- Upload a TOSCA template from the POLICY GUI. The definitions include a kubernetes participant and automation composition elements that deploys and configures a microservice in the kubernetes cluster.
   Automation Composition element for kubernetes participant includes a helm chart information of DCAE microservice and the element for Http Participant includes the configuration entity for the microservice.
   :download:`Sample Tosca template <tosca/pairwise-testing.yml>`
 
-  .. image:: images/cl-commission.png
+  .. image:: images/ac-commission.png
+
+  .. image:: images/ac-upload.png
 
   Verification: The template is commissioned successfully without errors.
 
@@ -73,35 +75,35 @@ A Automation Composition is created by commissioning a Tosca template with Autom
 
   .. image:: images/update-instance.png
 
-  Verification: The control loop is created with default state "UNINITIALISED" without errors.
+  Verification: The Automation composition is created with default state "UNINITIALISED" without errors.
 
-  .. image:: images/cl-instantiation.png
+  .. image:: images/ac-instantiation.png
 
 
 Deployment and Configuration of DCAE microservice (PMSH):
 ---------------------------------------------------------
 The Automation Composition state is changed from "UNINITIALISED" to "PASSIVE" from the Policy Gui. The kubernetes participant deploys the PMSH helm chart from the DCAE chartMuseum server.
 
-.. image:: images/cl-passive.png
+.. image:: images/ac-passive.png
 
 Verification:
 
 - DCAE service PMSH is deployed in to the kubernetes cluster. PMSH pods are in RUNNING state.
   `helm ls -n <namespace>` - The helm deployment of dcaegen2 service PMSH is listed.
-  `kubectl get pod -n <namespace>` - The PMSH pods are deployed, up and Running.
+  `kubectl get pod -n <namespace>` - The PMSH pods are deployed, up and running.
 
 - The subscription configuration for PMSH microservice from the TOSCA definitions are updated in the Consul server. The configuration can be verified on the Consul server UI `http://<CONSUL-SERVER_IP>/ui/#/dc1/kv/`
 
 - The overall state of the Automation Composition is changed to "PASSIVE" in the Policy Gui.
 
-.. image:: images/cl-create.png
+.. image:: images/ac-create.png
 
 
 Undeployment of DCAE microservice (PMSH):
 -----------------------------------------
 The Automation Composition state is changed from "PASSIVE" to "UNINITIALISED" from the Policy Gui.
 
-.. image:: images/cl-uninitialise.png
+.. image:: images/ac-uninitialise.png
 
 Verification:
 
@@ -109,7 +111,7 @@ Verification:
 
 - The overall state of the Automation Composition is changed to "UNINITIALISED" in the Policy Gui.
 
-.. image:: images/cl-uninitialised-state.png
+.. image:: images/ac-uninitialised-state.png