From a452b4a2b19303c761ada27e8ade31dff16b6948 Mon Sep 17 00:00:00 2001
From: "Determe, Sebastien (sd378r)" <sd378r@intl.att.com>
Date: Wed, 4 Apr 2018 14:41:57 +0200
Subject: [PATCH] Update Readme

Update readme according to recent changes

Issue-ID: CLAMP-144
Change-Id: I28a1a6addb036f39cefaf2bd8f51ab369457c0a4
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
---
 README.md | 68 +++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index d129e5ba..f6a0ec74 100644
--- a/README.md
+++ b/README.md
@@ -37,44 +37,64 @@ Currently, the clamp docker image can be deployed with small configuration needs
 
 ### Databases
 There are two needed datasource for Clamp. By default, both will try to connect to the localhost server using the credentials available in the example SQL files. If you need to change the default database host and/or credentials, you can do it by using the following json as SPRING_APPLICATION_JSON environment variable :
+Note that all others configurations can be configured in the JSON as well, 
 
 ```json
 {
-    "spring.datasource.camunda.url": "jdbc:mysql://anotherDB.onap.org:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true",
-    "spring.datasource.camunda.username": "admin",
-    "spring.datasource.camunda.password": "password",
-    "spring.datasource.cldsdb.url": "jdbc:mysql://anotherDB.onap.org:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true",
+    "spring.datasource.cldsdb.url": "jdbc:mysql://anotherDB.onap.org:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3",
     "spring.datasource.cldsdb.username": "admin",
     "spring.datasource.cldsdb.password": "password"
+    
+    "clamp.config.sdc.catalog.url": "https://sdchost:8443/sdc/v1/catalog/",
+    "clamp.config.sdc.hostUrl": "https://sdchost:8443/",
+    "clamp.config.sdc.serviceUrl": "https://sdchost:8443/sdc/v1/catalog/services",
+    "clamp.config.sdc.serviceUsername": "clamp",
+    "clamp.config.sdc.servicePassword": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",
+    "clamp.config.dcae.inventory.url": "http://dcaegen2.host:8080",
+    "clamp.config.dcae.dispatcher.url": "http://dcaegen2.host:8080",
+    "clamp.config.policy.pdpUrl1": "https://policy-pdp.host:9091/pdp/ , testpdp, alpha123",
+    "clamp.config.policy.pdpUrl2": "https://policy-pdp.host:9091/pdp/ , testpdp, alpha123",
+    "clamp.config.policy.papUrl": "https://policy-pap.host:8443/pap/ , testpap, alpha123",
+    "clamp.config.policy.clientKey": "5CE79532B3A2CB4D132FC0C04BF916A7"
+    "clamp.config.files.sdcController":"file:/opt/clamp/config/sdc-controllers-config.json"
 }
 ```
+### SDC-Controllers config
 
-OR 
+This file is a JSON that must be specified to Spring config, here is an example:
 
 ```json
 {
-    "spring": 
-    {
-        "datasource": 
-        {
-            "camunda": 
-            {
-                "url": "jdbc:mysql://anotherDB.onap.org:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true",
-                "username": "admin",
-                "password": "password"
-            },
-
-            "cldsdb": 
-            {
-                "url": "jdbc:mysql://anotherDB.onap.org:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true",
-                "username": "admin",
-                "password": "password"
-            }
-        }
+  "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"]
     }
+  }
 }
-
 ```
+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.
+The environmentName is normally the Dmaap Topic used by SDC. 
+If the sdcAddress is not specified or not available (connection failure) the messageBusAddresses will be used (Dmaap servers) 
 
 ### Docker-compose
 
-- 
2.16.6