Use single PRH container with ssl configuration

Generating new certificates since the old ones have expired

Change-Id: If68ceab0bea7dbc10db647af7530b39b44729c0c
Issue-ID: INT-1076
Signed-off-by: grabinsk <maciej.grabinski@nokia.com>

20 files changed, 390 insertions, 191 deletions

diff --git a/tests/dcaegen2/prh-testcases/prh_tests.robot b/tests/dcaegen2/prh-testcases/prh_tests.robot
index 4d4bf694..acaf78fd 100644
--- a/tests/dcaegen2/prh-testcases/prh_tests.robot
+++ b/tests/dcaegen2/prh-testcases/prh_tests.robot
@@ -1,8 +1,7 @@
 *** Settings ***
 Documentation     Integration tests for PRH.
 ...               PRH receive events from DMaaP and produce or not PNF_READY notification depends on required fields in received event.
-Suite Setup       Run keywords   Create Headers  AND  Create sessions  AND  Ensure Container Is Running  prh  AND  Ensure Container Is Exited  ssl_prh
-Suite Teardown    Ensure Container Is Running  ssl_prh
+Suite Setup       Run keywords   Create Headers  AND  Create sessions
 Test Teardown     Reset Simulators
 Test Timeout      2 minutes
 
@@ -27,7 +26,7 @@ Simple BBS case event
 Simple registration event
     [Documentation]    PRH get from DMaaP valid event without valid attachment point
     [Tags]    PRH    Valid event
-    [Template]    Verify PNF ready sent 
+    [Template]    Verify PNF ready sent
     ${TEST_CASES_DIR}/ves-event-without-additional-fields
     ${TEST_CASES_DIR}/ves-event-with-empty-additional-fields
     ${TEST_CASES_DIR}/ves-event-with-empty-attachment-point
@@ -52,4 +51,4 @@ Should not sent PNF ready when AAI is not responding
     [Documentation]    PRH get from DMaaP valid event but AAI is not responding
     [Tags]    PRH    AAI not responding
     Verify AAI not responding is logged    ${TEST_CASES_DIR}/aai-not-responding
-    
+
diff --git a/tests/dcaegen2/prh-testcases/resources/cert_generation/create_certs.sh b/tests/dcaegen2/prh-testcases/resources/cert_generation/create_certs.sh
new file mode 100755
index 00000000..a105f1a0
--- /dev/null
+++ b/tests/dcaegen2/prh-testcases/resources/cert_generation/create_certs.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+mkdir -p private certs newcerts
+chmod 700 private
+chmod 755 certs newcerts
+touch index.txt
+echo "unique_subject = no" > index.txt.attr
+echo '01' > serial
+
+openssl genrsa -out root.key 4096
+openssl req -config openssl.conf -key root.key -new -x509 -days 36500 -sha256 -extensions v3_ca -subj /CN=RootCA/OU=OSAAF/O=ONAP/C=US -out root.crt
+
+openssl genrsa -out intermediate.key 4096
+openssl req -new -sha256 -key intermediate.key -out intermediate.csr -outform PEM -subj /CN=intermediate/OU=OSAAF/O=ONAP/C=US
+openssl ca -batch -config openssl.conf -extensions v3_intermediate_ca -days 36500 -cert root.crt -keyfile root.key -out intermediate.crt -infiles intermediate.csr
+
+#openssl genrsa -out aai.key 4096
+cp ../simulator/certs/aai.key aai.key
+openssl req -new -sha256 -key aai.key -out aai.csr -outform PEM -subj /CN=aai/OU=OSAAF/O=ONAP/C=US
+openssl ca -batch -config openssl.conf -days 36500 -cert intermediate.crt -keyfile intermediate.key -out aai.crt -policy policy_loose -infiles aai.csr
+
+
+#openssl genrsa -out dmaap-mr.key 4096
+cp ../simulator/certs/dmaap-mr.key dmaap-mr.key
+openssl req -new -sha256 -key dmaap-mr.key -out dmaap-mr.csr -outform PEM -subj /CN=dmaap-mr/OU=OSAAF/O=ONAP/C=US
+openssl ca -batch -config openssl.conf -days 36500 -cert intermediate.crt -keyfile intermediate.key -out dmaap-mr.crt -policy policy_loose -infiles dmaap-mr.csr
+
+
+openssl genrsa -out prh.key 4096
+openssl req -new -sha256 -key prh.key -out prh.csr -outform PEM -subj /CN=prh/OU=OSAAF/O=ONAP/C=US
+openssl ca -batch -config openssl.conf -extensions server_cert -days 36500 -cert intermediate.crt -keyfile intermediate.key -out prh.crt -policy policy_loose -infiles prh.csr
+
+
+cat prh.crt intermediate.crt >> merged.crt
+
+openssl pkcs12 -export -name prh-cert -in merged.crt -inkey prh.key -passout pass:$(cat ../simulator/certs/keystore.password) -out keystore.p12
+keytool -import -alias intermediate-cert -file intermediate.crt -storepass $(cat ../simulator/certs/truststore.password) -keystore truststore.jks -noprompt
+keytool -import -alias root-cert -file root.crt -storepass $(cat ../simulator/certs/truststore.password) -keystore truststore.jks -noprompt
+
+
+cp aai.crt aai.key dmaap-mr.crt dmaap-mr.key root.crt keystore.p12 truststore.jks ../simulator/certs
\ No newline at end of file
diff --git a/tests/dcaegen2/prh-testcases/resources/cert_generation/openssl.conf b/tests/dcaegen2/prh-testcases/resources/cert_generation/openssl.conf
new file mode 100644
index 00000000..40940614
--- /dev/null
+++ b/tests/dcaegen2/prh-testcases/resources/cert_generation/openssl.conf
@@ -0,0 +1,131 @@
+# OpenSSL root CA configuration file.
+# Copy to `/opt/app/osaaf/CA/openssl.cnf`.
+
+[ ca ]
+# `man ca`
+default_ca = CA_default
+
+[ CA_default ]
+# Directory and file locations.
+dir               = .
+certs             = $dir/certs
+crl_dir           = $dir/crl
+new_certs_dir     = $dir/newcerts
+database          = $dir/index.txt
+serial            = $dir/serial
+RANDFILE          = $dir/private/.rand
+
+# The root key and root certificate.
+private_key       = $dir/private/ca.key
+certificate       = $dir/certs/ca.crt
+
+# For certificate revocation lists.
+crlnumber         = $dir/crlnumber
+crl               = $dir/crl/ca.crl.pem
+crl_extensions    = crl_ext
+default_crl_days  = 30
+
+# SHA-1 is deprecated, so use SHA-2 instead.
+default_md        = sha256
+
+name_opt          = ca_default
+cert_opt          = ca_default
+default_days      = 60
+preserve          = no
+policy            = policy_strict
+
+[ policy_strict ]
+# The root CA should only sign intermediate certificates that match.
+# See the POLICY FORMAT section of `man ca`.
+countryName             = match
+stateOrProvinceName     = optional
+organizationName        = match
+organizationalUnitName  = supplied
+commonName              = supplied
+
+[ policy_loose ]
+# Allow the intermediate CA to sign a more diverse range of certificates.
+# See the POLICY FORMAT section of the `ca` man page.
+countryName             = optional
+stateOrProvinceName     = optional
+localityName            = optional
+organizationName        = optional
+organizationalUnitName  = optional
+commonName              = supplied
+emailAddress            = optional
+
+[ req ]
+# Options for the `req` tool (`man req`).
+default_bits        = 2048
+distinguished_name  = req_distinguished_name
+string_mask         = utf8only
+
+# SHA-1 is deprecated, so use SHA-2 instead.
+default_md          = sha256
+
+# Extension to add when the -x509 option is used.
+x509_extensions     = v3_ca
+
+[ req_distinguished_name ]
+# See <https://en.wikipedia.org/wiki/Certificate_signing_request>.
+countryName                     = Country Name (2 letter code)
+stateOrProvinceName             = State or Province Name
+localityName                    = Locality Name
+0.organizationName              = Organization Name
+organizationalUnitName          = Organizational Unit Name
+commonName                      = Common Name
+emailAddress                    = Email Address
+
+# Optionally, specify some defaults.
+countryName_default             =
+stateOrProvinceName_default     =
+localityName_default            =
+0.organizationName_default      =
+organizationalUnitName_default  =
+emailAddress_default            =
+
+[ v3_ca ]
+# Extensions for a typical CA (`man x509v3_config`).
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer
+basicConstraints = critical, CA:true
+keyUsage = critical, digitalSignature, cRLSign, keyCertSign
+
+[ v3_intermediate_ca ]
+# Extensions for a typical intermediate CA (`man x509v3_config`).
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer
+basicConstraints = critical, CA:true, pathlen:0
+keyUsage = critical, digitalSignature, cRLSign, keyCertSign
+
+[ usr_cert ]
+# Extensions for client certificates (`man x509v3_config`).
+basicConstraints = CA:FALSE
+nsCertType = client, email
+nsComment = "OpenSSL Generated Client Certificate"
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer
+keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment
+extendedKeyUsage = clientAuth, emailProtection
+
+[ server_cert ]
+# Extensions for server certificates (`man x509v3_config`).
+basicConstraints = CA:FALSE
+nsCertType = server, client
+nsComment = "OpenSSL Generated Server Certificate"
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer:always
+keyUsage = critical, digitalSignature, keyEncipherment, nonRepudiation
+extendedKeyUsage = serverAuth, clientAuth
+
+[ crl_ext ]
+# Extension for CRLs (`man x509v3_config`).
+authorityKeyIdentifier=keyid:always
+
+[ ocsp ]
+# Extension for OCSP signing certificates (`man ocsp`).
+basicConstraints = CA:FALSE
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer
+keyUsage = critical, digitalSignature
+extendedKeyUsage = critical, OCSPSigning
diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
index 7b208b8b..a8e5d566 100644
--- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
+++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
@@ -5,23 +5,6 @@ services:
     ports:
       - "8100:8100"
       - "8433:8433"
-    environment:
-      - LOG_LEVEL
-      - PRH_LOG_LEVEL
-    container_name: prh
-    depends_on:
-      cbs:
-        condition: service_healthy
-      dmaap-mr:
-        condition: service_started
-      aai:
-        condition: service_started
-
-  ssl_prh:
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest
-    ports:
-      - "8200:8100"
-      - "8533:8433"
     volumes:
       - ./simulator/certs:/tmp/certs
     environment:
@@ -30,7 +13,7 @@ services:
       - HOSTNAME
       - CONSUL_HOST
       - CONFIG_BINDING_SERVICE
-    container_name: ssl_prh
+    container_name: prh
     depends_on:
       cbs:
         condition: service_healthy
@@ -121,11 +104,11 @@ services:
                                                         "Authorization": "Basic QUFJOkFBSQ=="
                                               },
 
-                                              "security.trustStorePath":"change it",
-                                              "security.trustStorePasswordPath":"change it",
-                                              "security.keyStorePath":"change it",
-                                              "security.keyStorePasswordPath":"change it",
-                                              "security.enableAaiCertAuth":false,
+                                              "security.trustStorePath":"/tmp/certs/truststore.jks",
+                                              "security.trustStorePasswordPath":"/tmp/certs/truststore.password",
+                                              "security.keyStorePath":"/tmp/certs/keystore.p12",
+                                              "security.keyStorePasswordPath":"/tmp/certs/keystore.password",
+                                              "security.enableAaiCertAuth":true,
                                               "security.enableDmaapCertAuth":false,
 
                                               "streams_publishes":{
@@ -240,6 +223,3 @@ services:
       timeout: 2s
       retries: 20
     container_name: cbs
-
-
-
diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
index bdf12acd..1fae1005 100644
--- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot
+++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
@@ -13,7 +13,7 @@ Verify PNF ready sent
     Add PNF entry in AAI    ${pnf_entry}
     Set VES event in DMaaP    ${ves_event}
     Wait Until Keyword Succeeds    10x    3000ms    Check CBS ready
-    Wait Until Keyword Succeeds    30x    3000ms    Check recorded PNF_READY notification    ${expected_pnf_ready_event}
+    Wait Until Keyword Succeeds    10x    3000ms    Check recorded PNF_READY notification    ${expected_pnf_ready_event}
 
 Verify PNF ready sent and logical link created
     [Arguments]    ${test_case_directory}
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
index 4457ef15..ff368034 100644
--- a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
@@ -143,7 +143,7 @@ class AAIHandler(BaseHTTPRequestHandler):
 def _main_(handler_class=AAIHandler, protocol="HTTP/1.0"):
     handler_class.protocol_version = protocol
     httpServerLib.start_http_endpoint(3333, AAIHandler)
-    httpServerLib.start_https_endpoint(3334, AAIHandler, keyfile="certs/org.onap.aai.key", certfile="certs/aai_aai.onap.org.cer", ca_certs="certs/ca_local_0.cer")
+    httpServerLib.start_https_endpoint(3334, AAIHandler, keyfile="certs/aai.key", certfile="certs/aai.crt", ca_certs="certs/root.crt")
     httpServerLib.start_http_endpoint(3335, AAISetup)
     while 1:
         time.sleep(10)
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py b/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py
index 7507a46b..ce9858d6 100644
--- a/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py
@@ -102,7 +102,7 @@ class DMaaPHandler(BaseHTTPRequestHandler):
 def _main_(handler_class=DMaaPHandler, protocol="HTTP/1.0"):
     handler_class.protocol_version = protocol
     httpServerLib.start_http_endpoint(2222, DMaaPHandler)
-    httpServerLib.start_https_endpoint(2223, DMaaPHandler, keyfile="certs/org.onap.dmaap-bc.key", certfile="certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer", ca_certs="certs/ca_local_0.cer")
+    httpServerLib.start_https_endpoint(2223, DMaaPHandler, keyfile="certs/dmaap-mr.key", certfile="certs/dmaap-mr.crt", ca_certs="certs/root.crt")
     httpServerLib.start_http_endpoint(2224, DmaapSetup)
     while 1:
         time.sleep(10)
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/aai.crt b/tests/dcaegen2/prh-testcases/resources/simulator/certs/aai.crt
new file mode 100644
index 00000000..6de63ad9
--- /dev/null
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/aai.crt
@@ -0,0 +1,87 @@
+Certificate:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 2 (0x2)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=US, O=ONAP, OU=OSAAF, CN=intermediate
+        Validity
+            Not Before: May 28 06:34:02 2019 GMT
+            Not After : May  4 06:34:02 2119 GMT
+        Subject: C=US, O=ONAP, OU=OSAAF, CN=aai
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:82:9f:3d:41:06:47:03:cb:53:3b:dc:03:60:91:
+                    b7:f0:60:03:52:24:f7:67:53:f9:9e:5e:98:07:29:
+                    8b:d7:6b:cc:5b:10:8d:cb:b2:2e:44:9c:1e:e8:f6:
+                    7b:61:64:57:54:e5:d3:d9:44:55:79:b8:91:0e:97:
+                    4a:63:b7:7a:20:98:fa:34:5d:91:98:3b:ef:86:7d:
+                    13:4b:ab:e7:36:61:59:98:8d:32:e0:16:f1:33:e8:
+                    6c:d4:b4:bb:9e:62:3a:e5:d8:92:2d:19:1b:a0:c7:
+                    4c:0d:3d:74:26:68:05:f7:ff:cc:03:ee:73:93:01:
+                    98:e5:9a:e4:96:09:e7:89:bb:91:81:69:7e:1a:6a:
+                    2c:15:38:e3:43:1a:19:99:67:b8:c8:49:31:34:c6:
+                    fb:d4:f7:7e:84:0a:75:21:49:9b:6d:fe:a4:6f:9c:
+                    0d:44:24:1f:c7:86:ce:52:7b:85:4f:c7:a9:53:5d:
+                    87:fc:3d:7a:ae:23:42:20:0d:5e:3d:86:52:e1:6c:
+                    f3:0a:69:d4:3c:96:8d:b2:8a:d8:9a:48:c2:47:b0:
+                    b6:75:5a:de:a8:6f:da:0d:16:50:5c:71:ea:b7:b5:
+                    f5:cf:31:55:72:96:cb:2e:00:8d:69:73:71:ec:6e:
+                    65:7b:90:c2:30:83:43:f5:7f:25:68:20:02:c7:95:
+                    78:03
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha256WithRSAEncryption
+         c0:cd:d8:83:c2:c1:89:d5:87:58:91:30:36:e5:fc:95:62:d1:
+         66:13:05:2e:4d:8c:0e:21:54:73:6f:d7:4a:05:a4:91:25:35:
+         80:db:01:aa:e3:7a:cb:48:62:66:f1:11:b7:a0:c3:d9:9d:7b:
+         36:8c:9e:74:85:5d:25:1c:0f:57:21:25:71:c8:55:ed:f2:ea:
+         4a:b7:98:92:f4:5a:f7:4d:90:df:5b:dc:ff:34:01:df:31:f5:
+         85:1f:e1:63:7a:4b:7e:9d:37:63:fd:cb:c6:59:42:01:af:d1:
+         eb:32:5d:d5:43:cb:28:68:39:25:ed:37:88:3a:0c:d2:f4:0e:
+         d5:f3:18:59:7a:41:17:f3:d3:35:d5:bb:04:ec:77:a8:c2:bd:
+         29:65:dd:7c:8d:f2:f7:a5:a3:88:25:c4:e6:0f:4f:31:b8:9c:
+         77:bf:35:39:27:78:a7:a6:37:c5:f3:a2:16:10:38:8a:cd:cb:
+         c2:75:8a:29:dc:8d:16:82:2e:28:b7:93:2e:88:e8:f7:59:9e:
+         91:de:58:77:d6:3b:54:bc:e2:b1:79:c4:f7:b2:53:d1:d4:a3:
+         c9:71:ac:01:f9:79:98:5c:2c:2d:30:30:e8:d2:71:3e:32:6f:
+         9d:ca:d4:fc:61:4a:bc:ea:b7:85:6a:70:30:12:08:4c:ec:ab:
+         43:91:4b:e0:65:56:a9:14:d5:c5:57:4d:15:89:9b:e6:a7:b3:
+         43:aa:39:f0:8e:c2:5f:36:cd:1c:fb:38:0b:ed:2b:96:14:3d:
+         20:05:3b:04:e4:33:8f:fe:0d:ca:38:6a:01:d9:c2:59:d4:e4:
+         3f:18:58:cd:e7:6e:e3:93:34:20:ff:9f:fc:40:c4:17:65:af:
+         0c:d5:22:81:40:24:6e:34:98:2a:fc:62:4f:7a:fe:7d:4d:e3:
+         a9:a9:2a:de:ea:10:3e:fc:39:e6:af:2f:2c:d9:88:f7:c0:60:
+         40:d2:ff:b2:a5:d7:50:db:9e:24:d1:1b:ad:c6:71:1f:36:04:
+         06:d8:b6:32:db:0c:27:3e:71:1a:49:9f:85:4f:12:00:bc:ab:
+         dd:96:fb:ce:d1:08:94:54:d7:bb:e2:38:41:a0:06:17:a2:07:
+         3c:88:99:1d:7d:f4:b1:25:38:18:c2:12:fb:9a:e0:55:d0:55:
+         72:dd:f5:13:59:1e:e0:d6:69:f1:b6:f8:33:3b:63:af:e8:d8:
+         2b:16:d1:50:9e:6a:63:fd:50:30:27:63:ac:ed:83:22:a7:a0:
+         b0:29:ac:1e:fa:0a:cb:af:4a:c4:c8:ec:e6:5c:d9:14:1e:8d:
+         82:71:93:ee:a8:fe:ba:e3:92:b2:99:80:22:78:f2:7c:d1:80:
+         a2:c0:2c:e0:90:62:90:e5
+-----BEGIN CERTIFICATE-----
+MIID8zCCAdsCAQIwDQYJKoZIhvcNAQELBQAwQzELMAkGA1UEBhMCVVMxDTALBgNV
+BAoMBE9OQVAxDjAMBgNVBAsMBU9TQUFGMRUwEwYDVQQDDAxpbnRlcm1lZGlhdGUw
+IBcNMTkwNTI4MDYzNDAyWhgPMjExOTA1MDQwNjM0MDJaMDoxCzAJBgNVBAYTAlVT
+MQ0wCwYDVQQKDARPTkFQMQ4wDAYDVQQLDAVPU0FBRjEMMAoGA1UEAwwDYWFpMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgp89QQZHA8tTO9wDYJG38GAD
+UiT3Z1P5nl6YBymL12vMWxCNy7IuRJwe6PZ7YWRXVOXT2URVebiRDpdKY7d6IJj6
+NF2RmDvvhn0TS6vnNmFZmI0y4BbxM+hs1LS7nmI65diSLRkboMdMDT10JmgF9//M
+A+5zkwGY5ZrklgnnibuRgWl+GmosFTjjQxoZmWe4yEkxNMb71Pd+hAp1IUmbbf6k
+b5wNRCQfx4bOUnuFT8epU12H/D16riNCIA1ePYZS4WzzCmnUPJaNsorYmkjCR7C2
+dVreqG/aDRZQXHHqt7X1zzFVcpbLLgCNaXNx7G5le5DCMIND9X8laCACx5V4AwID
+AQABMA0GCSqGSIb3DQEBCwUAA4ICAQDAzdiDwsGJ1YdYkTA25fyVYtFmEwUuTYwO
+IVRzb9dKBaSRJTWA2wGq43rLSGJm8RG3oMPZnXs2jJ50hV0lHA9XISVxyFXt8upK
+t5iS9Fr3TZDfW9z/NAHfMfWFH+Fjekt+nTdj/cvGWUIBr9HrMl3VQ8soaDkl7TeI
+OgzS9A7V8xhZekEX89M11bsE7Heowr0pZd18jfL3paOIJcTmD08xuJx3vzU5J3in
+pjfF86IWEDiKzcvCdYop3I0Wgi4ot5MuiOj3WZ6R3lh31jtUvOKxecT3slPR1KPJ
+cawB+XmYXCwtMDDo0nE+Mm+dytT8YUq86reFanAwEghM7KtDkUvgZVapFNXFV00V
+iZvmp7NDqjnwjsJfNs0c+zgL7SuWFD0gBTsE5DOP/g3KOGoB2cJZ1OQ/GFjN527j
+kzQg/5/8QMQXZa8M1SKBQCRuNJgq/GJPev59TeOpqSre6hA+/Dnmry8s2Yj3wGBA
+0v+ypddQ254k0RutxnEfNgQG2LYy2wwnPnEaSZ+FTxIAvKvdlvvO0QiUVNe74jhB
+oAYXogc8iJkdffSxJTgYwhL7muBV0FVy3fUTWR7g1mnxtvgzO2Ov6NgrFtFQnmpj
+/VAwJ2Os7YMip6CwKawe+grLr0rEyOzmXNkUHo2CcZPuqP6645KymYAiePJ80YCi
+wCzgkGKQ5Q==
+-----END CERTIFICATE-----
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.aai.key b/tests/dcaegen2/prh-testcases/resources/simulator/certs/aai.key
index b9a22cf3..b9a22cf3 100644
--- a/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.aai.key
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/aai.key
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/aai_aai.onap.org.cer b/tests/dcaegen2/prh-testcases/resources/simulator/certs/aai_aai.onap.org.cer
deleted file mode 100644
index 327f57b6..00000000
--- a/tests/dcaegen2/prh-testcases/resources/simulator/certs/aai_aai.onap.org.cer
+++ /dev/null
@@ -1,55 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE5TCCA82gAwIBAgIJAI5fEseaW2LVMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNV
-BAYTAlVTMQ0wCwYDVQQKDARPTkFQMQ4wDAYDVQQLDAVPU0FBRjEZMBcGA1UEAwwQ
-aW50ZXJtZWRpYXRlQ0FfMjAeFw0xODEwMTgxMDM3MzJaFw0xOTA0MTgxMDM3MzJa
-MGYxDDAKBgNVBAMMA2FhaTEPMA0GCSqGSIb3DQEJARYAMRkwFwYDVQQLDBBhYWlA
-YWFpLm9uYXAub3JnMQ4wDAYDVQQLDAVPU0FBRjENMAsGA1UECgwET05BUDELMAkG
-A1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCnz1BBkcD
-y1M73ANgkbfwYANSJPdnU/meXpgHKYvXa8xbEI3Lsi5EnB7o9nthZFdU5dPZRFV5
-uJEOl0pjt3ogmPo0XZGYO++GfRNLq+c2YVmYjTLgFvEz6GzUtLueYjrl2JItGRug
-x0wNPXQmaAX3/8wD7nOTAZjlmuSWCeeJu5GBaX4aaiwVOONDGhmZZ7jISTE0xvvU
-936ECnUhSZtt/qRvnA1EJB/Hhs5Se4VPx6lTXYf8PXquI0IgDV49hlLhbPMKadQ8
-lo2yitiaSMJHsLZ1Wt6ob9oNFlBcceq3tfXPMVVylssuAI1pc3HsbmV7kMIwg0P1
-fyVoIALHlXgDAgMBAAGjggGzMIIBrzAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIF
-4DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwVAYDVR0jBE0wS4AU
-BASNACQ4xpx414BXQWdJBoDmckehMKQuMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYD
-VQQKDARPTkFQMQswCQYDVQQGEwJVU4IBAjAdBgNVHQ4EFgQUMghLmZ4l0T+MY3uk
-AR6YBJP5gwMwgfoGA1UdEQSB8jCB74IDYWFpgoHnYWFpLmFwaS5zaW1wbGVkZW1v
-Lm9uYXAub3JnIGFhaS5lbGFzdGljc2VhcmNoLnNpbXBsZWRlbW8ub25hcC5vcmcg
-YWFpLmdyZW1saW5zZXJ2ZXIuc2ltcGxlZGVtby5vbmFwLm9yZyBhYWkuaGJhc2Uu
-c2ltcGxlZGVtby5vbmFwLm9yZyBhYWkub25hcCBhYWkuc2VhcmNoc2VydmljZS5z
-aW1wbGVkZW1vLm9uYXAub3JnIGFhaS5zaW1wbGVkZW1vLm9uYXAub3JnIGFhaS51
-aS5zaW1wbGVkZW1vLm9uYXAub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQBJyXk6ZTfA
-f9mYi5ey/ZpchB9egJfwEXXOqSKeYYTjqUr3uXXk+usb8YXsFVoD9Id5do3Hnxv+
-J3ISGmyPTgQfV/9KDmtHPTyclR9mLji+j4GviZnIpAIsI/duPKlEfLcym9smAC7Q
-+HYanUQ7s8sjJJ4ORdBLOy1HkfTu9pjNKZ1CcEnJZ8Y5juLOeEj+Xa+QzcywSK2E
-iuPXJwFFtcX9fO+ojiQV9g0L9JgABMqm4Q6si03gXofYEgvAUJSxsirydB8kcqPU
-jCgw8/XIsHj4VRNNWlwkvzskeX9ZlcFMmn6DTfyDD1Rrij1efotO2ie3OrKUEzpH
-N1G5vCuZqOla
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIEVDCCAjygAwIBAgIBAjANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB
-RjENMAsGA1UECgwET05BUDELMAkGA1UEBhMCVVMwHhcNMTgwOTI0MTE0MjE2WhcN
-MjMwOTI0MTE0MjE2WjBHMQswCQYDVQQGEwJVUzENMAsGA1UECgwET05BUDEOMAwG
-A1UECwwFT1NBQUYxGTAXBgNVBAMMEGludGVybWVkaWF0ZUNBXzIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjPFeAho7BtWjB4Enww/KXD0tTuoda/Fkc
-o/yv2waNNsx+pOYGdJwNHYvNS7/RLBHc8kCN+TbKnYZ6AE97wD1Pzrc7AZ58qpjq
-Ob7aTp4u3IAMWR5YOkDyjiibA5X7z9N/wveG/Ei2SgN2pY7O2lK5ucm6igarfxll
-rZC1MA9zAXrfmd5bLJQQqACT6q15KQaCIwhqwoXp8w+s0rXcZ2/L303lFIUXoHUp
-kzMsIPhJ/ZoEvAEkXIPgT2uFgOwIyWmr8Rg5jYzZhV7vey3bQUBlue9aiMIXih3d
-b4AVD6J6eF/NmJygtUfHFrWeTAYLppA0d69BWUQZ+XQgCwjOMLaNAgMBAAGjZjBk
-MB0GA1UdDgQWBBQEBI0AJDjGnHjXgFdBZ0kGgOZyRzAfBgNVHSMEGDAWgBTtc8Wb
-I4DL8Bm6CVi8//GsTyq8NTASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAt4VCLb2UHiZpDfSQbe62vlFzsGlODYKF
-k7BhW9Q5jfIXpPhhtBLFwJFEKAWFLVWubz+YIa7I5wtniS6zEPC/5t3JOiEXMJQY
-PfaPDSsovZ+eShu0QtrjjldFwL2MiqNsd2IWLSIRQUP63RZGBRTTxSsxB0VAfRyT
-cu/8znpmZsHna3DspGZQputm7qsxgUhAcPCdo9RQtG6Ox6L1wTXUJmTPHdKQtZjr
-qqSQ7kn8u3i5KQYYapmc3UO+CBbzoLPD5Rrlq+ROBbiNd9R/j5vVgRO7vsU9SHnm
-AaKFEjDPTSjDtMOxu1BsTNmftaE2jcYa9/ZW67H8URCuo92NE0cZRxBqHkPUjH3/
-/S43/TBAfjfarF5WW7iMAEZfEGhrQu26JWXBMcZshStuHUEPl2b+RC5LZcBMYKgi
-SqSOXzpiJeRNASpXKCQQZG8n03c/jBf1U20HaK/4Z2ikOql5B21suxhUbixG1EQN
-DOrFGOFUqG4Eyw+xjUR5rTfDnpKgQfJo0/aohZs9p5x+UwitkrQkJQ1ZmEzeVDjm
-7xsmOcAJS2T9DLle6fDWvyh76InymAPxzk1/2AWOp8uw8iwNfFxE+p+M7h0psZxp
-SnvlgASASdWlZLcMQtNiiKzMK75FW9SMctQfA/RfohNEwivpp6tNpgJozoKmhoPK
-zs5HS/mx8GI=
------END CERTIFICATE-----
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/ca_local_0.cer b/tests/dcaegen2/prh-testcases/resources/simulator/certs/ca_local_0.cer
deleted file mode 100644
index ff37eaf7..00000000
--- a/tests/dcaegen2/prh-testcases/resources/simulator/certs/ca_local_0.cer
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFPjCCAyagAwIBAgIJAMhpcvbx/8/AMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV
-BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA4MDMx
-MzI2NTBaFw0zODA3MjkxMzI2NTBaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK
-DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAO4j7nmAY9KX/ceFCITuWAMCHAmSoeHCTs+lgkYX7DpXPidsF5t0ijPaElUC
-rwwMnXz5h1o8FzXD64FMbqMVEseLUDZGelRZ7Rkz+hy0Y5i8QKsBTfeo7sP7ZEaC
-vpqom9imPLFUn4oDeYspCKjMF93Z69Cv8pxFYCFpZwY3eR9V4xOB613k8guBJtHR
-ccY9/NbdfbkrtUz5kNuQqwLj5ttvesqxPq0L4m3bPjkubQCb+QiJxx10Xcx6fcfu
-wIu7NR63qDlWFYstsDnH/VIT1pSCBHEw+muSEQ44sgPFy+AxB8O8HKd8wRfmkV2d
-YNPyotTLD+aLzDlCWtC0pGnTTJimdu9+hZRIZz5YT4m8BdLQ/jTBd6Gx2tVLvWso
-9IJSjfkhj6EtVxyZ81jM+rLAnKy3qPXDCN6CIKL07hNuSzIIhCrK2L4f82JWS7dP
-mg2acuhCH56qrhEr42Kjeak181KM/QKiRPgNyOSygJ7uRaLbqOQRh46c68NcmW4F
-13OwJQAsrjgaQY1ZWnFsvRYK9NnUqK+2XuCQFS7EYm02M2UwO2GCD88In8PCzzv8
-Q0Zj8Hb4h79fVRjG8/3MnQCJ164+9PfXyu9dj5l6XkkSvdj1IsewaSMy9NccGx7Q
-rE7yRPMB6FlAnGPj0KbJXHXJyiujPHSCF0D+Hbl9rxU7FRAbAgMBAAGjYzBhMB0G
-A1UdDgQWBBTtc8WbI4DL8Bm6CVi8//GsTyq8NTAfBgNVHSMEGDAWgBTtc8WbI4DL
-8Bm6CVi8//GsTyq8NTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN
-BgkqhkiG9w0BAQsFAAOCAgEAW4IYy1PUrV/wHblIGFTBo5z7EB33rpHfAJzbDkop
-2n5wOlmh78pkeRNb1TOKcSHJPw0MdkwVBPI1wm/SOpHUPmKTW1muO6RUnFjZ68y9
-DiVa6zCW/RBFeG3f8kywxgqPLml1TbikRuMBU0ucOa/bXZ98P2hMLkjWTgeARGSj
-QCb7QyqeFzG0mPmAuX6zMj5xwpdyPB0zCoRGXa/BIWEvYjgkaRM+E+9oRWt/6BHQ
-4uw11R7gAV4/TSu7qYNfTMllBaLJ0o/1q0QF16e4mV1E4erDfWKlrvUlgCaHCx8Q
-3PL7ovM4jjrTNAjnX0q5xtWbF0mlJhJk/NbPDb7hArBv4vp9XoITyRW1vcbe94jv
-GzqLKlvBQUxGue4kLYDmUFdog7gaCkEH3N4mH3ad4HZUsOMeanvVgbVZr10VOlNq
-TEWqDPATayJdo+VhJCGc6hVa+IJsDTAa/z2MLybqcoOfNT/rxYIdvlX4OjSqAqOj
-bSivsCe9c4km56pP2ufA/woPzh+Z46Ukt+krGyFQwKdQQLh5Pp7Yuhvdld/5kd8M
-S2fqcBFpzzBSj+huVayw6jFi5qLlISouhCVsc0rBqvnfuQTQwmfFIlfaHBTSjniv
-5DdibZEtMqYYXl1VB4XUHTt5dOGHLEX2w/d5887DQVLUbaUKm1mfScb/vPjGgk6/
-re4=
------END CERTIFICATE-----
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/dmaap-mr.crt b/tests/dcaegen2/prh-testcases/resources/simulator/certs/dmaap-mr.crt
new file mode 100644
index 00000000..3fc90f9e
--- /dev/null
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/dmaap-mr.crt
@@ -0,0 +1,87 @@
+Certificate:
+    Data:
+        Version: 1 (0x0)
+        Serial Number: 3 (0x3)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=US, O=ONAP, OU=OSAAF, CN=intermediate
+        Validity
+            Not Before: May 28 06:34:02 2019 GMT
+            Not After : May  4 06:34:02 2119 GMT
+        Subject: C=US, O=ONAP, OU=OSAAF, CN=dmaap-mr
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:b3:69:90:49:e4:ac:84:ae:19:ac:0c:1c:f3:f4:
+                    0d:1d:98:94:54:82:e5:43:06:32:a2:f8:8f:7c:bd:
+                    bb:f2:65:75:39:74:98:a1:35:be:3f:31:54:d5:3b:
+                    fa:1f:02:84:14:bd:ea:f6:2f:7f:cb:59:b4:0e:38:
+                    4f:e1:fa:c7:a4:d5:55:4e:8e:4a:21:e0:af:e9:f2:
+                    2c:01:89:e9:fe:9e:74:3f:71:0e:87:70:09:7a:1b:
+                    59:9b:80:2d:c4:de:83:78:c9:5a:06:fd:75:19:85:
+                    14:9b:a1:3a:d1:0d:fa:63:a5:a0:92:5a:bc:bb:52:
+                    83:9e:06:09:cb:5f:d0:06:5f:1a:02:22:5b:8f:6b:
+                    e9:2f:ae:16:48:8d:dc:c8:dc:ff:a9:e2:38:fc:fc:
+                    47:b2:a0:47:50:52:3d:e8:67:0b:b4:b3:cb:0d:29:
+                    48:41:6a:16:a1:98:64:89:04:c7:ad:4e:12:c7:9f:
+                    e7:55:d5:a2:85:f7:34:47:4f:a3:1b:92:07:fa:60:
+                    db:f1:65:0d:9b:21:e7:68:78:a7:ae:de:44:af:5b:
+                    32:a5:4f:cd:c4:3f:8d:95:13:c5:3b:52:b8:0f:1e:
+                    34:b3:17:c0:96:ed:8b:14:29:65:0e:04:92:fd:77:
+                    1f:b1:ed:27:cb:f4:eb:2f:64:56:10:ba:08:3b:3f:
+                    4d:8d
+                Exponent: 65537 (0x10001)
+    Signature Algorithm: sha256WithRSAEncryption
+         d2:43:ab:0f:cb:02:ff:00:56:eb:6a:1a:58:b9:df:a3:0f:47:
+         cf:e2:f3:43:7a:c8:b5:74:68:36:3f:82:1c:58:3a:32:86:5d:
+         2b:d2:81:74:e8:0f:6b:1b:40:45:40:f4:3a:d5:e4:1d:d0:c8:
+         33:89:ce:a0:0a:7a:75:13:2a:fb:17:3b:f0:9b:23:07:b1:92:
+         16:0a:5a:e0:b2:b6:56:cc:47:7d:3f:4d:c9:ce:5e:1b:56:0a:
+         36:c0:b2:2a:6a:10:33:ec:b9:4c:ff:d2:a4:22:62:16:0e:30:
+         b6:bb:4c:c9:e5:c6:03:2f:45:62:1b:55:2c:fb:2b:c8:23:a7:
+         41:16:1b:cd:21:06:c0:01:5e:71:97:9b:bb:21:26:4c:0c:88:
+         c4:f4:3e:9a:07:5c:2c:c0:4e:06:18:0c:b4:fe:69:39:0e:9b:
+         49:91:30:3d:e3:7e:82:ad:6a:09:f2:7a:7f:c3:07:b2:22:98:
+         ef:74:00:6d:5b:d5:c5:1b:f7:00:3f:14:cc:41:ad:66:54:65:
+         94:26:b2:10:f3:06:87:da:45:79:44:f8:41:6a:9d:13:98:08:
+         c4:9e:de:45:4b:a4:ca:a5:1b:a3:82:a0:fc:e8:aa:29:c7:43:
+         84:cb:cf:1a:4a:27:c6:c1:85:bc:06:62:e4:bb:e0:93:0e:8b:
+         fd:33:06:c0:17:a2:e4:49:0f:5d:be:7d:f3:da:5c:b5:20:29:
+         b1:c6:95:5a:33:94:d9:2d:ea:f1:e3:f0:94:67:3a:db:a1:e3:
+         b1:d1:31:fd:a8:53:a9:c4:7e:13:7f:d7:6e:4b:cf:dc:6a:b7:
+         05:d1:4e:07:68:ba:05:ab:48:f1:17:d6:ed:3b:26:96:7d:aa:
+         f3:e6:4a:4e:27:5d:0a:b6:ed:8d:d7:0c:6a:c5:2c:96:d5:8b:
+         31:b3:13:07:c6:fa:42:a8:fe:30:99:eb:1b:57:b0:fa:22:dc:
+         f7:1b:ad:16:f0:70:36:c3:41:d8:97:0f:aa:c6:8c:c2:eb:98:
+         e1:89:2c:ec:8e:e5:6d:c7:1c:0f:00:88:c4:fa:cb:52:b1:c1:
+         2e:e1:4f:34:54:de:d9:25:45:bc:eb:37:6b:6a:a3:5e:e0:41:
+         aa:ca:f6:36:61:3a:89:63:40:16:cf:dd:bd:97:11:d6:75:48:
+         6d:c1:0e:64:a3:ad:ef:9e:6c:a4:0c:df:c2:0e:ac:12:7b:ff:
+         36:64:98:26:f0:96:c5:9a:9f:f3:c6:63:70:e3:e4:24:74:ad:
+         08:c8:d3:55:a0:15:7a:57:a4:ce:ae:ed:f6:68:f2:1e:7c:d8:
+         96:35:74:7a:79:d0:e9:56:2c:bd:c5:d3:40:d1:cd:f9:b3:cc:
+         fc:c7:46:3d:57:79:3f:a7
+-----BEGIN CERTIFICATE-----
+MIID+DCCAeACAQMwDQYJKoZIhvcNAQELBQAwQzELMAkGA1UEBhMCVVMxDTALBgNV
+BAoMBE9OQVAxDjAMBgNVBAsMBU9TQUFGMRUwEwYDVQQDDAxpbnRlcm1lZGlhdGUw
+IBcNMTkwNTI4MDYzNDAyWhgPMjExOTA1MDQwNjM0MDJaMD8xCzAJBgNVBAYTAlVT
+MQ0wCwYDVQQKDARPTkFQMQ4wDAYDVQQLDAVPU0FBRjERMA8GA1UEAwwIZG1hYXAt
+bXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzaZBJ5KyErhmsDBzz
+9A0dmJRUguVDBjKi+I98vbvyZXU5dJihNb4/MVTVO/ofAoQUver2L3/LWbQOOE/h
++sek1VVOjkoh4K/p8iwBien+nnQ/cQ6HcAl6G1mbgC3E3oN4yVoG/XUZhRSboTrR
+DfpjpaCSWry7UoOeBgnLX9AGXxoCIluPa+kvrhZIjdzI3P+p4jj8/EeyoEdQUj3o
+Zwu0s8sNKUhBahahmGSJBMetThLHn+dV1aKF9zRHT6Mbkgf6YNvxZQ2bIedoeKeu
+3kSvWzKlT83EP42VE8U7UrgPHjSzF8CW7YsUKWUOBJL9dx+x7SfL9OsvZFYQugg7
+P02NAgMBAAEwDQYJKoZIhvcNAQELBQADggIBANJDqw/LAv8AVutqGli536MPR8/i
+80N6yLV0aDY/ghxYOjKGXSvSgXToD2sbQEVA9DrV5B3QyDOJzqAKenUTKvsXO/Cb
+IwexkhYKWuCytlbMR30/TcnOXhtWCjbAsipqEDPsuUz/0qQiYhYOMLa7TMnlxgMv
+RWIbVSz7K8gjp0EWG80hBsABXnGXm7shJkwMiMT0PpoHXCzATgYYDLT+aTkOm0mR
+MD3jfoKtagnyen/DB7IimO90AG1b1cUb9wA/FMxBrWZUZZQmshDzBofaRXlE+EFq
+nROYCMSe3kVLpMqlG6OCoPzoqinHQ4TLzxpKJ8bBhbwGYuS74JMOi/0zBsAXouRJ
+D12+ffPaXLUgKbHGlVozlNkt6vHj8JRnOtuh47HRMf2oU6nEfhN/125Lz9xqtwXR
+TgdougWrSPEX1u07JpZ9qvPmSk4nXQq27Y3XDGrFLJbVizGzEwfG+kKo/jCZ6xtX
+sPoi3PcbrRbwcDbDQdiXD6rGjMLrmOGJLOyO5W3HHA8AiMT6y1KxwS7hTzRU3tkl
+RbzrN2tqo17gQarK9jZhOoljQBbP3b2XEdZ1SG3BDmSjre+ebKQM38IOrBJ7/zZk
+mCbwlsWan/PGY3Dj5CR0rQjI01WgFXpXpM6u7fZo8h582JY1dHp50OlWLL3F00DR
+zfmzzPzHRj1XeT+n
+-----END CERTIFICATE-----
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dmaap-bc.key b/tests/dcaegen2/prh-testcases/resources/simulator/certs/dmaap-mr.key
index 880a33bf..880a33bf 100644
--- a/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dmaap-bc.key
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/dmaap-mr.key
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer b/tests/dcaegen2/prh-testcases/resources/simulator/certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer
deleted file mode 100644
index 756dd3a0..00000000
--- a/tests/dcaegen2/prh-testcases/resources/simulator/certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIELDCCAxSgAwIBAgIJAI5fEseaW2LbMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNV
-BAYTAlVTMQ0wCwYDVQQKDARPTkFQMQ4wDAYDVQQLDAVPU0FBRjEZMBcGA1UEAwwQ
-aW50ZXJtZWRpYXRlQ0FfMjAeFw0xODEwMjIxMjM4MTZaFw0xOTA0MjIxMjM4MTZa
-MH8xETAPBgNVBAMMCGRtYWFwLWJjMQ8wDQYJKoZIhvcNAQkBFgAxLTArBgNVBAsM
-JGRtYWFwLWJjLXRvcGljLW1nckBkbWFhcC1iYy5vbmFwLm9yZzEOMAwGA1UECwwF
-T1NBQUYxDTALBgNVBAoMBE9OQVAxCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAs2mQSeSshK4ZrAwc8/QNHZiUVILlQwYyoviPfL27
-8mV1OXSYoTW+PzFU1Tv6HwKEFL3q9i9/y1m0DjhP4frHpNVVTo5KIeCv6fIsAYnp
-/p50P3EOh3AJehtZm4AtxN6DeMlaBv11GYUUm6E60Q36Y6Wgklq8u1KDngYJy1/Q
-Bl8aAiJbj2vpL64WSI3cyNz/qeI4/PxHsqBHUFI96GcLtLPLDSlIQWoWoZhkiQTH
-rU4Sx5/nVdWihfc0R0+jG5IH+mDb8WUNmyHnaHinrt5Er1sypU/NxD+NlRPFO1K4
-Dx40sxfAlu2LFCllDgSS/Xcfse0ny/TrL2RWELoIOz9NjQIDAQABo4HiMIHfMAkG
-A1UdEwQCMAAwDgYDVR0PAQH/BAQDAgXgMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjBUBgNVHSMETTBLgBQEBI0AJDjGnHjXgFdBZ0kGgOZyR6EwpC4w
-LDEOMAwGA1UECwwFT1NBQUYxDTALBgNVBAoMBE9OQVAxCzAJBgNVBAYTAlVTggEC
-MB0GA1UdDgQWBBTvkTjHV87v4IBJ8N/PqkjjWGKICjArBgNVHREEJDAigghkbWFh
-cC1iY4IWZG1hYXAtYmMgZG1hYXAtYmMub25hcDANBgkqhkiG9w0BAQsFAAOCAQEA
-EJFyoeQtkjDf/yUyWReewxiOfDdmmrDOO4gbxt6hd3ilOflmC7QolR1NAzmCML3b
-vmLS7a8zhwBsUU11wjasN8PI3qG7H36U7hP/NVwvql0YNGIcxvukPJJvDqW6V3MI
-fOaCFs4uJexSYeaXRWdk0Rq8GY9gB2j1TUsl+we9zJeErKr2vY2LAJI0iYJ+v6YY
-Ug14aPYu4m4ABUDhqfM+4z580h8GA+5ZkWNr5z9xfeJB520jAc6zx86obx9hep74
-OByfVqleMV0QfZeH9oLGYh2FnSSEG60GyWFIf9k76kh2LREVCbU+nOhFfVy9YD5Q
-+2TXjh/wMcv3RxAHqSeW9A==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIEVDCCAjygAwIBAgIBAjANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB
-RjENMAsGA1UECgwET05BUDELMAkGA1UEBhMCVVMwHhcNMTgwOTI0MTE0MjE2WhcN
-MjMwOTI0MTE0MjE2WjBHMQswCQYDVQQGEwJVUzENMAsGA1UECgwET05BUDEOMAwG
-A1UECwwFT1NBQUYxGTAXBgNVBAMMEGludGVybWVkaWF0ZUNBXzIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjPFeAho7BtWjB4Enww/KXD0tTuoda/Fkc
-o/yv2waNNsx+pOYGdJwNHYvNS7/RLBHc8kCN+TbKnYZ6AE97wD1Pzrc7AZ58qpjq
-Ob7aTp4u3IAMWR5YOkDyjiibA5X7z9N/wveG/Ei2SgN2pY7O2lK5ucm6igarfxll
-rZC1MA9zAXrfmd5bLJQQqACT6q15KQaCIwhqwoXp8w+s0rXcZ2/L303lFIUXoHUp
-kzMsIPhJ/ZoEvAEkXIPgT2uFgOwIyWmr8Rg5jYzZhV7vey3bQUBlue9aiMIXih3d
-b4AVD6J6eF/NmJygtUfHFrWeTAYLppA0d69BWUQZ+XQgCwjOMLaNAgMBAAGjZjBk
-MB0GA1UdDgQWBBQEBI0AJDjGnHjXgFdBZ0kGgOZyRzAfBgNVHSMEGDAWgBTtc8Wb
-I4DL8Bm6CVi8//GsTyq8NTASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAt4VCLb2UHiZpDfSQbe62vlFzsGlODYKF
-k7BhW9Q5jfIXpPhhtBLFwJFEKAWFLVWubz+YIa7I5wtniS6zEPC/5t3JOiEXMJQY
-PfaPDSsovZ+eShu0QtrjjldFwL2MiqNsd2IWLSIRQUP63RZGBRTTxSsxB0VAfRyT
-cu/8znpmZsHna3DspGZQputm7qsxgUhAcPCdo9RQtG6Ox6L1wTXUJmTPHdKQtZjr
-qqSQ7kn8u3i5KQYYapmc3UO+CBbzoLPD5Rrlq+ROBbiNd9R/j5vVgRO7vsU9SHnm
-AaKFEjDPTSjDtMOxu1BsTNmftaE2jcYa9/ZW67H8URCuo92NE0cZRxBqHkPUjH3/
-/S43/TBAfjfarF5WW7iMAEZfEGhrQu26JWXBMcZshStuHUEPl2b+RC5LZcBMYKgi
-SqSOXzpiJeRNASpXKCQQZG8n03c/jBf1U20HaK/4Z2ikOql5B21suxhUbixG1EQN
-DOrFGOFUqG4Eyw+xjUR5rTfDnpKgQfJo0/aohZs9p5x+UwitkrQkJQ1ZmEzeVDjm
-7xsmOcAJS2T9DLle6fDWvyh76InymAPxzk1/2AWOp8uw8iwNfFxE+p+M7h0psZxp
-SnvlgASASdWlZLcMQtNiiKzMK75FW9SMctQfA/RfohNEwivpp6tNpgJozoKmhoPK
-zs5HS/mx8GI=
------END CERTIFICATE-----
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/keystore.p12 b/tests/dcaegen2/prh-testcases/resources/simulator/certs/keystore.p12
new file mode 100644
index 00000000..bd8e3c00
--- /dev/null
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/keystore.p12
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dcae.jks b/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dcae.jks
deleted file mode 100644
index e74ce64f..00000000
--- a/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dcae.jks
+++ /dev/null
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dcae.trust.jks b/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dcae.trust.jks
deleted file mode 100644
index 10103cfb..00000000
--- a/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dcae.trust.jks
+++ /dev/null
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/root.crt b/tests/dcaegen2/prh-testcases/resources/simulator/certs/root.crt
new file mode 100644
index 00000000..aea11590
--- /dev/null
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/root.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFbTCCA1WgAwIBAgIUG1QH8TpwSepBiBzrrt5Caw1NEf4wDQYJKoZIhvcNAQEL
+BQAwPTEPMA0GA1UEAwwGUm9vdENBMQ4wDAYDVQQLDAVPU0FBRjENMAsGA1UECgwE
+T05BUDELMAkGA1UEBhMCVVMwIBcNMTkwNTI4MDYzNDAyWhgPMjExOTA1MDQwNjM0
+MDJaMD0xDzANBgNVBAMMBlJvb3RDQTEOMAwGA1UECwwFT1NBQUYxDTALBgNVBAoM
+BE9OQVAxCzAJBgNVBAYTAlVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA5h/bBKaDM7IrsuiADWFsXEyoEgiUWfXkmat7nxjVu5P5EK7eowWLGwKSI6N1
+mimOzxsVvc6o1X6GhhNDAQGrfzWFSTf00TyXZc46NaZp6ti2AcD1H3rImzchC8/B
+AM/eHcB8/ZMoq9A5z+ljlI3xT0JiF3GbSEaXPAaLlWhoEShb3JBDUWV8TRI6AYS7
+MxaAcbrT1uOstiB+cIVTmafk7LbcV9829OdJbEcKVjMyF5PxHU5t4B+zO6lrAGr3
+BIMwwiFoSbGEow58wMN/lL+zB48P5uV+0wZqB4+zgU0DEzBfJ3Q7XZj65t9VsF95
+/qVDYW5JgEUB7fi+KrHgpKbdoHpZsHRiE7GZibJphxDN6CHSfcSuDoJiIHWbaDF4
+dR8qIObMCfdkbu+5QFc+RZceCmmTtMSI8JBN/FMhBeRJ7enIphcsoinCwINYjwWN
+oNT5A5wPLWGkGC51r535I55x2kgvbd+bUZSWapJ4tgQBHm5J/dGcUHNJMO4FFjsF
+LplrHb3o83jhagfwEZ3TsbGY+bUXXWkydKi6A66JrbNGR5/RgYhz+p5KOyjiR+JI
+g7guB5UaK6ZCl4OeVEfpmF3OFEXnLMvr8iJ3tlwvPoj9mxRKtS7Os3+/fvi6hRpl
+VgoSMDN7Pv0f4KSPuNQDgRBH7U9ez/YTYakRg6Xv1ACVdisCAwEAAaNjMGEwHQYD
+VR0OBBYEFIkwGLo5okMt2o0Qca+IQsgiwu1iMB8GA1UdIwQYMBaAFIkwGLo5okMt
+2o0Qca+IQsgiwu1iMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0G
+CSqGSIb3DQEBCwUAA4ICAQC7uexRjHGGYpGZKmgTmgQwDboxOdtpAoYHesnWAj7V
+NjbAZhAvrN7kEMKp0RE5IIE/JwnMmmY3H+pGKsSb8AqArMKVLn00kQhHjg+j36rw
+wlxA16NJAzWIXQ97EjbG7U/a9MhAnnUMAEtdWVp3ux1ISZta4s2zSapFw+CIlLJC
+81Lz1344DbQJQsy5bOfPrgHtCgWQafSV0cU8XsJnPo2HsnL+q4hDi+KxE6jJshE1
+alMa2kX/DRLWPGCifPe3zQJdn9IdLjWsOrRFOIZJqwtxRzdK0IvS1P9clit5NJ88
+d6qCK1kl5nW7EyueUMSIRldu/uG8UTcWNP5Cu9KPE14GgigLt7RwW9nPgsdbTwK0
+4jAeF6LsZ7QU29cvBjI9LpiA7VFfexkFEeTU8gAmbZuOS6HIhuswHdTGutT9XmO5
+HkA1sA1+L5taR+9UMo/hvzBCIKhFMQlgCWIkJ1iiYKuQ+SZsDR3CZ5+ma5NlhP9j
+1j6J91kkxB5qs4JrgaHZ8cqysljf48PQF3qkEiQfOxw/0WLsxVPxPNYDszX69FRF
+d5+gpSAPQjdJ7OT49ccfl5r1kVfGHpDZn2dKw7K34yeLAAPcjyukdrHFBgtXUVb1
+Ivic5rrDAv1UrqaXh1r6Q+HLOJHSEP1jklyXX0q2IekyQbXRYOMhALfcVbmRleZX
+Qg==
+-----END CERTIFICATE-----
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/truststore.jks b/tests/dcaegen2/prh-testcases/resources/simulator/certs/truststore.jks
new file mode 100644
index 00000000..2b2d8b46
--- /dev/null
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/truststore.jks
diff --git a/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot b/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot
deleted file mode 100644
index 6e350cef..00000000
--- a/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot
+++ /dev/null
@@ -1,21 +0,0 @@
-*** Settings ***
-Documentation     Integration tests for PRH.
-...               PRH receive events from DMaaP and produce or not PNF_READY notification depends on required fields in received event. PRH comunicates with AAI and DMaaP through SSL
-Suite Setup       Run keywords   Create headers  AND  Create sessions  AND  Ensure Container Is Running  ssl_prh  AND  Ensure Container Is Exited  prh
-Suite Teardown    Ensure Container Is Running  prh
-Test Teardown     Reset Simulators
-Library           resources/PrhLibrary.py
-Resource          resources/prh_library.robot
-Resource          ../../common.robot
-
-*** Variables ***
-${TEST_CASES_DIR}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets
-
-${DMAAP_SIMULATOR_SETUP_URL}    http://${DMAAP_SIMULATOR_SETUP}
-${AAI_SIMULATOR_SETUP_URL}    http://${AAI_SIMULATOR_SETUP}
-${CONSUL_SETUP_URL}    http://${CONSUL_SETUP}
-
-*** Test Cases ***
-Valid DMaaP event can be converted to PNF_READY notification with ssl connection to AAI
-    [Template]    Verify PNF ready sent
-    ${TEST_CASES_DIR}/ves-event-without-additional-fields
\ No newline at end of file