Update docs

Update the docs according to the changes done SDC controller

Issue-ID: CLAMP-144
Change-Id: I150c2f7004537e4d67aa42782b6cfeacae8a45c1
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

diff --git a/README.md b/README.md
index f6a0ec7..4eaed8a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -67,26 +67,32 @@ This file is a JSON that must be specified to Spring config, here is an example:
 {\r
   "sdc-connections":{\r
     "sdc-controller1":{\r
 {\r
   "sdc-connections":{\r
     "sdc-controller1":{\r

-        "user": "User1",\r
+        "user": "clamp",\r

         "consumerGroup": "consumerGroup1",\r
         "consumerId": "consumerId1",\r
         "consumerGroup": "consumerGroup1",\r
         "consumerId": "consumerId1",\r

-        "environmentName": "environmentName1",\r
-        "sdcAddress": "sdc.api.simpledemo.onap.org:8080",\r
-        "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6",\r
-        "pollingInterval":10,\r
+        "environmentName": "AUTO",\r
+        "sdcAddress": "localhost:8443",\r
+        "password": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",\r
+        "pollingInterval":30,\r

         "pollingTimeout":30,\r
         "pollingTimeout":30,\r

-        "messageBusAddresses":["localhost"]\r
+        "activateServerTLSAuth":"false",\r
+        "keyStorePassword":"",\r
+        "keyStorePath":"",\r
+        "messageBusAddresses":["dmaaphost.com"]\r

     },\r
     },\r

-     "sdc-controller2":{\r
-        "user": "User2",\r
-        "consumerGroup": "consumerGroup2",\r
-        "consumerId": "consumerId2",\r
-        "environmentName": "environmentName2",\r
-        "sdcAddress": "sdc.api.simpledemo.onap.org:8080",\r
-        "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6",\r
-        "pollingInterval":10,\r
+    "sdc-controller2":{\r
+        "user": "clamp",\r
+        "consumerGroup": "consumerGroup1",\r
+        "consumerId": "consumerId1",\r
+        "environmentName": "AUTO",\r
+        "sdcAddress": "localhost:8443",\r
+        "password": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",\r
+        "pollingInterval":30,\r

         "pollingTimeout":30,\r
         "pollingTimeout":30,\r

-        "messageBusAddresses":["localhost"]\r
+        "activateServerTLSAuth":"false",\r
+        "keyStorePassword":"",\r
+        "keyStorePath":"",\r
+        "messageBusAddresses":["dmaaphost.com"]\r

     }\r
   }\r
 }\r
     }\r
   }\r
 }\r

diff --git a/docs/index.rst b/docs/index.rst
index 6ba96dc..a83c5d4 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -133,32 +133,38 @@ SDC-Controllers config
 This file is a JSON that must be specified to Spring config, here is an example:
 
 .. code-block:: json
 This file is a JSON that must be specified to Spring config, here is an example:
 
 .. code-block:: json

-       {
-         "sdc-connections":{
-           "sdc-controller1":{
-               "user": "User1",
-               "consumerGroup": "consumerGroup1",
-               "consumerId": "consumerId1",
-               "environmentName": "environmentName1",
-               "sdcAddress": "sdc.api.simpledemo.onap.org:8080",
-               "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6",
-               "pollingInterval":10,
-               "pollingTimeout":30,
-               "messageBusAddresses":["localhost"]
-           },
-            "sdc-controller2":{
-               "user": "User2",
-               "consumerGroup": "consumerGroup2",
-               "consumerId": "consumerId2",
-               "environmentName": "environmentName2",
-               "sdcAddress": "sdc.api.simpledemo.onap.org:8080",
-               "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6",
-               "pollingInterval":10,
-               "pollingTimeout":30,
-               "messageBusAddresses":["localhost"]
-           }
-         }
-       }
+ {
+  "sdc-connections":{
+    "sdc-controller1":{
+        "user": "clamp",
+        "consumerGroup": "consumerGroup1",
+        "consumerId": "consumerId1",
+        "environmentName": "AUTO",
+        "sdcAddress": "localhost:8443",
+        "password": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",
+        "pollingInterval":30,
+        "pollingTimeout":30,
+        "activateServerTLSAuth":"false",
+        "keyStorePassword":"",
+        "keyStorePath":"",
+        "messageBusAddresses":["dmaaphost.com"]
+    },
+    "sdc-controller2":{
+        "user": "clamp",
+        "consumerGroup": "consumerGroup1",
+        "consumerId": "consumerId1",
+        "environmentName": "AUTO",
+        "sdcAddress": "localhost:8443",
+        "password": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",
+        "pollingInterval":30,
+        "pollingTimeout":30,
+        "activateServerTLSAuth":"false",
+        "keyStorePassword":"",
+        "keyStorePath":"",
+        "messageBusAddresses":["dmaaphost.com"]
+    }
+  }
+ }

 
 Multiple controllers can be configured so that Clamp is able to receive the notifications from different SDC servers.
 Each Clamp existing in a cluster should have different consumerGroup and consumerId so that they can each consume the SDC notification.
 
 Multiple controllers can be configured so that Clamp is able to receive the notifications from different SDC servers.
 Each Clamp existing in a cluster should have different consumerGroup and consumerId so that they can each consume the SDC notification.