update description of 5g pnf software update

Signed-off-by: Yaoguang Wang <sunshine.wang@huawei.com>
Issue-ID: INT-1104
Change-Id: Ifcd2e0488422759ffff8789bfb0bce9ea05aab4a

1 files changed, 29 insertions, 30 deletions

diff --git a/docs/docs_5G_PNF_Software_Upgrade.rst b/docs/docs_5G_PNF_Software_Upgrade.rst
index 9c7e6e00e..0424a3116 100644
--- a/docs/docs_5G_PNF_Software_Upgrade.rst
+++ b/docs/docs_5G_PNF_Software_Upgrade.rst
@@ -8,52 +8,51 @@
 
 Description
 ~~~~~~~~~~~
-The 5G PNF Software upgrade use case shows how users/network operators can modify the software running on an existing PNF. This use case is one aspect of Software Management. This could be used to update the PNF software to a newer or older version of software.
+The 5G PNF Software upgrade use case shows how users/network operators can modify the software of PNF instance during installation or regular maintaince. This use case is one aspect of Software Management. This could be used to update the PNF software to a newer or older version of software.
 
-The Casablanca 5G PNF Software Upgrade Use Case Wiki Page can be found here: https://wiki.onap.org/display/DW/5G+-+PNF+Software+Update
+**Useful Links**
+- `5G - PNF software upgrade use case documentation <https://wiki.onap.org/pages/viewpage.action?pageId=40206496>`_
+- `5G - PNF software upgrade Integration test case status for Dublin release <https://wiki.onap.org/display/DW/5G+-+PNF+SW+Upgrade+-+Integration+Test+Cases>`_
+
+**Current status in Dublin**
+- with the support of an EM
+- LCM API (focus on controller only)
+- integration of basic 3GPP SwM interfaces (*)
+- ansible protocol only
+Note: In Dublin, Controller provided four related APIs (precheck, postcheck, upgrade and rollback), which were finally translated to invoke interfaces provided by EM. Rollback API  is to call swFallback operation, and Upgrade API is to call downloadNESw, installNESw and activateNESw operations (Ref. 3GPP TS 32.532[1]). 
+
+**Future Plans**
+- E2E PNF Software upgrade both for design and runtime
+- Generic workflow for demonstration
 
 How to Use
 ~~~~~~~~~~
-Upgrading PNF (instance) software requires the user/network operator to trigger the upgrade operation from the UI, e.g. VID or UUI. In Cacablanca, users need use ONAP Controllers GUI to trigger the LCM opeations, like pre-check, post-check and upgrade. After receiving the API requests, the ONAP controllers will communicate to the external controller(EC) through south-bound adaptors, which is Ansible in R3.
+Upgrading PNF (instance) software requires the user/network operator to trigger the upgrade operation from the UI, e.g. VID or UUI. In Dublin, users need use ONAP Controllers GUI or publish DMaaP messages to trigger the LCM opeations, which are pre-check, post-check, upgrade and rollback. After receiving the API requests, the ONAP controllers will communicate to EMS through south-bound adaptors, which is Ansible protocol only in Dublin.
+
+Note that, both APPC and SDNC in R4 supported Ansible. Taking SDNC and Prechecking as an example, the steps are as follows:
 
-Note that, both APPC and SDNC in R3 supported Ansible. Taking SDNC and Prechecking as an example, the steps are as follows:
+1) `In ansible server container, prepare the ssh connection conditions to the external controller, both ssh key file and ansible inventory configuration`_
 
-1) In ansible server container, prepare the ssh connection conditions to the external controller, both ssh key file and ansible inventory configuration;
+2) `In sdnc controller container, update the dg configuration file: lcm-dg.properties.`_
 
-2) In sdnc controller container, update the dg configuration file: lcm-dg.properties.
 For example:
 ::
 lcm.pnf.upgrade-pre-check.playbookname=ansible_huawei_precheck
 lcm.pnf.upgrade-post-check.playbookname=ansible_huawei_postcheck
 lcm.pnf.upgrade-software.playbookname=ansible_huawei_upgrade
+lcm.pnf.upgrade-rollback.playbookname=ansible_huawei_rollback
 
-3) Login controller UI, access the pre-check LCM operation and send request.
-Post upgrade-pre-check with the following request body:
-::
-{
-    "input": {
-      "common-header": {
-      "timestamp": "2018-10-10T09:40:04.244Z",
-      "api-ver": "2.00",
-      "originator-id": "664be3d2-6c12-4f4b-a3e7-c349acced203",
-      "request-id":"664be3d2-6c12-4f4b-a3e7-c349acced203",
-      "sub-request-id": "1",
-      "flags": {
-                    "force" : "TRUE",
-                    "ttl" : 60000
-             }
-      },
-      "action": "UpgradePreCheck",
-      "action-identifiers": {
-        "vnf-id":"5gDU0001"
-      },
-      "payload": "{\"pnf-flag\":\"true\", \"pnf-name\": \"5gDU0001\",\"pnfId\": \"5gDU0001\", \"ipaddress-v4-oam\": \"EC_IP_address\",\"oldSwVersion\": \"v1\", \"targetSwVersion\": \"v2\", \"ruleName\": \"r001\", \"Id\": \"10\", \"additionalData\":\"{}\"}"}}
-
-4) The HTTP API response code 200 and LCM retured code 400 (See APPC return code design specification) indicate success, otherwise failed.
+3) `Login controller UI, access the pre-check LCM operation (or other operations) and send request, the detailed request parameters can be found in corresponding test case link.`_
+
+4) `The HTTP API response code 200 and LCM retured code 400 (See APPC return code design specification) indicate success, otherwise failed.`_
 
 Test Status and Plans
 ~~~~~~~~~~~~~~~~~~~~~
-To see information on the status of the test see: https://wiki.onap.org/display/DW/5G+-+PNF+Software+Update+Test+Status
+To see information on the status of the test case: https://wiki.onap.org/display/DW/5G+-+PNF+SW+Upgrade+-+Integration+Test+Cases
+
+References
+==========
+[1] TS 32.532,Telecommunication management; Software management (SwM); Integration Reference Point (IRP); Information Service (IS)
 
 Known Issues and Resolutions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~