From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 20 Apr 2020 09:14:24 +0000 (+0200)
Subject: Protect password in juju_epc
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c934fa14bff8e74e5da03bb7ef75c0063e6e03a6;p=functest.git

Protect password in juju_epc

It sometimes fails according to the special chars selected [1].

[1] https://build.opnfv.org/ci/job/functest-opnfv-functest-vnf-hunter-juju_epc-run/333/console

Change-Id: Ie0af3f2fe8d28225296788a8fce73e6d2ec2a304
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 3b3eba6c8e7ff132af513d9fa0a17b1cfbfb14f3)
---

diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index 4d7289749..0a4e649c3 100644
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -42,7 +42,7 @@ CREDS_TEMPLATE2 = """credentials:
     default-credential: abot-epc
     abot-epc:
       auth-type: userpass
-      password: {pass}
+      password: '{pass}'
       project-domain-name: {project_domain_n}
       tenant-name: {tenant_n}"""
 
@@ -51,7 +51,7 @@ CREDS_TEMPLATE = """credentials:
     default-credential: abot-epc
     abot-epc:
       auth-type: userpass
-      password: {pass}
+      password: '{pass}'
       project-domain-name: {project_domain_n}
       tenant-name: {tenant_n}
       user-domain-name: {user_domain_n}
@@ -187,7 +187,7 @@ class JujuEpc(singlevm.VmReady2):
         with open(credentials_yaml, 'w') as yfile:
             yfile.write(CREDS_TEMPLATE.format(**creds_data))
         cmd = ['juju', 'add-credential', 'abot-epc', '-f', credentials_yaml,
-               '--replace']
+               '--replace', '--debug']
         output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
         self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))