Updating default AAF artifacts

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

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 173d2fd..89601c1 100644 (file)
--- 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 2019-10-02T14:25:19.002+0000
+#   on 2020-03-05T12:37:11.094+0000
 # @copyright 2019, AT&T
 ############################################################
-Challenge=enc:wQM4uZbepQQWfJd9uhcfPZJc7TAOnfTnj5xv9uCRteQOTuc7mSXAWjg9heC7lXod
+Challenge=enc:arjPt8EywpbifN2FfWqLe-yYCQFfYeX19GVWbKzl3NWlxD2fQzSL0SHFUBg0ElBz
 cadi_alias=dmaap-dr-node@dmaap-dr.onap.org
-cadi_key_password=enc:YhS5u9Fqt-ssUs-1wWrv7xkOliMQDb8d7kmKKK2QwtwQu4Q7i_psLw0baQ-NY3mF
+cadi_key_password=enc:moianFhZr4ug9foXZlqRgtPYGf9gMfAH7PUBclLusFoLyCYdLyZ6GkNkXHbqnNsv
 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:NwhywpJzc4rlcpwkPRs4GWkOliMQDb8d7kmKKK2QwtwQu4Q7i_psLw0baQ-NY3mF
-cadi_keystore_password_jks=enc:McsNbnuHb5tgoa_UMgdTdHqWEG4bt6VcPsc_NTzS277aDcrNRutDSBDYyyLD5no2
-cadi_keystore_password_p12=enc:NwhywpJzc4rlcpwkPRs4GWkOliMQDb8d7kmKKK2QwtwQu4Q7i_psLw0baQ-NY3mF
+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_truststore=/opt/app/osaaf/local/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=enc:xWbQBg4WdbHbQgvKGrol0ns16g9jgFYteR3nQkwTl65BtvtWf_ZKhSVP8w_Z0VHU
+cadi_truststore_password=enc:REEtn_ZrfohiIuUQOcijhRwQEHnhWpa2Y7013dokESRMkrENT081YnKDWG3YR_FZ
 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 cbed040..74ec347 100644 (file)
--- 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 @@
-hPUFfq-4kxkPy1LmRi50b_bhcRn9BKecnkq0u-Uec6JnRIsMgqUiEYJMbxGCGEZquBLszBBPj2Ux
-udBAZ5FPIp5IkQFX6NpXJTCqPW9lb4k6KVhRSqSocascKnbYdZxrdThqOaw26kDiw04NFzA7jwxF
-G9m2IVWF9AaKx7jQAqaoy4SSK5g1OaI4fGqWQn4HW3HuVJ7cc52JUmrcIGIV-I_6pR0ZAPezHxGn
-5k-0rErQEZBHfj0S1M74Lx-eOa7gRlj0b3O8Zq-yfOllRLBZiMLuTmWlVz4ikbmL_eNC2RmjuEyy
-v-wFva0Y4dqXEVEj9FoBUAQy7vE-I6VxGRffQRAi4Mnz0v4ISkHPmiOJsYmIzjT2bWyLKloJENfQ
-LhV180qF-7UrjWGI2DhlVV_r4AY32-KLU7HLECpKRSjeqhWva_nZAj7ELGvBBTftGDu3HKts_MqU
-hb14f5482rHZGPDYv3dCsere31ShIF6WF_YNhO494RgdSMugvWDZwxQYngNjGTgxS8hKezD5erp_
-BoqMuI3xotgaKZluV8yrxsc-M-0F97hJGxn7k1y37jKQugGUNDEwsX5MiHFd9OYY5jY9Pdr2tEXk
-PqEmZQXBeCXJOku7KQFwEl4nqkw-52JJS1PAks4v_dlkrJIL95q6zAQOrgSgc597_-0x90k22Zd8
-FowwHQ42R-bo9oRyO0Qbypzd1Ftzu7kCalYH35qcLyAiIOO9NYAwSi5tYldzHgUhVq4wb1aoomeP
-HISpNJfT2rK-AGMZw3d3nXWK1b3ztkF-74nD2s-WuTLeomBni1eMiLED850GyRD4uB4j4zF_4dZF
-OmT6iShH7RR-gTolGZSAG7sBbwNs3lks9usVWI0qSulQvHBs14QvOY7EmO4SMRueUMo6ZIaOJIkB
-uxNzoM_yQ2mMb24AZm_tT1xqMbGf76oYcx8Mu4zcXFkoe-4xDA1D-HXiPtyOzj6K0ByR86aytY2J
-SI8mltJwtPx_t5t1fb0nFMQYCM5DzODKXgd-QhEJ8Q64uw6kSFFkv09ZCP0fvWy5Q7AEOAw_Y1YJ
-lYyG7Bzu4E8PAQrihKhyYnFsp7WmMak_DGB2oskfHjffsb9Yh4FSM9EyB8x40ryQ6c8SAoP9LmYh
-87-NvfQfuinLlHl7BcqCWmA7jwHo44r_L8guXWQ0wSRdCnfphc4_FthK2VQrURzFXTPnb3UvNE4I
-U93lmmbwSlCoBjI2SwJAQvBpztlmbaFxgDA2Tbk6Mh6_cKiza2EcXCJzVXghFIqXtPQpAXPwHBZv
-NrmKRamZBlMSkWPzPuIbfH6XYqCw3bodTEktzJZYzABFVkyIZ4JtstvoDGxaQDy6Ob2POLhuq0YY
-ZW9eVhfvGWNyBK5sWSzEuCrd-nPN-XuDZjt8kWN4GTmokXnV_j20GDHyqwczikrCnlfReA1u2-O8
-VXmHvKMSHI3ckLdGP8QIOWoC4FfFi0QG62McYZO83ZA2wjRZVnS3bAz04uhLryqafm-aJ7tg1XBg
-BNTIuJSrWA1WIU-UngRV0TheiNIGtmhBeNdZfWg5MHXaVzSYj0w6A7A7Kwf4cXt2dJosX_8fCLzY
-2Q8XA8NjG9_gkE7hwav8UdmUAw86HQW6mTpjOIdSsQ0NauwNbREq4tec-9kuzZGkW4JwlJsxl_xn
-yOP1eMHDoV_Xmiz8UxTiWjHHeh3AQcV7G6J0uyjcRTHESAR-jxptepD_iZr-cptrUb43H_spNtSY
-dGZ3OvZIl2W-sFbO78ioCaLqYA0Uq35vwMIUpdjFIYb9vUA4JFTXNk3J5oCYX3vibIpACqYODFQ3
-CSqWg_Xg0Eci7VshNXZ9S69hX2KZFnf-qpnvOnRvrOCPJ2HqnZ8RaAkRygT5Nk0VRgLT8BM_1ao5
-MNCgoVw3C_tJlq66i7ve3TY2jamg6_jPxcb_7aKnbTWvKaP0p3dqlnrj3Irc35SD1k_cq1Nh8CYP
-Fd06LzCFxS4Ws_ueZ9GJpREYnh6rleFVj-qI6F73rfHiGhFta-4Q_XJeZuplJkrRbHmo5GRb
\ No newline at end of file
+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

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 3bb069c..9acde34 100644 (file)
--- 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 2019-10-02T14:24:02.091+0000
+#   on 2020-03-05T12:37:09.234+0000
 # @copyright 2019, AT&T
 ############################################################
-cadi_latitude=0.00
-cadi_longitude=0.00
+cadi_latitude=0
+cadi_longitude=0

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 b5c3047..6655dcf 100644 (file)
Binary files a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.p12 and b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.p12 differ

diff --git a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.props b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.props
index c379da5..66765e1 100644 (file)
--- a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.props
+++ b/datarouter-node/src/main/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 2020-03-05T12:37:09.234+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_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=/opt/app/osaaf/local/org.onap.dmaap-dr.location.props:/opt/app/osaaf/local/org.onap.dmaap-dr.cred.props
-cadi_protocols=TLSv1.1,TLSv1.2
\ No newline at end of file
+cadi_protocols=TLSv1.1,TLSv1.2

diff --git a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks
index c837fa0..6d81b9a 100644 (file)
Binary files a/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks and b/datarouter-node/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks differ

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 ddc3da5..9fcdab5 100644 (file)
--- 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 2019-10-02T14:52:33.828+0000
+#   on 2020-03-05T12:36:12.862+0000
 # @copyright 2019, AT&T
 ############################################################
-Challenge=enc:D1K4bZlKwIDTY6RYX4V1nCgj1mJruMZ4qDaO80iSwm20J8zpUa0qEzOwM-aFjKCe
+Challenge=enc:7gehgpiMkEwaTx3oKhCefuHkR7crpUA-x1B0NogqrE3lEaLhKtFdvnRB5pPTj2EH
 cadi_alias=dmaap-dr-prov@dmaap-dr.onap.org
-cadi_key_password=enc:d80GqeXpOhPOmZAn76t5xgKlq54yAPYQw-OoVqFwcXkCwd58zwHfzZQ3Rgitj30-
+cadi_key_password=enc:KzKvy8LAuKGHgtuSi9TFIl8k8RYO_pan9Rrwt1AV3eA2M99Pr1eaQcu2vp34qNtA
 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:xcPI_-oWnLvQ8SFDyafZG7ii7yZdcgaUwVQFp7x9mkHTnyODGDUaPHb5svAE2euP
-cadi_keystore_password_jks=enc:EO1-8pk7wWbiGMriX0aAOX0zxoQ9-ow7LRqOlKgMYVlYGs59yappGzKd0FxkcqM0
-cadi_keystore_password_p12=enc:xcPI_-oWnLvQ8SFDyafZG7ii7yZdcgaUwVQFp7x9mkHTnyODGDUaPHb5svAE2euP
+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_truststore=/opt/app/osaaf/local/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=enc:XawqMezvaPspcdG9J9tdYx-pEtIu4VaY_QG3ZyLtyWg_gsxvrfg2tInmj95fAkrj
+cadi_truststore_password=enc:VjqBxrpk8OzTGztORRd2Zhk7X887ZgcUfg-iJpmv3vP0ubL07EpZbSi9p7iZGUr0
 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 c5d9d87..1de6360 100644 (file)
--- 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 @@
-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
+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

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 4f6befb..cf7f48a 100644 (file)
--- 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 2019-10-02T14:52:10.009+0000
+#   on 2020-03-05T12:36:10.661+0000
 # @copyright 2019, AT&T
 ############################################################
-cadi_latitude=0.00
-cadi_longitude=0.00
+cadi_latitude=0
+cadi_longitude=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 bd60d26..21a6de6 100644 (file)
Binary files a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.p12 and b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.p12 differ

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 561a878..a5fe022 100644 (file)
--- 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,21 +1,24 @@
 ############################################################
 # Properties Generated by AT&T Certificate Manager
 #   by root
-#   on 2019-10-02T14:52:10.008+0000
+#   on 2020-03-05T12:36:10.660+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=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=/opt/app/osaaf/local/org.onap.dmaap-dr.location.props:/opt/app/osaaf/local/org.onap.dmaap-dr.cred.props
 cadi_protocols=TLSv1.1,TLSv1.2

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 0c9da2e..96e3760 100644 (file)
Binary files a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks and b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.trust.jks differ

diff --git a/pom.xml b/pom.xml
index b31a08a..8800450 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -307,7 +307,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.6.0</version>
                     <configuration>
                         <source>1.8</source>
                         <target>1.8</target>