From d79e6bda8b636d77d51ddb63dcd3d91ddda34d83 Mon Sep 17 00:00:00 2001
From: vrvarma <vikas.varma@att.com>
Date: Tue, 14 Apr 2020 18:51:40 -0400
Subject: Remove encryption of passwords for osdf

Change-Id: I1815e798b29b21278353fbf4ea6cb5cd6475dbf5
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-732
---
 config/osdf_config.yaml  | 2 +-
 osdf/adapters/aaf/sms.py | 5 ++++-
 pom.xml                  | 2 +-
 version.properties       | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/config/osdf_config.yaml b/config/osdf_config.yaml
index 4f2f6b6..c7c5898 100755
--- a/config/osdf_config.yaml
+++ b/config/osdf_config.yaml
@@ -54,4 +54,4 @@ pciHMSUsername: test
 pciHMSPassword: passwd
 
 #key
-appkey: os35@rrtky400fdntc#001t5
+#appkey: os35@rrtky400fdntc#001t5
diff --git a/osdf/adapters/aaf/sms.py b/osdf/adapters/aaf/sms.py
index 0168ba0..bcc449c 100644
--- a/osdf/adapters/aaf/sms.py
+++ b/osdf/adapters/aaf/sms.py
@@ -21,6 +21,7 @@
 '''Secret Management Service Integration'''
 
 from onapsmsclient import Client
+
 import osdf.config.base as cfg_base
 import osdf.config.credentials as creds
 import osdf.config.loader as config_loader
@@ -71,6 +72,7 @@ def retrieve_secrets():
     debug_log.debug("Secret Dictionary Retrieval Success")
     return secret_dict
 
+
 def load_secrets():
     config = osdf_config.deployment
     secret_dict = retrieve_secrets()
@@ -107,7 +109,8 @@ def load_secrets():
 
 
 def decrypt_pass(passwd):
-    if passwd == '' or passwd == 'NA':
+    config = osdf_config.deployment
+    if not config.get('appkey') or passwd == '' or passwd == 'NA':
         return passwd
     else:
         return cipherUtils.AESCipher.get_instance().decrypt(passwd)
diff --git a/pom.xml b/pom.xml
index cb9baad..a07617f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ http://maven.apache.org/POM/4.0.0 ">
 	<groupId>org.onap.optf.osdf</groupId>
 	<artifactId>optf-osdf</artifactId>
 	<name>optf-osdf</name>
-	<version>2.0.2-SNAPSHOT</version>
+	<version>2.0.3-SNAPSHOT</version>
 	<description>Optimization Service Design Framework</description>
 
 	<properties>
diff --git a/version.properties b/version.properties
index 487c94e..7026b76 100644
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 
 major=2
 minor=0
-patch=2
+patch=3
 
 base_version=${major}.${minor}.${patch}
 
-- 
cgit 1.2.3-korg