aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2019-04-10 13:18:55 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-10 13:18:55 +0000
commitc5b43dbb22b76636c33d7c086463ea8da2fdcb6e (patch)
tree4759316f7e8298738802211d08310861fc8e89b8 /tests
parent8f545c2917dd125790e32663780f74c85077cc73 (diff)
parentdbc95ae725e63ca737ba6493ff464ae4b605f02f (diff)
Merge "HV-VES expects passwords to be placed in files"
Diffstat (limited to 'tests')
-rw-r--r--tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py
index 789c0b69..ea225c53 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py
@@ -158,8 +158,9 @@ class XnfSimulator:
cert_name_prefix = "" if should_use_valid_certs else "untrusted"
certificates_path_with_file_prefix = COLLECTOR_CERTS_LOOKUP_DIR + cert_name_prefix
self.key_store_path = certificates_path_with_file_prefix + "client.p12"
+ self.key_store_passwd_path = certificates_path_with_file_prefix + "client.pass"
self.trust_store_path = certificates_path_with_file_prefix + "trust.p12"
- self.sec_store_passwd = "onaponap"
+ self.trust_store_passwd_path = certificates_path_with_file_prefix + "trust.pass"
self.disable_ssl = should_disable_ssl
self.hv_collector_host = UNENCRYPTED_HV_VES_SERVICE_NAME \
if should_connect_to_unencrypted_hv_ves else HV_VES_SERVICE_NAME
@@ -171,8 +172,8 @@ class XnfSimulator:
"--ves-port", "6061",
"--key-store", self.key_store_path,
"--trust-store", self.trust_store_path,
- "--key-store-password", self.sec_store_passwd,
- "--trust-store-password", self.sec_store_passwd]
+ "--key-store-password-file", self.key_store_passwd_path,
+ "--trust-store-password-file", self.trust_store_passwd_path]
if self.disable_ssl:
startup_command.append("--ssl-disable")
return startup_command