From 3459b8ceb782ab6cb582c1f8e085088016c91d33 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Mon, 25 Nov 2019 15:04:21 -0800 Subject: [PATCH] Fix inconsistent use of encrypt method The appc Configuration class handles decryption of encrypted passwords with no additional method calls needed. This change removes the incorrect call the the EncryptionTool encrypt method. Change-Id: I3b9664911d087da25919ae96db038008b8427e24 Signed-off-by: Patrick Brady Issue-ID: APPC-1766 --- .../java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java index 8c0a61bed..1d0076913 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ProviderAdapterImpl.java @@ -33,7 +33,6 @@ import org.onap.appc.adapter.iaas.provider.operation.common.enums.Operation; import org.onap.appc.adapter.iaas.provider.operation.impl.EvacuateServer; import org.onap.appc.configuration.Configuration; import org.onap.appc.configuration.ConfigurationFactory; -import org.onap.appc.encryption.EncryptionTool; import org.onap.appc.exceptions.APPCException; import org.onap.appc.util.StructuredPropertyHelper; import org.onap.appc.util.StructuredPropertyHelper.Node; @@ -283,8 +282,9 @@ public class ProviderAdapterImpl implements ProviderAdapter { ProviderAdapterImpl.DEFAULT_USER = node2.getValue(); break; case Property.PROVIDER_TENANT_PASSWORD: - // convert password from Base64 encrypted string prefixed with 'enc:' - password = EncryptionTool.getInstance().encrypt(node2.getValue()); + //The passwords are automatically decrpyted by the appc Configuration + //class and require no additional method calls to decrypt. + password = node2.getValue(); ProviderAdapterImpl.DEFAULT_PASS = node2.getValue(); break; case Property.PROVIDER_TENANT_DOMAIN: -- 2.16.6