From 097b5d392ece9d783c2046b9f84d9827fb29714e Mon Sep 17 00:00:00 2001 From: efiacor Date: Mon, 15 Mar 2021 13:06:21 +0000 Subject: [PATCH] [DMAAP-DR] Patch AAF artifacts Signed-off-by: efiacor Change-Id: I53262c1788bd05f6ac48da60f3500ed8a480a3c0 Issue-ID: DMAAP-1571 --- .../resources/aaf/org.onap.dmaap-dr.cred.props | 14 +++--- .../main/resources/aaf/org.onap.dmaap-dr.keyfile | 54 ++++++++++----------- .../resources/aaf/org.onap.dmaap-dr.location.props | 6 +-- .../src/main/resources/aaf/org.onap.dmaap-dr.p12 | Bin 4201 -> 4217 bytes .../src/main/resources/aaf/org.onap.dmaap-dr.props | 2 +- .../main/resources/aaf/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes .../datarouter/node/NodeAafPropsUtilsTest.java | 2 +- .../onap/dmaap/datarouter/node/NodeUtilsTest.java | 2 +- .../resources/aaf/org.onap.dmaap-dr.cred.props | 14 +++--- .../test/resources/aaf/org.onap.dmaap-dr.keyfile | 54 ++++++++++----------- .../resources/aaf/org.onap.dmaap-dr.location.props | 8 +++ .../src/test/resources/aaf/org.onap.dmaap-dr.p12 | Bin 4217 -> 4217 bytes .../src/test/resources/aaf/org.onap.dmaap-dr.props | 11 +++-- .../test/resources/aaf/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes .../resources/aaf/org.onap.dmaap-dr.cred.props | 14 +++--- .../main/resources/aaf/org.onap.dmaap-dr.keyfile | 54 ++++++++++----------- .../resources/aaf/org.onap.dmaap-dr.location.props | 6 +-- .../src/main/resources/aaf/org.onap.dmaap-dr.p12 | Bin 4201 -> 4217 bytes .../src/main/resources/aaf/org.onap.dmaap-dr.props | 4 +- .../main/resources/aaf/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes .../provisioning/utils/AafPropsUtilsTest.java | 4 +- .../resources/aaf/org.onap.dmaap-dr.cred.props | 14 +++--- .../test/resources/aaf/org.onap.dmaap-dr.keyfile | 54 ++++++++++----------- .../resources/aaf/org.onap.dmaap-dr.location.props | 8 +++ .../src/test/resources/aaf/org.onap.dmaap-dr.p12 | Bin 4233 -> 4217 bytes .../src/test/resources/aaf/org.onap.dmaap-dr.props | 11 +++-- .../test/resources/aaf/org.onap.dmaap-dr.trust.jks | Bin 1413 -> 1413 bytes 27 files changed, 179 insertions(+), 157 deletions(-) create mode 100644 datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.location.props create mode 100644 datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.location.props diff --git a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.cred.props b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.cred.props index 89601c18..73ee4a9f 100644 --- a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.cred.props +++ b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.cred.props @@ -1,17 +1,17 @@ ############################################################ # Properties Generated by AT&T Certificate Manager # by root -# on 2020-03-05T12:37:11.094+0000 +# on 2021-03-12T11:38:49.244+0000 # @copyright 2019, AT&T ############################################################ -Challenge=enc:arjPt8EywpbifN2FfWqLe-yYCQFfYeX19GVWbKzl3NWlxD2fQzSL0SHFUBg0ElBz +Challenge=enc:9vA1vTl-6d8P2bOzJEyUtZ-hP95ubp7sW1fjxSmpGOYne5kSXrnKEKg-4ph-C72C cadi_alias=dmaap-dr-node@dmaap-dr.onap.org -cadi_key_password=enc:moianFhZr4ug9foXZlqRgtPYGf9gMfAH7PUBclLusFoLyCYdLyZ6GkNkXHbqnNsv +cadi_key_password=enc:s3TcKeRwuQe3ammLASLKvdoZ_lT7tFaHvhUPyD4fWTgG1in9HuODEzLzSb4w23C3 cadi_keyfile=/opt/app/osaaf/local/org.onap.dmaap-dr.keyfile cadi_keystore=/opt/app/osaaf/local/org.onap.dmaap-dr.p12 -cadi_keystore_password=enc:dEEn7HFrUBGoGq0M5MukUq_O8rnP0foDftHLXs68y889Et_jegXyU6U_Css07nnR -cadi_keystore_password_jks=enc:Tbtz9eL4qbdpvpG38sgaXRiXuluoSHV-beW083CDaSh2uhaPz5Xic3ybL-w5ZpgR -cadi_keystore_password_p12=enc:dEEn7HFrUBGoGq0M5MukUq_O8rnP0foDftHLXs68y889Et_jegXyU6U_Css07nnR +cadi_keystore_password=enc:imZhSSUJMwk7AuHB-B0dI_84P83n6diDiTl5pv7sthyGtoT8h11Q4B2M2SgAtKA9 +cadi_keystore_password_jks=enc:-Y-zJNwSoGr5SkEtmOVfKus6TF7V1iCHGnSbyUNZ2LPY0utPPbm8YFvQ871jU65Q +cadi_keystore_password_p12=enc:imZhSSUJMwk7AuHB-B0dI_84P83n6diDiTl5pv7sthyGtoT8h11Q4B2M2SgAtKA9 cadi_truststore=/opt/app/osaaf/local/org.onap.dmaap-dr.trust.jks -cadi_truststore_password=enc:REEtn_ZrfohiIuUQOcijhRwQEHnhWpa2Y7013dokESRMkrENT081YnKDWG3YR_FZ +cadi_truststore_password=enc:62_om4n9NkpeK0JEwHjhvqv_fJrgDrcCKmtJnLoltnk7HmetDPb97cGzI2WSx0Ko cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US diff --git a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.keyfile b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.keyfile index 74ec3473..4ae2c1bc 100644 --- a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.keyfile +++ b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.keyfile @@ -1,27 +1,27 @@ -fef7r7Q2Bgstaj1Og2hCZTD-4T7uB7PyYfdwbtsBVDqA3lMU2VnDyoqQyxnxVNHI7gPU32isgtNQ -F1lNErdq8JFqcg-6pwKHUDWXctaWzY_6sRczkzBHy8NFX1Z0C8vgZWGL1bU-LKB_HQOsIa-JQq3j -DQcZdYviebXPFWHQv3ROJsZzy-1mbwUJ4F1_UgeGVLN_gwbKg7H3ItZyOtRftgRDpEeEHy1kGyZm -wZr5TolWx_Kky1hUANFH5Xb_aTIWazcT4rIS0S4vGPpHXoywCfj3JUZXNUvr5Jvh3pp3HjyRSLu4 -npIY7agpkqx97ZQsrhlc06pflDZacif_yNSJ0q2tGUB9hfp9RAgGZ_oYzi_RM9tJrSvOgp2yWrqm -cNvaYW-KRi_rlBjIXfe0CwkqKZrYlPfWG16O2MnvRt42EuN5n7i0P9TA8oyJ8lelXpjKm00GodIn -iYUhw_lQDbI4hUGGsr_0t3ntBquvJoLqTVQuQVHQRsAmSbl_s5uqz9Sn84oOx7vuJrgEy9LNxBsv -X2e846nLDOkao4KcFEvIZAsHxvlPAgpMjzg6yptVvf8EHo38hEbSb6DPqO2gZ6PySMRFgLl5ncPP -hNQ7YHqFQ_VDBeraLm40-1Ehi5ko2-24MURDO5vOfrVxH1pkkjuj8I0EAaP9LRacbyoZ5Jfysepm -nYHztywj5riMiv4V7n18XKsAsbodXqVoZF9MuLZMhQ8buz3AXMmmZk6SRoBb7t1HBhvQEmDqa8UY -LFPyTtw9FGEP9bFGrfu-yYi_MaBbznk5WzPslOYczShTn2NLW_EHym3BvcmC8pWI3gTfC1DTcDMk --ZCyPbksVIF_U4yOALIIDRzPkKjTOljvbTlqEKJqfHrLHL3I5ubjSve4B5cWSic-kPFqJELj7SzH -D68T1yzynckBOlv1sAgovGVlx1P2YtNMU93lzXDR2ToOsbLpyF5ONQoThdcsorGjpPzkNyYo245I -1wYloeLFKThZUuKTtBbOX5aUjoFaokRdQ2F5g3FRczhuAyE9J91YSJLazAVgVg5VZM14329Hsfx4 -y0XOnJqNy1ygwlj05rIQrcfY8cLcoIQHozJv9CTy9fa1_cOrl39ErTKTaXlLGFkCIhzrOMLmSrho -v30AsTbCf0TdmDTRIWla3TxL2TCdlroY5QbiIRNBwD3hlT1-70SEMBpCfN9suuYWPeb6mkqcDnya -w7PPSzNcR_JAzdE8_FKtXTcPX4JBpqxO82QtTyOjrnCMddXlvhVBM3k95gN6TTP2qJ44w9rHh-3R -Lq4-PVJ0B5xUy_1t0VENhx9l0qyQ8IvAa4tzTAzG_Zqpck7fD2m0A0vx_XJfchte79lCYeRIoOx4 -vp8-WeHeqq35u9-uR49Sa4Ms1FTyOrgY1RberiGqG_M2kgtquJBIQ9uy68YVkGCP8aktIbkaFm0e -gQPkSBYo7GTKFDFPQNQkTQJasqTBWm49KwCRK4AVQLD4vycmC-17RnW40C9SlM9fWb1sJ_zRw1tZ -EbxogDu69E-lLBwAYze7EzDi7uprcp3XABdNDPej16yfcGDPx-O5rAqJt2vo_mHhK_AjHpGvP9CB -WHExyGzq3u1tQoxVK5T1QDLgsK9nhwLO5jPCWdRLarW1k-Z72yrdLbrDy2Lbsat5DCsMOnC8wH4A -muOjZ1XAeANq6oNWxeiyr1AokdMNct8792wIv9cUQTHzPuvTxsIMFqWbUGMAlxxI2FsniqHSSNrc -0FkGsY6vxhZe1kFJz3ucqf2zg1bvGuqfZtB3UvJquAi1xENNa-9A3OwbJN92Nzowmc55kA9JcksB -aLuzwrvd2lpU58oje1O2eDR3WZknn981mRv72bnh5td_8Vt_vOToh6aD2suBc45V_r-UKlrFSgWo -ze0ik_LXjWfN3fdeYgOOIpuwk_chwnmiXitGzcz2VaLDLfnQAzD06A6c7wUac6_RF3XVLjn114Tv -Uvm29vfsq3Xhel2Z7nHzFOp2T_g60HHU-NTC2M69GmUT_zJrWUXFrZenIANuPSP7C5pZlQeF \ No newline at end of file +8eW4Ws5xIgwNpnNu_Gq_KhPol_80m8yFretJeBMvL6BOYeZ7i1BfuTn-RAovW03M5nFzhklBpcco +RPoks-2mYpqp9pPztSCpA2rw11yOolsYFQEoanGn5JdVXB0m7ssIvkcqwyFd3TBO93jupaOMWO0h +3ArRNxhK8QZ6EiqDsp3Y43UgeCuHjVgjRrMP1HQYR6tUM3DBRzymwYjOvXQdRRcaTLei1mGlgDpj +n66OJ2vEjPKQdu8HELynbzvcmW8yEd-BqCRESz44IRTDqUW3MWt0fgHvbDj-a3CfZ6HIbxn4Wgwf +mQvJasPjd3tSVNXhyhU70aRmpKr1qNdwbMCQLqvs4-Voz9rF-FhZqWFipZJo9xLsPnc551bDRM4k +a6iqYXefr69pIKZXm_0ksfphElWIVU9vU7P0jmICAwXACJOcn3xa7JpHRP1NMv-4uVaZGRoAx0dj +G-45GZiNvkpS5Vq974ebNqASolB55N16cUMnn-M9JtjJYJ5EHIVrwteTldIjnU2z7iWMQ_c99Mb3 +kZWkNbVPFDGXyV8PSS13Zupzbo-_OA6XgFwccIRsQx9ZDir33kqWOqFnJ66UEgq-d96rQ_Zr6e-U +cnfLOmi7HlFnVb1tYk2k01B-6yiLdPvdV9uTR943TJrlLhADXvlutRzK6YPrRr-zxp71ekgc9DVS +9AU3cj4lw0-rvsfW5ke995QL4pQSo2ITcKHqenQ9bAKDxTfp_2acd0B4muLVMmtOcmoUnKYCix6I +c-DEaqK1E8Q8EHpMlZmp8uTloaL-0_R8Y1XwrrJXs9D2Smn5H87VZ-T8fzHtKYqNtOy7tRr3G9uI +it68rgBbEiEvpXQKQzMH7yVnso7FP_fgN5c960yOL93vEBmSPQ1DkkHqPVqwRmRhJH7g7sM9U5iC +988DsuodbX2V9A348oe2S4nVVCHDbCkZGKreCaQsfbYpOOaegVCSszqn6FGjfVT8Eb1Zm0BDcZFj +-_HGgXMYTHsFF-OxvCkRgS503kldxlyHHthDog34zxH4cqlJRDxWASEG0mx-3x2Er1UJOEkO-zoC +xMQvI05RAAydsRv29SIPqMDZXd7q_ymfWRzJIxgTBhz6zOb6iCRHYaT84CAMu8UYlJA_QcPgqEst +T34wLTp66HjGT0KtHIiljbzVzLs4PzfA3fKigWxi0CypPa9AleiT_aOa0HteRPx1imzrD--zjcxV +LgPaqr0cnalYRrIl3ITf5CZOR6kprO-zlsL_K-k2fmqGm0JBHfvBLohxHTZopNeuvmLDRg38d9A_ +bp13KS4jR4d10ATbIZkEjRjexvIi2NB6NPTJvBs3X4yanBa1miIQMWkPxIZQVTl3XGCc1s_7TfHM +wQaNRyWkrmzbfi_2I6fTH3PSv_ldYT5R1ZkxXe4HbdESp5OnAU1Hs84XycmNqHiA9HyRpMo4PGFg +PkPq3Jf8_l8FvgWsOoL7c5Xfr6Ty1FL8lhrKt3VXuwnTML0oJW2TlpRlW4coFgzT1L93QoPCV--T +kfn5ClXAfGsjqKy38G5_vFkrLRopHcqH7uuODAjk80luLFYQzTqq0R6jAPjQBz9jpVLKUP6D8Qtk +1lGUSvku_dmgTOkzuVTIloWiNH_1pyv9_dBWNc4DnYHho_Ox16U1yKag9X7jvewd5qyHbSCLVFDd +YoctOUZiPUxNoCXvWc-oxEYSj7MYzRZA3qTLXyDwcQGyyLvQfqEXpMAKMQdjnBk18Z72ACdKWjrM +rgvuGB7NAjjNmu_ffVn4p4RZ74bcE6Xz3sp4UU6tctoPXR0FNG_jBDUjQBfsxnONEk0DMFJuNkbb +bdZmnSXRhY9kZM3RZf2sQd9qbdcm-nZzWvBMR7-yKX7cXdIAbx4ROIfPDk54OFQNEVGwz1kMrd3e +A7fBmqT8O1ThbMlDpxCnSKPq80s_5JhAU5zLoMd7kWnD-ekmVhFqxZ7NtCrBfsK8NfE-aKCT-ObT +gnkjdX6pQJW0q3FBrR6lCwpCRVOkYA7BSrZAQSh8zzGOVwRWbRKlyUaKTzAkovKET1TgtPMo \ No newline at end of file diff --git a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.location.props b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.location.props index 9acde34b..b17da901 100644 --- a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.location.props +++ b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.location.props @@ -1,8 +1,8 @@ ############################################################ # Properties Generated by AT&T Certificate Manager # by root -# on 2020-03-05T12:37:09.234+0000 +# on 2021-03-12T11:36:12.939+0000 # @copyright 2019, AT&T ############################################################ -cadi_latitude=0 -cadi_longitude=0 +cadi_latitude=13.2 +cadi_longitude=52.3 diff --git a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.p12 b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.p12 index 6655dcf472eacff73998143f57bc21440181ab35..a82b2659c353b3d9d4f4725dfc2bac33bcf9203b 100644 GIT binary patch delta 4080 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 delta 4064 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 delta 37 tcmZqWZsndJ&swl*v!c#M6<<~n{odLw${*@aDSI4V%(Wswp;di@8vy$%4hR4M 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 ccf2744e..0cfbc75d 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("V+b}aGuWxHI+BPSNMVXqD*bx", nodeAafPropsUtils.getDecryptedPass("cadi_keystore_password")); + Assert.assertEquals("ikeRgx8Q++Vz}0)kOusl^xjd", 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 d139d0e3..2ea3f550 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 @@ -85,7 +85,7 @@ public class NodeUtilsTest { @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"); + String canonicalName = NodeUtils.getCanonicalName("PKCS12", "src/test/resources/aaf/org.onap.dmaap-dr.p12", "ikeRgx8Q++Vz}0)kOusl^xjd"); Assert.assertEquals("dmaap-dr-node", canonicalName); } } diff --git a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.cred.props b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.cred.props index f63286f3..714619d7 100644 --- a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.cred.props +++ b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.cred.props @@ -1,17 +1,17 @@ ############################################################ # Properties Generated by AT&T Certificate Manager # by root -# on 2019-10-02T14:25:19.002+0000 +# on 2021-03-12T11:38:49.244+0000 # @copyright 2019, AT&T ############################################################ -Challenge=enc:HJsK_drz0D2MDwwSw-8DRU9HMrZKkyoLzJoHmSWzVNmfV60-Thvzv8cVzE_5muYb +Challenge=enc:9vA1vTl-6d8P2bOzJEyUtZ-hP95ubp7sW1fjxSmpGOYne5kSXrnKEKg-4ph-C72C cadi_alias=dmaap-dr-node@dmaap-dr.onap.org -cadi_key_password=enc:9dftI1cNP6buWnYEeCezE20kaEM7FXz7uZnRfbtQWJKw6F6Xgph6VOG8PCItM7Q9 +cadi_key_password=enc:s3TcKeRwuQe3ammLASLKvdoZ_lT7tFaHvhUPyD4fWTgG1in9HuODEzLzSb4w23C3 cadi_keyfile=src/test/resources/aaf/org.onap.dmaap-dr.keyfile cadi_keystore=src/test/resources/aaf/org.onap.dmaap-dr.p12 -cadi_keystore_password=enc:HRDU37Il5FnfAIi9F7Hk76nenrM67n38irDqaZMq47tAu2o-KS3pCwiXSly0WZ0L -cadi_keystore_password_jks=enc:xra37lQs-DyHe714sczkXACFJqtvylqj01qbqaC39bvkDMd0qInjg_pib9aJDM9S -cadi_keystore_password_p12=enc:HRDU37Il5FnfAIi9F7Hk76nenrM67n38irDqaZMq47tAu2o-KS3pCwiXSly0WZ0L +cadi_keystore_password=enc:imZhSSUJMwk7AuHB-B0dI_84P83n6diDiTl5pv7sthyGtoT8h11Q4B2M2SgAtKA9 +cadi_keystore_password_jks=enc:-Y-zJNwSoGr5SkEtmOVfKus6TF7V1iCHGnSbyUNZ2LPY0utPPbm8YFvQ871jU65Q +cadi_keystore_password_p12=enc:imZhSSUJMwk7AuHB-B0dI_84P83n6diDiTl5pv7sthyGtoT8h11Q4B2M2SgAtKA9 cadi_truststore=src/test/resources/aaf/org.onap.dmaap-dr.trust.jks -cadi_truststore_password=enc:xWbQBg4WdbHbQgvKGrol0ns16g9jgFYteR3nQkwTl65BtvtWf_ZKhSVP8w_Z0VHU +cadi_truststore_password=enc:62_om4n9NkpeK0JEwHjhvqv_fJrgDrcCKmtJnLoltnk7HmetDPb97cGzI2WSx0Ko cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US diff --git a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.keyfile b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.keyfile index 8794edd7..4ae2c1bc 100644 --- a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.keyfile +++ b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.keyfile @@ -1,27 +1,27 @@ -3WQe3-v0lopz56oP3LKdegKk2FaNrftIicyQ47IHI07CoBrNy4JYGO9JtnWHDy1AdD6IDVkBf5zD -aTMFDs2EeRdL7rhMeb7xwphn0rOWR9eOWZpU4bDArSfnSRyWoGj5AopLJigrymBifJpoFOgkfV-h -VnYRv9884_iJ5QxAbEGK024-vnv1vZyS9ESmjbDjbw6S2-kjmqEQn_18rzrtinaRdcA89GSqtf8W -a9CWE5nVnb3w-RzDlwM0kDGFCpD4Meo3gNmzH1-HbaTz79q2V8ia6_FZJIjP3xWkEjX8MiwKUX9u -M7hhhtEQ8g9voCh_LrHEEbRmsMymeBBOeUFcB9nw0OU2-KnsZYweZtHt2aQP6336oFy-VhIG34qF -Wm6jD9HBchaOvepPlDcv1rEU9k-2SOM1RB0BFGDNVfVHGkdBD7c4NqnPxcGoq5Ujyx3gxHoKPD0- -Kzab1_agGCNIb6tfnPuiubVeP6-gHjkwARYDFBLpBXdD9dy-8s9I8rhawob6yX2ZtP60tN2HZs01 -iP42aU3QyJQgMa3fTU3Fx_DbWvaSOI0ZM9kAt-TKA5YR407IPVy4W65N1J8XfkFz-eoHcYwxIUY0 -qbF8fyEpjrh2smRSy1u340UvlCdBEzrt1TQw5RQqV1JYN-o0Mi44-9KjqkJzKrmk1pNjAR43w3h0 -xz2EhIobjHXgiX3KGYNk_FrvVFk4MQ4-HkqFvHY0Z5mG5O4I1ePzvHp32zTfqedAdQdsdy4VKU9b -xH1tBREsRBB0WzXhLHilZ6PvGnQ7YpNo4z2WlDVR5zmLWim1062OUbp5w1QXBeO84EI2QoUFQnhI -2xaFm9YFkPXUoqmh-phcRYKd4xkTKEcq5jU_k8Qpu3pml4uKdGfNnog2xhXxC11RBlvIyPiNJy-n -RqywcPZ5woNEyqdbB17F6Z2FuyuruG6OTdLP1n_hiC81BBza2onPKsGxkA0VJixq4W_jn-KO578M -Y1918I1w8NTD158T35M7Qj0XgUJn3HMp-JGX_3tjOlWNedMCQUCz_8GeKi5Luwt_we4uheZYF2um -2VVQmcHNk94hgA4jaiHBXnLK7qLHVLpRBaNvNjFI7GFI4CMIkhZV-e7ziPk1dauaUaeAI7Th2_Sb -lsyzGJ-pjF_l53QENjwTR5Dp6Dia61unCImJJ3xFcZuq-ewnWjdp8l8MBz5Sp5hOnkLEoL_M_FyF -zo6f868bB8Eqq_zn08Icb8QpvBQx62-GOg51jCdTCSKWJauTf_zhTNfdd2h-IO2RX03NYXr3ZDuo -j9KLodsG0FIwEdX91Ju_X1A15RJKKKK2aAhF1gPj1_pq4gsACcie4QGox7y1kbVMhqNJc0cStvxc -tcEQJd2cMfawVeHoOUpTXwfbUk_GaLPmodoks3Dm1f0M7WdsSme4_c4iRsrawRPXEnbhiEbstumq -koQUPe0f3hcCnmQPC2jLNZIISJNwp_BfziG9IlO0TuxKt9a_Qkmx22NKft4QXUSAgiMjffJP9OMj -jYeryZYGIRGjGgxZ-J5_2U65_lLhtwalQqmyAWl6ET41xpM5tUth-iOy3Sx1-jG4bRchnFzDxkL7 -iy-BD1lICg5UuDr2mMF3QxHkJ9UqNaDgY9ix9CFvIilyq9QJv1seweTllLd8BZzNnBpRytz3b4If -5GDts41sdx388IgIcj0zhwJZNwjWa7GJRKIHymq6rRGTlfDruski_En-Vqct0-74mpX3c9kSLY02 -QFU04YfTduCRnNnrAKRccTuo20HE5gC0g16R5BGJ-9puLzhmQfl96M-WfnHz-i9oYd_Yq235Uq6O -K2iuPqDFt1Ob9HUFH1F1X9MD8MbZnG8UD6CQMmJn3bO4r8zBpUo2pQMhAOHAWBHFE-5EscJ3APgg -YCvwlPjYBRn1za-kmn9pTQ0gr7TkqjwLKBtdeh6RFWmA2ebxzQ20UIDlzppHokQ652n7SQy1Cagy -BOmDZvZ91ylkv_aygfFsnsOqNFnCF9L6lo05rw9Bt_jzLjbuT-Up6IGyhkCy6I785e8gDyCX \ No newline at end of file +8eW4Ws5xIgwNpnNu_Gq_KhPol_80m8yFretJeBMvL6BOYeZ7i1BfuTn-RAovW03M5nFzhklBpcco +RPoks-2mYpqp9pPztSCpA2rw11yOolsYFQEoanGn5JdVXB0m7ssIvkcqwyFd3TBO93jupaOMWO0h +3ArRNxhK8QZ6EiqDsp3Y43UgeCuHjVgjRrMP1HQYR6tUM3DBRzymwYjOvXQdRRcaTLei1mGlgDpj +n66OJ2vEjPKQdu8HELynbzvcmW8yEd-BqCRESz44IRTDqUW3MWt0fgHvbDj-a3CfZ6HIbxn4Wgwf +mQvJasPjd3tSVNXhyhU70aRmpKr1qNdwbMCQLqvs4-Voz9rF-FhZqWFipZJo9xLsPnc551bDRM4k +a6iqYXefr69pIKZXm_0ksfphElWIVU9vU7P0jmICAwXACJOcn3xa7JpHRP1NMv-4uVaZGRoAx0dj +G-45GZiNvkpS5Vq974ebNqASolB55N16cUMnn-M9JtjJYJ5EHIVrwteTldIjnU2z7iWMQ_c99Mb3 +kZWkNbVPFDGXyV8PSS13Zupzbo-_OA6XgFwccIRsQx9ZDir33kqWOqFnJ66UEgq-d96rQ_Zr6e-U +cnfLOmi7HlFnVb1tYk2k01B-6yiLdPvdV9uTR943TJrlLhADXvlutRzK6YPrRr-zxp71ekgc9DVS +9AU3cj4lw0-rvsfW5ke995QL4pQSo2ITcKHqenQ9bAKDxTfp_2acd0B4muLVMmtOcmoUnKYCix6I +c-DEaqK1E8Q8EHpMlZmp8uTloaL-0_R8Y1XwrrJXs9D2Smn5H87VZ-T8fzHtKYqNtOy7tRr3G9uI +it68rgBbEiEvpXQKQzMH7yVnso7FP_fgN5c960yOL93vEBmSPQ1DkkHqPVqwRmRhJH7g7sM9U5iC +988DsuodbX2V9A348oe2S4nVVCHDbCkZGKreCaQsfbYpOOaegVCSszqn6FGjfVT8Eb1Zm0BDcZFj +-_HGgXMYTHsFF-OxvCkRgS503kldxlyHHthDog34zxH4cqlJRDxWASEG0mx-3x2Er1UJOEkO-zoC +xMQvI05RAAydsRv29SIPqMDZXd7q_ymfWRzJIxgTBhz6zOb6iCRHYaT84CAMu8UYlJA_QcPgqEst +T34wLTp66HjGT0KtHIiljbzVzLs4PzfA3fKigWxi0CypPa9AleiT_aOa0HteRPx1imzrD--zjcxV +LgPaqr0cnalYRrIl3ITf5CZOR6kprO-zlsL_K-k2fmqGm0JBHfvBLohxHTZopNeuvmLDRg38d9A_ +bp13KS4jR4d10ATbIZkEjRjexvIi2NB6NPTJvBs3X4yanBa1miIQMWkPxIZQVTl3XGCc1s_7TfHM +wQaNRyWkrmzbfi_2I6fTH3PSv_ldYT5R1ZkxXe4HbdESp5OnAU1Hs84XycmNqHiA9HyRpMo4PGFg +PkPq3Jf8_l8FvgWsOoL7c5Xfr6Ty1FL8lhrKt3VXuwnTML0oJW2TlpRlW4coFgzT1L93QoPCV--T +kfn5ClXAfGsjqKy38G5_vFkrLRopHcqH7uuODAjk80luLFYQzTqq0R6jAPjQBz9jpVLKUP6D8Qtk +1lGUSvku_dmgTOkzuVTIloWiNH_1pyv9_dBWNc4DnYHho_Ox16U1yKag9X7jvewd5qyHbSCLVFDd +YoctOUZiPUxNoCXvWc-oxEYSj7MYzRZA3qTLXyDwcQGyyLvQfqEXpMAKMQdjnBk18Z72ACdKWjrM +rgvuGB7NAjjNmu_ffVn4p4RZ74bcE6Xz3sp4UU6tctoPXR0FNG_jBDUjQBfsxnONEk0DMFJuNkbb +bdZmnSXRhY9kZM3RZf2sQd9qbdcm-nZzWvBMR7-yKX7cXdIAbx4ROIfPDk54OFQNEVGwz1kMrd3e +A7fBmqT8O1ThbMlDpxCnSKPq80s_5JhAU5zLoMd7kWnD-ekmVhFqxZ7NtCrBfsK8NfE-aKCT-ObT +gnkjdX6pQJW0q3FBrR6lCwpCRVOkYA7BSrZAQSh8zzGOVwRWbRKlyUaKTzAkovKET1TgtPMo \ No newline at end of file diff --git a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.location.props b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.location.props new file mode 100644 index 00000000..b17da901 --- /dev/null +++ b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.location.props @@ -0,0 +1,8 @@ +############################################################ +# Properties Generated by AT&T Certificate Manager +# by root +# on 2021-03-12T11:36:12.939+0000 +# @copyright 2019, AT&T +############################################################ +cadi_latitude=13.2 +cadi_longitude=52.3 diff --git a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.p12 b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.p12 index 607e2f89be513a9d9817086deaec60f7602f4e94..a82b2659c353b3d9d4f4725dfc2bac33bcf9203b 100644 GIT binary patch delta 4014 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 U3heVs>!o-|I-p7k0s{etpl&R*KmY&$ delta 4014 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 U6j!w`g$);dnFo-^0s{etphgnK9smFU diff --git a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.props b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.props index 53c6de05..38fc3b81 100644 --- a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.props +++ b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.props @@ -1,21 +1,24 @@ ############################################################ # Properties Generated by AT&T Certificate Manager # by root -# on 2019-10-02T14:24:02.090+0000 +# on 2021-03-12T11:36:12.839+0000 # @copyright 2019, AT&T ############################################################ aaf_env=DEV aaf_id=dmaap-dr-node@dmaap-dr.onap.org -aaf_locate_url=https://aaf-locate:8095 -aaf_locator_container=docker +aaf_locate_url=https://aaf-locate.onap:8095 +aaf_locator_app_ns=org.osaaf.aaf +aaf_locator_container=oom aaf_locator_container_ns=onap +aaf_locator_fqdn=dmaap-dr-node +aaf_locator_public_fqdn=dmaap-dr.onap.org aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.introspect:2.1/introspect aaf_oauth2_token_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.token:2.1/token aaf_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.service:2.1 aaf_url_cm=https://AAF_LOCATE_URL/%CNS.%AAF_NS.cm:2.1 aaf_url_fs=https://AAF_LOCATE_URL/%CNS.%AAF_NS.fs:2.1 aaf_url_gui=https://AAF_LOCATE_URL/%CNS.%AAF_NS.gui:2.1 -aaf_url_hello=https://aaf-locate:8095/locate/onap.org.osaaf.aaf.hello:2.1 +aaf_url_hello=https://aaf-locate.onap:8095/locate/onap.org.osaaf.aaf.hello:2.1 aaf_url_oauth=https://AAF_LOCATE_URL/%CNS.%AAF_NS.oauth:2.1 cadi_prop_files=src/test/resources/aaf/org.onap.dmaap-dr.location.props:src/test/resources/aaf/org.onap.dmaap-dr.cred.props cadi_protocols=TLSv1.1,TLSv1.2 diff --git a/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks b/datarouter-node/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks index c837fa05c612e4d064025aa15ed1ea4858f3a452..6739cdc48bcb9126469b78f575ac19d7a71820f5 100644 GIT binary patch delta 37 tcmZqWZsndJ&sw2o9m};*#g|p&vG>huF2Qjh&VAYWGPK0!{-Gn1KL7?U5di=I delta 37 tcmZqWZsndJ&zjqFCuj0T6<<~nAH@rWLNAh^=I*_-fz2c*NA63p7XT4q4{HDb diff --git a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.cred.props b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.cred.props index 9fcdab50..ddac3673 100644 --- a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.cred.props +++ b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.cred.props @@ -1,17 +1,17 @@ ############################################################ # Properties Generated by AT&T Certificate Manager # by root -# on 2020-03-05T12:36:12.862+0000 +# on 2021-03-12T11:29:50.699+0000 # @copyright 2019, AT&T ############################################################ -Challenge=enc:7gehgpiMkEwaTx3oKhCefuHkR7crpUA-x1B0NogqrE3lEaLhKtFdvnRB5pPTj2EH +Challenge=enc:vAjLYtGeryLHcxGPKVfnclyeD9RqGdXITc4hl6CZ4TZJ0zX8Ye7oM8ZI2sprEBFC cadi_alias=dmaap-dr-prov@dmaap-dr.onap.org -cadi_key_password=enc:KzKvy8LAuKGHgtuSi9TFIl8k8RYO_pan9Rrwt1AV3eA2M99Pr1eaQcu2vp34qNtA +cadi_key_password=enc:3-xb3J9NZGt3Bi1pBU8IzUkK9dDZlxcYR5VNIZsh0LkgUWeVctdh3hIwNjWAkSem cadi_keyfile=/opt/app/osaaf/local/org.onap.dmaap-dr.keyfile cadi_keystore=/opt/app/osaaf/local/org.onap.dmaap-dr.p12 -cadi_keystore_password=enc:AmEhA0DTBGjpUL5rSqlpgqc-6WYnWciDUzSr_MlW89sxQ7j_man8jKmTZgMNjERT -cadi_keystore_password_jks=enc:eM8G-92zhJ93zauXZZXcApuYVgyU5YiCXcwsc-vqb0xy24N7Gu8_U9fxFoTc4Bze -cadi_keystore_password_p12=enc:AmEhA0DTBGjpUL5rSqlpgqc-6WYnWciDUzSr_MlW89sxQ7j_man8jKmTZgMNjERT +cadi_keystore_password=enc:oTui_2WtTJacNR4BzMpwMNkK9dDZlxcYR5VNIZsh0LkgUWeVctdh3hIwNjWAkSem +cadi_keystore_password_jks=enc:MzNI3f2sBZjEZLe7H-qtPqsS8Ep6izdrfMSC6HgcODln1yQTf3TvT2lGCd6k3W2U +cadi_keystore_password_p12=enc:oTui_2WtTJacNR4BzMpwMNkK9dDZlxcYR5VNIZsh0LkgUWeVctdh3hIwNjWAkSem cadi_truststore=/opt/app/osaaf/local/org.onap.dmaap-dr.trust.jks -cadi_truststore_password=enc:VjqBxrpk8OzTGztORRd2Zhk7X887ZgcUfg-iJpmv3vP0ubL07EpZbSi9p7iZGUr0 +cadi_truststore_password=enc:m-AxI9-7yuDFjMrkrqDaFeBCRcLZg1odoJ5GsmnAHKqp2zOMPsFj7WIKblDLVMOb cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US diff --git a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.keyfile b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.keyfile index 1de63600..fc4a2f90 100644 --- a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.keyfile +++ b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.keyfile @@ -1,27 +1,27 @@ -jg-C7FBcp3wFZyNC4xwoRrM8Z_iRpBmIC944YE-6LvGBa0Y6NbtIp16vtKSk6sqg7sdvCG3yZmqM -IiWGJpvLn5qsgmKQEKoi0jxxX1uiOqDmCRzNhekndYfnwjftCmbEFAtjWVGY6n0K4E_O0jaJ9Wmn --tz8VFn6fLXbt-J0R6TMb_ir3H6VM6RX8OKMNEQ3Pbw_VhQKu-dFHKa-hb9oCx9pqeFMNCDD0SrD -1Rieu_c-OIkVGJMWYCtc5HZoN5MB7QnrFfrkoLCRLHOErOoW19U_iZw4LRoQF2_JNaj4TJD9THL6 -ag5icW44V1vctHUGgMcRC_9saJQk3XDnuDiIkYzd7vSc0vJx-1SZpsaIgP76sbzY0BCyfSgycrcf -XDwtky8vU3SjdDWbpMNUrm7JGTgrzKUOGDFnqiRGOQnWYMOxlcKTrVpDL9rcU9udwq_5lvSx-7WQ -eocj00pyBQDWuzsXKj-5BqLfy0CQt8-M6LJv-xzTRX1-MxKL2w0kxlQ5iuw19e02F9dz3516hj_8 -OIyGHBaJveBovGwszjNeAUv_zyzCrP1vpGhtdVEsmJHYN6aO88FVpbMcyjo84ZB9jTet8kg_BTqF -Un1xVZ8yg1s-BWCc9RDVy034N9weyA6oBZpJSqUvUtH8s2A73wke4X0IuiAYXI5-haYL60pi2oUo -4AFUtMjCXn9USkc-JZb95ggKN9dMI6Lsl1i3cn6bOxvBLkvPUWk1b15zEbBVOYLiOntyzU3e7gfc -OKYSfZLQFa_sLCI9tIw6tFaWiKvXdvs8VxoXNZ8jSw0r8-KlK8pDn2eXAIFoai4NChPU5PxWwxyZ -8CNAs418oSuzU9L2WZfIh3wHSLU0Ehi63thx1h7nYHzSgioL36uUTHKAppS-amB1oxg820IsAujO -CkjQrnECWwc-ndsbLK5itdvPbOWUsW5oDQq0TP5fgJTPWfWRKLCpix2V6QNO8Al61WkvnjfY9Iuk -f9ENhL4dq3XvmkciviJqaDvDDOrNHt_ioNQSK1ZMlRjlAW_8F0GNy3r8XNhFzssqj5XrccuFK9l6 -Rs8LpFvHK_F2cAVm03h8CeZQTkO4qvpIKRoPO_VOtLiuVD6Hlb-Tw36NxD6YEVfGwiyZMXHJ3OKj -e8Q8YSC3F5blg_otXMXJCDJYzzeecIJxkQ4cXqJasse2kCUYVx2r47aWw78FtPz4Lq0axmJfU2K3 -IP_y6ylL2RQk089Y2RkCxe2MNNNAmQtxXq8-9-1wcZezyPC0IRZcofy_-dYKaGoe2KwB-pEvTfXy -9MI2Od0-tVP8Of6DFHD83VZ_33Ld3AesM8mPguQzRSjlR1AcNCNP2-5hNYl0KAmd6lYpu7rNMtuX -U461H3RZhdK4JvLQGJ40Aw-lcyTpE2OByJ2la09qrpIxYig4sN4TXpjLc9u-tGAIP7AqvZmxtk2E -dZxkcksHrFwSwyRAZ3_VWjyphd5q_bIRuhx36EdXEapx2vedBeIMRIp5gt3nMFbWI0lVO5YcbJtl --A_jnAn_7jv8DX2ePbq41OAJjhYmDwBevIfhz6NF8pfpX0JDMfEPsNcJZW6mkJ1AcsIWGO5Jw355 -IUk0D_Iug6tT45cNgOfn10zW8dMfOruGezq8gr4THw92L-Tyy30RYBw4ctxAmUfQ33qHn3DwXK3H -8botBXIlQnWnJjM-bAPf1vpnRFB10VUNCuBGfjtH1CDKrJR6BRPKCOC9_Pm1Rq33zQTSt16FMG4c -jSt-l3cJlrW__hUha1ONlmSWRudW90LH0PBsbxGliEH7WWfLU91XsODjzB_FWVnKW_x2ylnUgdk0 -7ea1FCodRTw2Wu3HjtVwofD7T0WEx3maDKUS_X5ESfwv4wACrpXd0a2URWLT1kNsmiuSLSUrezXa -TG9GqlbdXJFu94mP-6mmoOc3dumjIXsnbykCkxWQmWuK6cgwFb78ASKXx1N0aKc3WnvHFe7DRkPn -Fx7wkQXVlWir2i9Sv8F4QtmK_bE9JEAOo9rVLBb_t0SW7cPUbkCGIVddiKThv8oVlgT_ZOg1 \ No newline at end of file +FuUPjMTqwItkH0pd22hdRFZCYb2PWFyts5oBr1sMuNcQN1CN32VU-c_m3FehqOb0XNHmFPNJqfzp +zjdictrDN34GQ-pmrKk_ZrdjFfhibPjzKLWPW1tl6fa-bc2y_DGLCkIirvjA27oEgzVQ2CgbQw7Z +N1honW53m6Sq_rHYilkJ25w8h_Y2Nw8TCZv2cQGi7OZJfpyZAC4mWFokAELjh3kcgbfXOdBxZxf1 +HBTpjmnDsOmpveOnDI9KU22Cs-GzT1g_avT8mxufj6252YimBd7ylpLU8F_28YJHop6CAB_YlRGJ +xTeuM2Yr8ny-6OkQoOTIIU6iwI724ctQfuqB7QhUVgziUi8Lr-nT3nuZqsmvKiNd0B8P3_zxnnyc +bkRyWwz2UIsiPJUq9Ne9YszUnmPhztCSY3dWP75NpPL1liT-sXWp36ekUUMNNrYxTIZDCLlMu-6h +frFeKLN4xamaMuUCtQnh5WogsluWo5BAE4XaFSSkCWzXYCn3i5UK2E_iKPvA6rROvB1WzHNa05FH +_aKFCm3QlwwgcBE2b76NlN27QHt5OYv5l16_4SwR_NU8eQwIfDNsf55-r0aPsj3GE8bD0EQ8upjR +k_QQ9r1hOFmOOYR32A1XOjosh9VTAS6I69AVLXijJKdO1xe50zno_OCvpOTBBxdQo0fVMFNxORAN +xhzbmmeP8ouJyBhyb5RcdY_FKwjRUt1KECvtheoz1UbMHy-MqzxHnrIWhHA31fClJiEccynDKE7_ +koHlK1QoO4BBZJvrDqvhMYNIMl0MGkM6F7M4acB8s-WaG1HrsMX_bevTL3mrdNGGlUdIHpIuDqS3 +8BZGDXSlm6iXJ6PhkKyoSLGmInBKoYDPPYBcLK5xqPPL0Esqq5PRxvqqG15VzoFi2Wzpz6d7SfqV +AUdJiP_H_NL4wZcw-JaftP2svNbKDqoT0dZ5NqffSPMxT2zGK-2nsScn_Grmz27HoJMaD9LQwuwh +FUdc9UeS9IwOmC09PAlcWBRM3sLhdmHhC8V6SbzEaRgjYzjOiF4XGzdWmPdsELa7aDw30VuGbCit +FJjVNNzk5C6ncVisqXZwUQzL40G9N2Vd07rdyVuFEKfFb4o8_yCVCiC2NRKR5_DyvQhCeQGpG6qu +fglPdu3xHuiufgXdg_XnzWrKhJNF7HmWkGfG8KySLgfPNTjZlPNLa54ePMnnr5sdacgtDRbCXzaN +Lve28nSS-EPsB-peXDVqayqMbhPZv-yWl-O65B7Rwc2rLcJh6I-296AxMxFOB1cHPfXK1CBaBvlA +I_u_G_0NVRUuqg5CaWw-yDv_tzqnDCID5smObdd-9QOnRA_t3NTkPFhhOvbQjju2ZA7FdrZnMDem +eG-znmI2JwQlgrzybXs2MHOtmI1d9sAUROGkYSnzMzCX6GXd_vf-UD3SpfURrQ2SOmflVf1-WKZh +a6KcKPhXHH0wxB4fLxmvBVHT8U0E0PMbQ_ilZ9lU9A2fxcwPhnZpwJadZQ2H33OdNVFHDARWBZj0 +3Kt0eVIfxaRWgptF0WYPlh5ge9oveMWMvDg4oIAdBDNrkcX4cCfS9dmmXvCNhtY5KrQPr9SO66OC +nljHSsmTRDcIWgi23chfJcm8GJbwC4MD2JSb7oqXNIDUCse5SInSWSpdH0sAgbDrN0_fzoF7rLVH +wgFLuQBCJQtCW9D00iVfaUj8BfvHaH5xpO09DpK10CDV1lgjav9x88KcQo7jtcDUNEf4NM8_oo9K +zAil7PabfVsvBGjU-YAW7_sF9jPiQgYYD4DHXOi3o9tvwBWrwAyoI13ziMzlCXZw8f1ftpE2VVPW +su0QTPd7TO3B_gdWeaGbkBKyMU06SqrXd6-OPdBepSiNtKODRpY3dOFYsQVUkQOfyLYdoso_BO5C +10I_DTKHgO32yenIJPn72qPSk3-lxbcHhqPy96u9Y-krmOnx1bjoeN2jhJEKxwKQclemP-eFHDKz +LMdbL_gt946nPVqrKPZtzDSkqztoal3sWmkoT__6fK0sMyIU64VCaLp2pyuh8dujFe3DDmi1 \ No newline at end of file diff --git a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.location.props b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.location.props index cf7f48ad..11dafa78 100644 --- a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.location.props +++ b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.location.props @@ -1,8 +1,8 @@ ############################################################ # Properties Generated by AT&T Certificate Manager # by root -# on 2020-03-05T12:36:10.661+0000 +# on 2021-03-12T11:29:45.890+0000 # @copyright 2019, AT&T ############################################################ -cadi_latitude=0 -cadi_longitude=0 +cadi_latitude=38.0 +cadi_longitude=-72.0 diff --git a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.p12 b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.p12 index 21a6de6f83faec83d5bff062964447358c4099ba..7b37cbe90f34d0e8c46eb410396d0750e28f112e 100644 GIT binary patch delta 4080 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 ib$Lbv6srW*~p{#RUk7^U?kcBNHxs^;r# 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 So{31tt|uc*CISNi0*0UzZqnlb diff --git a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.props b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.props index a5fe0221..897b076b 100644 --- a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.props +++ b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.props @@ -1,7 +1,7 @@ ############################################################ # Properties Generated by AT&T Certificate Manager # by root -# on 2020-03-05T12:36:10.660+0000 +# on 2021-03-12T11:29:45.885+0000 # @copyright 2019, AT&T ############################################################ aaf_env=DEV @@ -11,7 +11,7 @@ aaf_locator_app_ns=org.osaaf.aaf aaf_locator_container=oom aaf_locator_container_ns=onap aaf_locator_fqdn=dmaap-dr-prov -aaf_locator_public_fqdn=dmaap-dr.onap.org +aaf_locator_public_fqdn=aaf.osaaf.org aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.introspect:2.1/introspect aaf_oauth2_token_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.token:2.1/token aaf_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.service:2.1 diff --git a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks index 96e3760cf61315a03e498e594fce1d3f4e61cef4..c61528accfbe8864ce9097d4598c22a9f427ac74 100644 GIT binary patch delta 37 tcmZqWZsndJ&sw2otQE0Q#g|n?qG-3ZrDj8+;>#ENWN*f)ugjNW1OVCq44D7` delta 37 tcmZqWZsndJ&swl*lkK*RD!!~D;&*$Kk6qjq?z>f;?L@Jbtm9XKsQ?h84(9*> diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/AafPropsUtilsTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/AafPropsUtilsTest.java index 64c5e492..d6de895b 100644 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/AafPropsUtilsTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/utils/AafPropsUtilsTest.java @@ -37,12 +37,12 @@ public class AafPropsUtilsTest { @Test public void Assert_AaafPropsUtils_Decrypt_KeyStorePass() { - Assert.assertEquals("m9l&3F+{7E&xE&v7xugWAAy0", aafPropsUtils.getKeystorePassProperty()); + Assert.assertEquals("SYCnsM&BPf@JFhi[&Z2?w?p1", aafPropsUtils.getKeystorePassProperty()); } @Test public void Assert_AaafPropsUtils_Decrypt_TruststorePass() { - Assert.assertEquals("@y,%VD).h8k1z+j1Nhar?.Af", aafPropsUtils.getTruststorePassProperty()); + Assert.assertEquals(";#HI&OVN,V5O!qBRoNiQEut:", aafPropsUtils.getTruststorePassProperty()); } @Test diff --git a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.cred.props b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.cred.props index b06b283d..96048dcf 100644 --- a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.cred.props +++ b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.cred.props @@ -1,17 +1,17 @@ ############################################################ # Properties Generated by AT&T Certificate Manager # by root -# on 2019-10-02T14:52:33.828+0000 +# on 2021-03-12T11:29:50.699+0000 # @copyright 2019, AT&T ############################################################ -Challenge=enc:D1K4bZlKwIDTY6RYX4V1nCgj1mJruMZ4qDaO80iSwm20J8zpUa0qEzOwM-aFjKCe +Challenge=enc:vAjLYtGeryLHcxGPKVfnclyeD9RqGdXITc4hl6CZ4TZJ0zX8Ye7oM8ZI2sprEBFC cadi_alias=dmaap-dr-prov@dmaap-dr.onap.org -cadi_key_password=enc:d80GqeXpOhPOmZAn76t5xgKlq54yAPYQw-OoVqFwcXkCwd58zwHfzZQ3Rgitj30- +cadi_key_password=enc:3-xb3J9NZGt3Bi1pBU8IzUkK9dDZlxcYR5VNIZsh0LkgUWeVctdh3hIwNjWAkSem cadi_keyfile=src/test/resources/aaf/org.onap.dmaap-dr.keyfile cadi_keystore=src/test/resources/aaf/org.onap.dmaap-dr.p12 -cadi_keystore_password=enc:xcPI_-oWnLvQ8SFDyafZG7ii7yZdcgaUwVQFp7x9mkHTnyODGDUaPHb5svAE2euP -cadi_keystore_password_jks=enc:EO1-8pk7wWbiGMriX0aAOX0zxoQ9-ow7LRqOlKgMYVlYGs59yappGzKd0FxkcqM0 -cadi_keystore_password_p12=enc:xcPI_-oWnLvQ8SFDyafZG7ii7yZdcgaUwVQFp7x9mkHTnyODGDUaPHb5svAE2euP +cadi_keystore_password=enc:oTui_2WtTJacNR4BzMpwMNkK9dDZlxcYR5VNIZsh0LkgUWeVctdh3hIwNjWAkSem +cadi_keystore_password_jks=enc:MzNI3f2sBZjEZLe7H-qtPqsS8Ep6izdrfMSC6HgcODln1yQTf3TvT2lGCd6k3W2U +cadi_keystore_password_p12=enc:oTui_2WtTJacNR4BzMpwMNkK9dDZlxcYR5VNIZsh0LkgUWeVctdh3hIwNjWAkSem cadi_truststore=src/test/resources/aaf/org.onap.dmaap-dr.trust.jks -cadi_truststore_password=enc:XawqMezvaPspcdG9J9tdYx-pEtIu4VaY_QG3ZyLtyWg_gsxvrfg2tInmj95fAkrj +cadi_truststore_password=enc:m-AxI9-7yuDFjMrkrqDaFeBCRcLZg1odoJ5GsmnAHKqp2zOMPsFj7WIKblDLVMOb cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US diff --git a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.keyfile b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.keyfile index c5d9d876..fc4a2f90 100644 --- a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.keyfile +++ b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.keyfile @@ -1,27 +1,27 @@ -0wlntBQae2B_RCqlj0vFvThyNkGfB47eGQ-JDX2LvNaIWjhg6P114TZ1dVwoqIUO_GvGdZfXvTNe -9W-86XLVDuaom2Ep0bWGpweiIfnRuXuMWwZy7vNRS_jj1GQ8Y30_SrXft3YVHR_r1AC3XTOk1LSS -Yeo356B7juJuOnkRpZwyZflEZM_U72EymWOd5JKb5ugrtdRBCXzh_pmQ24kxepi8XMFoaViI2ccL -KbL3fjSsberNKsSYqeGtXmcElEvDUfNam_ylxTStu-BbZRjelr5zY-rQnvXl01Tapkdl_ejIo8fT -FcdZTSMH2eic32WGO5QJzIhaEXoJu3oNzK0x-rfyURtE15tJAn6FiFvtWFb8nSnWH8TBUYnTLXiJ -6cBE2ER7MQwf5NMGBa1CaLYzrx4B0ZbrbtBr2ETt7k9r1RxjxAoBBxpiMz9ivRj_KzO1mg8Cc47R -PXkjlspPGsx--568_TVSrrFA5nM8By33kDTZCpQbAboFophLRyQ8r6LPp6qEY5OD3YAzTL09nZsD -brZPLowktube0wJLfsomvtPdol6eg44QuQgdZ4RyOaxbeQl5H9M2t6q9G6vRfyVGDkEwbF-rwllX -XjSmltoUZwhjy7gtYZEnbPjwQcdCho0Pub2jj9xLNKf68oJFRQFB8orYNDoaqVdvRRLyeWOs6P86 -deRMIYPz3DzgzIINxZLyOivxlWXNX-fs5WOe3OUER_q5ONkvV2zXg9qnwQLiqbU_98GE6EA3w5X2 -BXTZsvPQTk9G9K3B-hCb9NIxmCPnlTTAHvmgwI7e4yrXOvHbbW4kAaLiT5CzBrcm7cUv-5ADecCM -NUTHKYqu0HeRr1L5f56OQESp_G16NtStQ3j-9G_bFMrc6gkGMioWaFxdTfBvKYoP7Mbnkaw5L0Tt -TK7PR_3VfET4fdMg33l7YnnRu-B114qGxCQCz7KvcoLfKRwYKi-F5Hf_t36IAAFJheflKkSqzLCF -WjY6cO9DrVz2L60iybXwaNXROVzt2HMLnMLI9e7EQMX7censpQ-NW6vhN7udWiIJ9flerZe3ofK6 -EO70sIAhS0ZkZvTDxiFfc2vryZc3sgtJAW-65D3DRhZyFLW8PerD4NUMpdu-Np-Dt89z4WxElFX5 -ZFs5hkSUSht8-mp84RDLju4y_3jcha5rhptGQMJBOwx9mtnkEoD6U2282dpYsCl3xgXICF1QPCD- -v0oLlded24Tjm9WWeooYo7Gb_tKj8wtNmJwPQ7E9o5gd8XVwrckWugTdXufMmbedKQPZ4bmuqlkx -VI3k05VIYuriTB4t1OsU8OgzoFyTn-38X00dzjJrE40vbX6GdJ51BdcULFz2gJuHKVrLXWPrqEFE -S0moPSU7DyfrgIuRidDwtawAA-JHtgiuf_wrmpShQri1CJ3JCQ6yPAPTBXUjVjzlTCaVkIpmgMoe -tclMBS4AaWP2ac5OPwxP3ldnZcMuHLSVhhxyNLk9nhn8BB8_vtNEZUopU2tb7OKHKgdX47qsP5aa -ueb1_T_0ojj9grruiWO_C0_DaKlpmTh7xKzhCOt3w4IOTezN4If9oJ0AB-3vL7XHb6qs3OZw9Iop -MB1ztIrv1QAE87ZfdyZzZVuNgmosZtNJa2IOjRe83ipr5-DolUgR5OYFNVNg-fFO59SwILdM38U9 -Nq4B_rzR9R7dEdOMp-rs4YBJxqLlL6zZE1tdEP6yba09Dx1fqeh1oXHlWjGSX5JZMnjwrgai_z3q -2h2SeLOUlbyi-i-rMlrqbzro4-kFONIqZdAAsocjGfkoXBtGNJgkmGhHq2TMI2SCXDYqCKtFYOQa -2XSGyJ1QsvOGcHlJhGK-hwFj_JcbnxDx6b_24RrEzWSTXlW0R03JAl9fM24Nk9Y1v5iO6fPfWXU0 -J5BniYOohauEGbogRLwupN9-Deh5JzZlaFCFEDup32oxm4RC6tVk_Ik6jA7C3wVU5pfu8t2lgG6M -PhH0efEjQWNbX5Uv1pbTY8W5bIJ3BSYI4o-cRabaA8UbuCViJ8uvHvFIXew6O3pWDB7vcGKA \ No newline at end of file +FuUPjMTqwItkH0pd22hdRFZCYb2PWFyts5oBr1sMuNcQN1CN32VU-c_m3FehqOb0XNHmFPNJqfzp +zjdictrDN34GQ-pmrKk_ZrdjFfhibPjzKLWPW1tl6fa-bc2y_DGLCkIirvjA27oEgzVQ2CgbQw7Z +N1honW53m6Sq_rHYilkJ25w8h_Y2Nw8TCZv2cQGi7OZJfpyZAC4mWFokAELjh3kcgbfXOdBxZxf1 +HBTpjmnDsOmpveOnDI9KU22Cs-GzT1g_avT8mxufj6252YimBd7ylpLU8F_28YJHop6CAB_YlRGJ +xTeuM2Yr8ny-6OkQoOTIIU6iwI724ctQfuqB7QhUVgziUi8Lr-nT3nuZqsmvKiNd0B8P3_zxnnyc +bkRyWwz2UIsiPJUq9Ne9YszUnmPhztCSY3dWP75NpPL1liT-sXWp36ekUUMNNrYxTIZDCLlMu-6h +frFeKLN4xamaMuUCtQnh5WogsluWo5BAE4XaFSSkCWzXYCn3i5UK2E_iKPvA6rROvB1WzHNa05FH +_aKFCm3QlwwgcBE2b76NlN27QHt5OYv5l16_4SwR_NU8eQwIfDNsf55-r0aPsj3GE8bD0EQ8upjR +k_QQ9r1hOFmOOYR32A1XOjosh9VTAS6I69AVLXijJKdO1xe50zno_OCvpOTBBxdQo0fVMFNxORAN +xhzbmmeP8ouJyBhyb5RcdY_FKwjRUt1KECvtheoz1UbMHy-MqzxHnrIWhHA31fClJiEccynDKE7_ +koHlK1QoO4BBZJvrDqvhMYNIMl0MGkM6F7M4acB8s-WaG1HrsMX_bevTL3mrdNGGlUdIHpIuDqS3 +8BZGDXSlm6iXJ6PhkKyoSLGmInBKoYDPPYBcLK5xqPPL0Esqq5PRxvqqG15VzoFi2Wzpz6d7SfqV +AUdJiP_H_NL4wZcw-JaftP2svNbKDqoT0dZ5NqffSPMxT2zGK-2nsScn_Grmz27HoJMaD9LQwuwh +FUdc9UeS9IwOmC09PAlcWBRM3sLhdmHhC8V6SbzEaRgjYzjOiF4XGzdWmPdsELa7aDw30VuGbCit +FJjVNNzk5C6ncVisqXZwUQzL40G9N2Vd07rdyVuFEKfFb4o8_yCVCiC2NRKR5_DyvQhCeQGpG6qu +fglPdu3xHuiufgXdg_XnzWrKhJNF7HmWkGfG8KySLgfPNTjZlPNLa54ePMnnr5sdacgtDRbCXzaN +Lve28nSS-EPsB-peXDVqayqMbhPZv-yWl-O65B7Rwc2rLcJh6I-296AxMxFOB1cHPfXK1CBaBvlA +I_u_G_0NVRUuqg5CaWw-yDv_tzqnDCID5smObdd-9QOnRA_t3NTkPFhhOvbQjju2ZA7FdrZnMDem +eG-znmI2JwQlgrzybXs2MHOtmI1d9sAUROGkYSnzMzCX6GXd_vf-UD3SpfURrQ2SOmflVf1-WKZh +a6KcKPhXHH0wxB4fLxmvBVHT8U0E0PMbQ_ilZ9lU9A2fxcwPhnZpwJadZQ2H33OdNVFHDARWBZj0 +3Kt0eVIfxaRWgptF0WYPlh5ge9oveMWMvDg4oIAdBDNrkcX4cCfS9dmmXvCNhtY5KrQPr9SO66OC +nljHSsmTRDcIWgi23chfJcm8GJbwC4MD2JSb7oqXNIDUCse5SInSWSpdH0sAgbDrN0_fzoF7rLVH +wgFLuQBCJQtCW9D00iVfaUj8BfvHaH5xpO09DpK10CDV1lgjav9x88KcQo7jtcDUNEf4NM8_oo9K +zAil7PabfVsvBGjU-YAW7_sF9jPiQgYYD4DHXOi3o9tvwBWrwAyoI13ziMzlCXZw8f1ftpE2VVPW +su0QTPd7TO3B_gdWeaGbkBKyMU06SqrXd6-OPdBepSiNtKODRpY3dOFYsQVUkQOfyLYdoso_BO5C +10I_DTKHgO32yenIJPn72qPSk3-lxbcHhqPy96u9Y-krmOnx1bjoeN2jhJEKxwKQclemP-eFHDKz +LMdbL_gt946nPVqrKPZtzDSkqztoal3sWmkoT__6fK0sMyIU64VCaLp2pyuh8dujFe3DDmi1 \ No newline at end of file diff --git a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.location.props b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.location.props new file mode 100644 index 00000000..11dafa78 --- /dev/null +++ b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.location.props @@ -0,0 +1,8 @@ +############################################################ +# Properties Generated by AT&T Certificate Manager +# by root +# on 2021-03-12T11:29:45.890+0000 +# @copyright 2019, AT&T +############################################################ +cadi_latitude=38.0 +cadi_longitude=-72.0 diff --git a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.p12 b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.p12 index bd60d26e2e2cb16b9b33f395c683e7f912aa76af..7b37cbe90f34d0e8c46eb410396d0750e28f112e 100644 GIT binary patch delta 4080 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 ib$Lbv6srW*;j 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 delta 37 tcmZqWZsndJ&zjrwHE!-k6<<~nHcP>NfybY!HoVcl=D1Rf@90|N6#xkm4>JG& -- 2.16.6