Merge "[DMAAP-DR] Patch AAF artifacts"

6 files changed, 49 insertions, 38 deletions

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 bd60d26e..7b37cbe9 100644
--- a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.p12
+++ b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.p12
diff --git a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.props b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.props
index 4e15dc32..a7c9882f 100644
--- a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.props
+++ b/datarouter-prov/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:52:10.008+0000
+#   on 2021-03-12T11:29:45.885+0000
 # @copyright 2019, AT&T
 ############################################################
 aaf_env=DEV
 aaf_id=dmaap-dr-prov@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-prov
+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
 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-prov/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks
index 0c9da2e5..c61528ac 100644
--- a/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks
+++ b/datarouter-prov/src/test/resources/aaf/org.onap.dmaap-dr.trust.jks