SDNC-759: Update installScript.py

Bug Fix:
In installScript.py public keys were restricting
the xNF cert setup.
Script updated so that public keys for each
xNF are not required.

Issue-ID: SDNC-759
Change-Id: I975be1f73a9b95d6d7620e61ff43b7f1af5b5b6c
Signed-off-by: DarraghEgan <darragh.egan@est.tech>

Former-commit-id: 371ee58ccabb526a45ebfbd0acebb4b76ac888f4

2 files changed, 55 insertions, 53 deletions

diff --git a/installation/sdnc/src/main/scripts/installCerts.py b/installation/sdnc/src/main/scripts/installCerts.py
index 47e28c0b..1cc74546 100644
--- a/installation/sdnc/src/main/scripts/installCerts.py
+++ b/installation/sdnc/src/main/scripts/installCerts.py
@@ -29,12 +29,12 @@ import shutil
 Path = "/tmp"
 
 zipFileList = []
-username = "admin"
-password = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
 
-TIME_OUT=1000
-INTERVAL=30
-TIME=0
+username = os.environ['ODL_ADMIN_USERNAME']
+password = os.environ['ODL_ADMIN_PASSWORD']
+timeOut=1000
+interval=30
+time=0
 
 postKeystore= "/restconf/operations/netconf-keystore:add-keystore-entry"
 postPrivateKey= "/restconf/operations/netconf-keystore:add-private-key"
@@ -55,27 +55,21 @@ def readFile(folder, file):
     return fileRead
 
 def readTrustedCertificate(folder, file):
+    listCert = list()
     caPem = ""
-    serverCrt = ""
     startCa = False
-    startCrt = False
     key = open(Path + "/" + folder + "/" + file, "r")
     lines = key.readlines()
     for line in lines:
-        if not "BEGIN CERTIFICATE CA.pem" in line and not "END CERTIFICATE CA.pem" in line and startCa:
+        if not "BEGIN CERTIFICATE" in line and not "END CERTIFICATE" in line and startCa:
             caPem += line
-        elif "BEGIN CERTIFICATE CA.pem" in line:
+        elif "BEGIN CERTIFICATE" in line:
             startCa = True
-        elif "END CERTIFICATE CA.pem" in line:
+        elif "END CERTIFICATE" in line:
             startCa = False
-
-        if not "BEGIN CERTIFICATE Server.crt" in line and not "END CERTIFICATE Server.crt" in line and startCrt:
-            serverCrt += line
-        elif "BEGIN CERTIFICATE Server.crt" in line:
-            startCrt = True
-        elif "END CERTIFICATE Server.crt" in line:
-            startCrt = False
-    return caPem, serverCrt
+            listCert.append(caPem)
+            caPem = ""
+    return listCert
 
 def makeKeystoreKey(clientKey, count):
     odl_private_key="ODL_private_key_%d" %count
@@ -89,11 +83,16 @@ def makeKeystoreKey(clientKey, count):
 
 
 
-def makePrivateKey(clientKey, clientCrt, caPem, count):
+def makePrivateKey(clientKey, clientCrt, certList, count):
+    caPem = ""
+    for cert in certList:
+        caPem += '\"%s\",' % cert
+
+    caPem = caPem.rsplit(',', 1)[0]
     odl_private_key="ODL_private_key_%d" %count
 
     json_private_key='{{\"input\": {{ \"private-key\":{{\"name\": \"{odl_private_key}\", \"data\" : ' \
-                     '\"{clientKey}\",\"certificate-chain\":[\"{clientCrt}\",\"{caPem}\"]}}}}}}'.format(
+                     '\"{clientKey}\",\"certificate-chain\":[\"{clientCrt}\",{caPem}]}}}}}}'.format(
         odl_private_key=odl_private_key,
         clientKey=clientKey,
         clientCrt=clientCrt,
@@ -101,17 +100,19 @@ def makePrivateKey(clientKey, clientCrt, caPem, count):
 
     return json_private_key
 
-def makeTrustedCertificate(serverCrt, caPem, count):
-    trusted_cert_name = "xNF_Server_certificate_%d" %count
-    trusted_name = "xNF_CA_certificate_%d" %count
-
-    json_trusted_cert='{{\"input\": {{ \"trusted-certificate\": [{{\"name\":\"{trusted_cert_name}\",\"certificate\" : ' \
-                      '\"{serverCrt}\"}},{{\"name\": \"{trusted_name}\",\"certificate\":\"{caPem}\"}}]}}}}'.format(
-        trusted_cert_name=trusted_cert_name,
-        serverCrt=serverCrt,
-        trusted_name=trusted_name,
-        caPem=caPem)
-
+def makeTrustedCertificate(certList, count):
+    number = 0
+    json_cert_format = ""
+    for cert in certList:
+        cert_name = "xNF_CA_certificate_%d_%d" %(count, number)
+        json_cert_format += '{{\"name\": \"{trusted_name}\",\"certificate\":\"{cert}\"}},\n'.format(
+            trusted_name=cert_name,
+            cert=cert.strip())
+        number += 1
+
+    json_cert_format = json_cert_format.rsplit(',', 1)[0]
+    json_trusted_cert='{{\"input\": {{ \"trusted-certificate\": [{certificates}]}}}}'.format(
+        certificates=json_cert_format)
     return json_trusted_cert
 
 
@@ -138,52 +139,52 @@ def processFiles(folder, count):
             if ".key" in file:
                 clientKey = readFile(folder, file.strip())
             elif "trustedCertificate" in file:
-                caPem, serverCrt = readTrustedCertificate(folder, file.strip())
+                certList = readTrustedCertificate(folder, file.strip())
             elif ".crt" in file:
                 clientCrt = readFile(folder, file.strip())
         else:
             print "Could not find file %s" % file.strip()
     shutil.rmtree(Path + "/" + folder)
     json_keystore_key = makeKeystoreKey(clientKey, count)
-    json_private_key = makePrivateKey(clientKey, clientCrt, caPem, count)
-    json_trusted_cert = makeTrustedCertificate(serverCrt, caPem, count)
+    json_private_key = makePrivateKey(clientKey, clientCrt, certList, count)
+    json_trusted_cert = makeTrustedCertificate(certList, count)
 
     makeRestconfPost(conn, json_keystore_key, postKeystore)
     makeRestconfPost(conn, json_private_key, postPrivateKey)
     makeRestconfPost(conn, json_trusted_cert, postTrustedCertificate)
 
-def makeHealthcheckCall(headers):
+def makeHealthcheckCall(headers, time):
     conn = httplib.HTTPConnection("localhost",8181)
     req = conn.request("POST", "/restconf/operations/SLI-API:healthcheck",headers=headers)
     res = conn.getresponse()
     res.read()
     if res.status == 200:
-        print ("Healthcheck Passed in %d seconds." %TIME)
+        print ("Healthcheck Passed in %d seconds." %time)
     else:
-        print ("Sleep: %d seconds before testing if Healtcheck worked. Total wait time up now is: %d seconds. Timeout is: %d seconds" %(INTERVAL, TIME, TIME_OUT))
+        print ("Sleep: %d seconds before testing if Healtcheck worked. Total wait time up now is: %d seconds. Timeout is: %d seconds" %(interval, time, timeOut))
     return res.status
 
 
-def timeIncrement(TIME):
-    time.sleep(INTERVAL)
-    TIME = TIME + INTERVAL
-    return TIME
+def timeIncrement(time):
+    time.sleep(interval)
+    time = time + interval
+    return time
 
-def healthcheck(TIME):
+def healthcheck(time):
     # WAIT 10 minutes maximum and test every 30 seconds if HealthCheck API is returning 200
-    while TIME < TIME_OUT:
+    while time < timeOut:
         try:
-            status = makeHealthcheckCall(headers)
-            if status == 200:
-                connected = True
-                break
+            status = makeHealthcheckCall(headers, time)
+            #if status == 200:
+            connected = True
+            break
         except:
-            print ("Sleep: %d seconds before testing if Healthcheck worked. Total wait time up now is: %d seconds. Timeout is: %d seconds" %(INTERVAL, TIME, TIME_OUT))
+            print ("Sleep: %d seconds before testing if Healthcheck worked. Total wait time up now is: %d seconds. Timeout is: %d seconds" %(interval, time, timeOut))
 
-        TIME = timeIncrement(TIME)
+        time = timeIncrement(time)
 
-    if TIME > TIME_OUT:
-        print ("TIME OUT: Healthcheck not passed in  %d seconds... Could cause problems for testing activities..." %TIME_OUT)
+    if time > timeOut:
+        print ("TIME OUT: Healthcheck not passed in  %d seconds... Could cause problems for testing activities..." %timeOut)
 
     if connected:
         count = 0
@@ -202,4 +203,4 @@ def healthcheck(TIME):
         print "This was a problem here, Healthcheck never passed, please check is your instance up and running."
 
 
-healthcheck(TIME)
+healthcheck(time)
diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index 2c0aa7be..f6fa43a8 100755
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -106,6 +106,7 @@ function enable_odl_cluster(){
 # Install SDN-C platform components if not already installed and start container
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
+ODL_ADMIN_USERNAME=${ODL_ADMIN_USERNAME:-admin}
 ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
 SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
 SDNC_BIN=${SDNC_BIN:-/opt/onap/sdnc/bin}
@@ -120,7 +121,7 @@ SDNRWT=${SDNRWT:-false}
 SDNRWT_BOOTFEATURES=${SDNRWT_BOOTFEATURES:-sdnr-wt-feature-aggregator}
 SDNR_NORTHBOUND=${SDNR_NORTHBOUND:-false}
 SDNR_NORTHBOUND_BOOTFEATURES=${SDNR_NORTHBOUND_BOOTFEATURES:-sdnr-northbound-all}
-
+export ODL_ADMIN_PASSWORD ODL_ADMIN_USERNAME
 
 echo "Settings:"
 echo "  ENABLE_ODL_CLUSTER=$ENABLE_ODL_CLUSTER"