Fix template generation for R2

[vfc/nfvo/driver/vnfm/svnfm.git] / nokiav2 / driver / src / test / resources / application-direct.properties

diff --git a/nokiav2/driver/src/test/resources/application-direct.properties b/nokiav2/driver/src/test/resources/application-direct.properties
index f933db9..b9c1c68 100644 (file)
--- a/nokiav2/driver/src/test/resources/application-direct.properties
+++ b/nokiav2/driver/src/test/resources/application-direct.properties
@@ -15,12 +15,12 @@
 ###############################################################################
 server.error.whitelabel.enabled=false
 ###############################################################################
-# Beginning  of mandatory properties                                           #
+# Beginning  of mandatory properties                                          #
 ###############################################################################
 # The TCP port of the server
 server.port=8089
 # the base path of the server
-server.context-path=
+server.servlet.context-path=
 # the IP address to which the server binds to
 server.address=127.0.0.1
 # the IP address of the server reported to the micro service bus
@@ -31,12 +31,6 @@ driverVnfmExternalIp=10.41.63.151
 messageBusIp=msb.api.simpledemo.onap.org
 # the TCP port of the message bus
 messageBusPort=80
-# the URL of the CBAM catalog service
-cbamCatalogUrl=https://10.41.63.149:443/api/catalog/adapter
-# the URL of the CBAM LCN service
-cbamLcnUrl=https://10.41.63.149:443/vnfm/lcn/v3
-# the URL of the CBAM authentication service
-cbamKeyCloakBaseUrl=https://10.41.63.149:443/auth
 # skip hostname verification during SSL on CBAM LCN, LCM and authorization interface
 skipHostnameVerification=true
 # skip certificate verification during SSL on CBAM LCN, LCM and authorization interface
@@ -44,30 +38,36 @@ skipCertificateVerification=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
 trustedCertificates=
-# the username to be used for requesting a token on CBAM authorization interface
-cbamUsername=onap
-# the password to be used for requesting a token on CBAM authorization interface
-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
 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
+spring.servlet.multipart.max-file-size=50000KB
+spring.servlet.multipart.max-request-size=50000KB
\ No newline at end of file