AAF common name bug fix

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I18f6dbbcb4310b510070b11fee30badba953a05d
Issue-ID: DMAAP-1420

2 files changed, 8 insertions, 2 deletions

diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeAafPropsUtilsTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeAafPropsUtilsTest.java
index 927b8bef..ccf2744e 100644
--- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeAafPropsUtilsTest.java
+++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeAafPropsUtilsTest.java
@@ -36,6 +36,6 @@ public class NodeAafPropsUtilsTest {
 
     @Test
     public void Veirfy_Aaf_Pass_Decryp_Successful() {
-        Assert.assertEquals("tVac2#@Stx%tIOE^x[c&2fgZ", nodeAafPropsUtils.getDecryptedPass("cadi_keystore_password"));
+        Assert.assertEquals("V+b}aGuWxHI+BPSNMVXqD*bx", nodeAafPropsUtils.getDecryptedPass("cadi_keystore_password"));
     }
 }
diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java
index 2d87b8b9..9832785e 100644
--- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java
+++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java
@@ -78,8 +78,14 @@ public class NodeUtilsTest {
     }
 
     @Test
-    public void Given_Get_CanonicalName_Called_Valid_CN_Returned() {
+    public void Given_Get_CanonicalName_Called_Valid_CN_Returned_From_JKS() {
         String canonicalName = NodeUtils.getCanonicalName("jks", "src/test/resources/org.onap.dmaap-dr-test-cert.jks", "WGxd2P6MDo*Bi4+UdzWs{?$8");
         Assert.assertEquals("dmaap-dr-node", canonicalName);
     }
+
+    @Test
+    public void Given_Get_CanonicalName_Called_Valid_CN_Returned_From_P12() {
+        String canonicalName = NodeUtils.getCanonicalName("PKCS12", "src/test/resources/aaf/org.onap.dmaap-dr.p12", "V+b}aGuWxHI+BPSNMVXqD*bx");
+        Assert.assertEquals("dmaap-dr-node", canonicalName);
+    }
 }