diff options
| author |   Denes Nemeth <denes.nemeth@nokia.com> | 2018-04-03 17:32:13 +0200 |
|---|---|---|
| committer | Denes Nemeth <denes.nemeth@nokia.com> | 2018-04-04 14:08:23 +0200 |
| commit | 2c1179b657efe2a291012d2b8f2eee2179402d27 (patch) | |
| tree | 12343f52bda03c49e576ff72debe831c57c8cc5e /nokiav2/driver/src/test/resources | |
| parent | 0278d01123ce3de23d842a94a5ab99dba8853867 (diff) | |
Fixes in LCM
Change-Id: I9dfdacf32970c86b595939f6cd92b6eb276ebf90
Issue-ID: VFC-728
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
Diffstat (limited to 'nokiav2/driver/src/test/resources')
| -rw-r--r-- | nokiav2/driver/src/test/resources/application-direct.properties | 18 | ||||
| -rw-r--r-- | nokiav2/driver/src/test/resources/application.properties | 23 |
2 files changed, 35 insertions, 6 deletions
diff --git a/nokiav2/driver/src/test/resources/application-direct.properties b/nokiav2/driver/src/test/resources/application-direct.properties index f933db94..27ce13e0 100644 --- a/nokiav2/driver/src/test/resources/application-direct.properties +++ b/nokiav2/driver/src/test/resources/application-direct.properties @@ -50,17 +50,30 @@ cbamUsername=onap cbamPassword=Admin@123 # the identifier of the VNFM in A&AI core system registry vnfmId=7c267318-2a6a-4d47-b039-a7cce5fea38b + +############################################################################### +# Configuration parameters for direct integration +############################################################################### +# skip hostname verification during SSL on CBAM LCN, LCM and authorization interface +skipHostnameVerificationForAai=true +# skip certificate verification during SSL on CBAM LCN, LCM and authorization interface +skipCertificateVerificationForAai=true +# the collection of trusted certificates for SSL on CBAM LCN, LCM and authorization interface +# in PEM format encoded in BASE64 to a single line +trustedCertificatesForAai= +#The username to access AAI aaiUsername=AAI +#The password to access AAI aaiPassword=AAI +#The username to access SDC sdcUsername=SDC +#The password to access SDC sdcPassword=SDC - ############################################################################### # End of mandatory properties for driver # ############################################################################### ipMap=10.0.14.1->msb.api.simpledemo.onap.org,172.17.0.15->msb.api.simpledemo.onap.org,10.0.1.1->aai.api.simpledemo.onap.org vnfmInfoCacheEvictionInMs=600000 - ## for logging begin ## com.fasterxml.jackson.core=jackson-databind #logging.file=${catalina.base}/logs/vfcadaptor.log @@ -68,6 +81,5 @@ logging.level.org.springframework=INFO logging.level.org.hibernate=OFF logging.level.org.springframework.web=DEBUG ## for logging end ## - spring.http.multipart.max-file-size=50000KB spring.http.multipart.max-request-size=50000KB diff --git a/nokiav2/driver/src/test/resources/application.properties b/nokiav2/driver/src/test/resources/application.properties index f5c42fc0..8446b483 100644 --- a/nokiav2/driver/src/test/resources/application.properties +++ b/nokiav2/driver/src/test/resources/application.properties @@ -50,14 +50,31 @@ cbamUsername=onap cbamPassword=myPassword # the identifier of the VNFM in A&AI core system registry vnfmId=53fbba58-464e-4cc4-8d33-aaaf072f0a27 + ############################################################################### -# End of mandatory properties for driver # +# Configuration parameters for direct integration ############################################################################### +# skip hostname verification during SSL on CBAM LCN, LCM and authorization interface +skipHostnameVerificationForAai=true +# skip certificate verification during SSL on CBAM LCN, LCM and authorization interface +skipCertificateVerificationForAai=true +# the collection of trusted certificates for SSL on CBAM LCN, LCM and authorization interface +# in PEM format encoded in BASE64 to a single line +trustedCertificatesForAai= +#The username to access AAI +aaiUsername=AAI +#The password to access AAI +aaiPassword=AAI +#The username to access SDC +sdcUsername=SDC +#The password to access SDC +sdcPassword=SDC - +############################################################################### +# End of mandatory properties for driver # +############################################################################### spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.oauth2.OAuth2AutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration vnfmInfoCacheEvictionInMs=600000 - ## for logging begin ## com.fasterxml.jackson.core=jackson-databind #logging.file=${catalina.base}/logs/vfcadaptor.log |