From: vrvarma Date: Tue, 14 Apr 2020 22:57:01 +0000 (-0400) Subject: Remove encryption of passwords for has X-Git-Tag: 2.0.2~1 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=78820f845266c3fcc5eb8599b422147a7d25fdb8;p=optf%2Fhas.git Remove encryption of passwords for has Change-Id: I06134255f2789cdd03dcdfddbe259c85ac81062c Signed-off-by: vrvarma Issue-ID: OPTFRA-732 --- diff --git a/conductor/conductor/common/sms.py b/conductor/conductor/common/sms.py index b8f0649..35ca644 100644 --- a/conductor/conductor/common/sms.py +++ b/conductor/conductor/common/sms.py @@ -116,7 +116,7 @@ def load_secrets(): def decrypt_pass(passwd): - if passwd == '' or passwd == 'NA': + if not CONF.auth.appkey or passwd == '' or passwd == 'NA': return passwd else: return cipherUtils.AESCipher.get_instance().decrypt(passwd) diff --git a/conductor/pom.xml b/conductor/pom.xml index ccfbc81..ad93782 100644 --- a/conductor/pom.xml +++ b/conductor/pom.xml @@ -22,13 +22,13 @@ org.onap.optf.has - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT optf-has org.onap.optf.has optf-has-conductor - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT optf-has-conductor Homing Allocation Service/Conductor diff --git a/pom.xml b/pom.xml index edf8754..e59d307 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ optf-has optf-has - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT Homing Allocation Service diff --git a/version.properties b/version.properties index 2fdb205..afa53c0 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=2 minor=0 -patch=1 +patch=2 base_version=${major}.${minor}.${patch}