Add functionalities to support NSSI selection

[optf/has.git] / conductor / conductor / common / sms.py

diff --git a/conductor/conductor/common/sms.py b/conductor/conductor/common/sms.py
index 6e21392..ed71b8a 100644 (file)
--- a/conductor/conductor/common/sms.py
+++ b/conductor/conductor/common/sms.py
@@ -27,8 +27,7 @@ import conductor.data.plugins.inventory_provider.aai
 import conductor.api.controllers.v1.plans
 import conductor.common.music.api
 import conductor.data.plugins.service_controller.sdnc
-
-
+from conductor.common.utils import cipherUtils
 
 LOG = log.getLogger(__name__)
 
@@ -105,7 +104,7 @@ def load_secrets():
     config.set_override('username', secret_dict['aai']['username'], 'aai')
     config.set_override('password', secret_dict['aai']['password'], 'aai')
     config.set_override('username', secret_dict['conductor_api']['username'], 'conductor_api')
-    config.set_override('password', secret_dict['conductor_api']['password'], 'conductor_api')
+    config.set_override('password', decrypt_pass(secret_dict['conductor_api']['password']), 'conductor_api')
     config.set_override('aafuser', secret_dict['music_api']['aafuser'], 'music_api')
     config.set_override('aafpass', secret_dict['music_api']['aafpass'], 'music_api')
     config.set_override('aafns', secret_dict['music_api']['aafns'], 'music_api')
@@ -116,6 +115,13 @@ def load_secrets():
     config.set_override('aaf_conductor_user', secret_dict['aaf_api']['aaf_conductor_user'], 'aaf_api')
 
 
+def decrypt_pass(passwd):
+    if passwd == '' or passwd == 'NA':
+        return passwd
+    else:
+        return cipherUtils.AESCipher.get_instance().decrypt(passwd)
+
+
 def delete_secrets():
     """ This is intended to delete the secrets for a clean initialization for
         testing Application. Actual deployment will have a preload script.