summaryrefslogtreecommitdiffstats
path: root/nokiav2/driver/src/test/resources
diff options
context:
space:
mode:
Diffstat (limited to 'nokiav2/driver/src/test/resources')
-rw-r--r--nokiav2/driver/src/test/resources/application-direct.properties22
-rw-r--r--nokiav2/driver/src/test/resources/application.properties17
2 files changed, 12 insertions, 27 deletions
diff --git a/nokiav2/driver/src/test/resources/application-direct.properties b/nokiav2/driver/src/test/resources/application-direct.properties
index 27ce13e0..5702c913 100644
--- a/nokiav2/driver/src/test/resources/application-direct.properties
+++ b/nokiav2/driver/src/test/resources/application-direct.properties
@@ -13,14 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
###############################################################################
+
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 +33,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,10 +40,6 @@ 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
@@ -69,6 +61,7 @@ aaiPassword=AAI
sdcUsername=SDC
#The password to access SDC
sdcPassword=SDC
+
###############################################################################
# End of mandatory properties for driver #
###############################################################################
@@ -76,10 +69,9 @@ ipMap=10.0.14.1->msb.api.simpledemo.onap.org,172.17.0.15->msb.api.simpledemo.ona
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
diff --git a/nokiav2/driver/src/test/resources/application.properties b/nokiav2/driver/src/test/resources/application.properties
index 8446b483..af64fd95 100644
--- a/nokiav2/driver/src/test/resources/application.properties
+++ b/nokiav2/driver/src/test/resources/application.properties
@@ -13,14 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
###############################################################################
+
server.error.whitelabel.enabled=false
+
###############################################################################
# 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 +33,6 @@ driverVnfmExternalIp=127.0.0.1
messageBusIp=127.0.0.1
# the TCP port of the message bus
messageBusPort=8089
-# the URL of the CBAM catalog service
-cbamCatalogUrl=https://127.0.0.1:443/api/catalog/adapter
-# the URL of the CBAM LCN service
-cbamLcnUrl=https://127.0.0.0.1:443/vnfm/lcn/v3
-# the URL of the CBAM authentication service
-cbamKeyCloakBaseUrl=https://127.0.0.0.1: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,10 +40,6 @@ 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=myPassword
# the identifier of the VNFM in A&AI core system registry
vnfmId=53fbba58-464e-4cc4-8d33-aaaf072f0a27
@@ -77,7 +69,8 @@ spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.oau
vnfmInfoCacheEvictionInMs=600000
## for logging begin ##
com.fasterxml.jackson.core=jackson-databind
-#logging.file=${catalina.base}/logs/vfcadaptor.log
logging.level.org.springframework.web=TRACE
logging.level.org.hibernate=OFF
## for logging end ##
+spring.servlet.multipart.max-file-size=50000KB
+spring.servlet.multipart.max-request-size=50000KB \ No newline at end of file