summaryrefslogtreecommitdiffstats
path: root/datarouter-prov/src/main
diff options
context:
space:
mode:
authorefiacor <fiachra.corcoran@est.tech>2020-03-05 13:04:12 +0000
committerefiacor <fiachra.corcoran@est.tech>2020-03-05 15:26:41 +0000
commite964aecea98e6a4362ed163e6a72d377e6523e1f (patch)
tree6bf27b8519352e10846a8a1fa057ed312c1ff4ea /datarouter-prov/src/main
parentbf72b3396c4a29568ed4093e6cda52c69f322eb7 (diff)
Updating default AAF artifacts
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Change-Id: I069d2315d8a1d77a83749c0d50f0d00d6c528083 Issue-ID: DMAAP-1399
Diffstat (limited to 'datarouter-prov/src/main')
-rw-r--r--datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.cred.props14
-rw-r--r--datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.keyfile54
-rw-r--r--datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.location.props6
-rw-r--r--datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.p12bin4233 -> 4201 bytes
-rw-r--r--datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.props11
-rw-r--r--datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.trust.jksbin1413 -> 1413 bytes
6 files changed, 44 insertions, 41 deletions
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 ddc3da56..9fcdab50 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 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 c5d9d876..1de63600 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 @@
-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 4f6befb8..cf7f48ad 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 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 bd60d26e..21a6de6f 100644
--- a/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.p12
+++ b/datarouter-prov/src/main/resources/aaf/org.onap.dmaap-dr.p12
Binary files 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 561a8782..a5fe0221 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,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 0c9da2e5..96e3760c 100644
--- 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
Binary files differ