diff options
| author |   Venkata Harish Kajur <vk250x@att.com> | 2018-10-16 13:28:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-16 13:28:12 +0000 |
| commit | 478a0bffcf85882d5980d71d23fee67da0f1a4d0 (patch) | |
| tree | 99dd8c7040c8c98787b581f597399b721028df62 | |
| parent | 0e8515c7f5b42eea4e817465ac4ba4dc58439d0d (diff) | |
| parent | b54166c3340176da9e0b46605b5d04d8b8474800 (diff) | |
Merge "Set AAF version to 2.1.4"
| -rw-r--r-- | aai-traversal/pom.xml | 2 | ||||
| -rw-r--r-- | aai-traversal/src/main/resources/aaf/bath_config.csv | 32 | ||||
| -rw-r--r-- | aai-traversal/src/main/resources/aaf/org.onap.aai.props | 3 |
3 files changed, 35 insertions, 2 deletions
diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index b9a0fa6..39ff009 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -69,7 +69,7 @@ <scamper.encryption.version>1.8.20</scamper.encryption.version> <httpcomponents.httpmime.version>4.5.2</httpcomponents.httpmime.version> <scamper.version>1.8.36</scamper.version> - <aaf.version>2.1.2</aaf.version> + <aaf.version>2.1.4</aaf.version> <commons.lang.version>2.6</commons.lang.version> <eelf.core.version>1.0.0</eelf.core.version> <logback.version>1.2.3</logback.version> diff --git a/aai-traversal/src/main/resources/aaf/bath_config.csv b/aai-traversal/src/main/resources/aaf/bath_config.csv new file mode 100644 index 0000000..433b333 --- /dev/null +++ b/aai-traversal/src/main/resources/aaf/bath_config.csv @@ -0,0 +1,32 @@ +# AAI -> aai@aai.onap.org +Basic QUFJOkFBSQ==,Basic YWFpQGFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==,2050-03-03 + +# ModelLoader -> aai@aai.onap.org +Basic TW9kZWxMb2FkZXI6TW9kZWxMb2FkZXI=,Basic YWFpQGFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==,2050-03-03 + +# AaiUI -> aai@aai.onap.org, +Basic QWFpVUk6QWFpVUk=,Basic YWFpQGFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==,2050-03-03 + +# MSO -> so@so.onap.org +Basic TVNPOk1TTw==,Basic c29Ac28ub25hcC5vcmc6ZGVtbzEyMzQ1NiE=,2050-03-03 + +# SDNC -> sdnc@sdnc.onap.org +Basic U0ROQzpTRE5D,Basic c2RuY0BzZG5jLm9uYXAub3JnOmRlbW8xMjM0NTYh,2050-03-03 + +# DCAE -> dcae@dcae.onap.org +Basic RENBRTpEQ0FF,Basic ZGNhZUBkY2FlLm9uYXAub3JnOmRlbW8xMjMzNDU2IQ==,2050-03-03 + +# POLICY -> policy@policy.onap.org +Basic UE9MSUNZOlBPTElDWQ==,Basic cG9saWN5QHBvbGljeS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==,2050-03-03 + +# ASDC -> sdc@sdc.onap.org +Basic QVNEQzpBU0RD,Basic c2RjQHNkYy5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==,2050-03-03 + +# VID -> vid@vid.onap.org +Basic VklEOlZJRA==,Basic dmlkQHZpZC5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==,2050-03-03 + +# APPC -> appc@appc.onap.org +Basic QVBQQzpBUFBD,Basic YXBwY0BhcHBjLm9uYXAub3JnOmRlbW8xMjM0NTYh,2050-03-03 + +# OOF -> oof@oof.onap.org +Basic T09GOk9PRg==,Basic b29mQG9vZi5vbmFwLm9yZzpkZW1vMTIzNDQ2IQ==,2050-03-03 diff --git a/aai-traversal/src/main/resources/aaf/org.onap.aai.props b/aai-traversal/src/main/resources/aaf/org.onap.aai.props index 279c776..b981493 100644 --- a/aai-traversal/src/main/resources/aaf/org.onap.aai.props +++ b/aai-traversal/src/main/resources/aaf/org.onap.aai.props @@ -10,4 +10,5 @@ cadi_keystore_password=enc:383RDJRFA6yQz9AOxUxC1iIg3xTJXityw05MswnpnEtelRQy2D4r5 cadi_alias=aai@aai.onap.org cadi_truststore=aai-traversal/src/main/resources/aaf/truststoreONAPall.jks cadi_truststore_password=enc:s77wlnZFoQ08NhnU3OSeWO6uKgRwC6sAK-wTvVubNz2 -cadi_loglevel=INFO
\ No newline at end of file +cadi_loglevel=INFO +cadi_bath_convert=aai-traversal/src/main/resources/aaf/bath_config.csv |