diff options
author | sebdet <sebastien.determe@intl.att.com> | 2021-04-07 10:10:45 +0200 |
---|---|---|
committer | sebdet <sebastien.determe@intl.att.com> | 2021-04-15 17:49:58 +0200 |
commit | 1f2d62dd48694fa78041572a200b3e5d04bd268e (patch) | |
tree | 58989ac6875277998b07d97be9883a039ee970b4 /src/test/resources | |
parent | 58e7987439bca70cdd2715863a020b76baa8ac1c (diff) |
Update dependencies
Update dependencies to remove some issues reported by Nexus-IQ.
Issue-ID: POLICY-3169
Issue-ID: POLICY-3120
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ia8939f0c85ac4087c3fc2c71b66914d6c7178347
Diffstat (limited to 'src/test/resources')
4 files changed, 114 insertions, 24 deletions
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 2a4caee98..d67fe74a3 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -1,6 +1,6 @@ ### # ============LICENSE_START======================================================= -# ONAP CLAMP +# ONAP POLICY-CLAMP # ================================================================================ # Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights # reserved. @@ -79,10 +79,11 @@ camel.defaultthreadpool.maxpoolsize=20 camel.defaultthreadpool.maxqueuesize=1000 camel.defaultthreadpool.keepaliveTime=60 camel.defaultthreadpool.rejectpolicy=CallerRuns -#camel.springboot.xmlRoutes = false -camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml -camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml -#camel.springboot.typeConversion = false +camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml +camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml +camel.springboot.backlog-tracing=true +camel.springboot.tracing=true +camel.springboot.message-history=true #clds datasource connection details spring.datasource.driverClassName=org.mariadb.jdbc.Driver @@ -128,12 +129,15 @@ clamp.config.files.cldsUsers=classpath:/clds/clds-users.json clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json +clamp.config.httpclient.socketTimeout=20000 +clamp.config.httpclient.connectTimeout=10000 + # # Configuration Settings for Policy Engine Components -clamp.config.policy.api.url=http4://localhost:${docker.http-cache.port.host} +clamp.config.policy.api.url=http://localhost:${docker.http-cache.port.host} clamp.config.policy.api.userName=healthcheck clamp.config.policy.api.password=zb!XztG34 -clamp.config.policy.pap.url=http4://localhost:${docker.http-cache.port.host} +clamp.config.policy.pap.url=http://localhost:${docker.http-cache.port.host} clamp.config.policy.pap.userName=healthcheck clamp.config.policy.pap.password=zb!XztG34 @@ -142,12 +146,12 @@ clamp.config.policy.pap.password=zb!XztG34 clamp.config.sdc.csarFolder = ${project.build.directory}/sdc-tests #DCAE Inventory Url Properties -clamp.config.dcae.inventory.url=http4://localhost:${docker.http-cache.port.host} +clamp.config.dcae.inventory.url=http://localhost:${docker.http-cache.port.host} clamp.config.dcae.intentory.retry.interval=100 clamp.config.dcae.intentory.retry.limit=1 #DCAE Deployment Url Properties -clamp.config.dcae.deployment.url=http4://localhost:${docker.http-cache.port.host} +clamp.config.dcae.deployment.url=http://localhost:${docker.http-cache.port.host} clamp.config.dcae.deployment.userName=test clamp.config.dcae.deployment.password=test @@ -164,7 +168,7 @@ clamp.config.security.permission.instance=dev clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal # Configuration settings for CDS -clamp.config.cds.url=http4://localhost:${docker.http-cache.port.host} +clamp.config.cds.url=http://localhost:${docker.http-cache.port.host} clamp.config.cds.userName=ccsdkapps clamp.config.cds.password=ccsdkapps diff --git a/src/test/resources/example/dcae/inventory-response.json b/src/test/resources/example/dcae/inventory-response.json new file mode 100644 index 000000000..1ebf068b8 --- /dev/null +++ b/src/test/resources/example/dcae/inventory-response.json @@ -0,0 +1,78 @@ +{ + "links": { + "previousLink": { + "title": "string", + "rel": "string", + "uri": "string", + "uriBuilder": {}, + "rels": [ + "string" + ], + "params": { + "additionalProp1": "string", + "additionalProp2": "string", + "additionalProp3": "string" + }, + "type": "string" + }, + "nextLink": { + "title": "string", + "rel": "string", + "uri": "string", + "uriBuilder": {}, + "rels": [ + "string" + ], + "params": { + "additionalProp1": "string", + "additionalProp2": "string", + "additionalProp3": "string" + }, + "type": "string" + } + }, + "totalCount": 0, + "items": [ + { + "owner": "testOwner", + "application": "testApplication", + "component": "testComponent", + "typeName": "testTypeName", + "typeVersion": 0, + "blueprintTemplate": "testBlueprintTemplate", + "serviceIds": [ + "serviceId1", + "serviceId2" + ], + "vnfTypes": [ + "vnfType1", + "vnfType2" + ], + "serviceLocations": [ + "serviceLocation1", + "serviceLocation2" + ], + "asdcServiceId": "testAsdcServiceId", + "asdcResourceId": "testAsdcResourceId", + "asdcServiceURL": "testAsdcServiceURL", + "typeId": "testTypeId", + "selfLink": { + "title": "selfLinkTitle", + "rel": "selfLinkRel", + "uri": "selfLinkUri", + "uriBuilder": {}, + "rels": [ + "string" + ], + "params": { + "additionalProp1": "string", + "additionalProp2": "string", + "additionalProp3": "string" + }, + "type": "string" + }, + "created": "2020-01-22T09:38:15.436Z", + "deactivated": "2020-01-22T09:38:15.437Z" + } + ] +}
\ No newline at end of file diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties index b52b16db4..14079a78e 100644 --- a/src/test/resources/https/https-test.properties +++ b/src/test/resources/https/https-test.properties @@ -96,10 +96,11 @@ camel.defaultthreadpool.maxpoolsize=20 camel.defaultthreadpool.maxqueuesize=1000 camel.defaultthreadpool.keepaliveTime=60 camel.defaultthreadpool.rejectpolicy=CallerRuns -#camel.springboot.xmlRoutes = false -camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml -camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml -#camel.springboot.typeConversion = false +camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml +camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml +camel.springboot.backlog-tracing=true +camel.springboot.tracing=true +camel.springboot.message-history=true #For EELF logback file #com.att.eelf.logging.path= @@ -107,6 +108,9 @@ com.att.eelf.logging.file=logback-default.xml #The log folder that will be used in logback.xml file clamp.config.log.path=log +clamp.config.httpclient.socketTimeout=20000 +clamp.config.httpclient.connectTimeout=10000 + #Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case ! clamp.config.security.permission.type.cl=org.onap.clamp.clds.cl clamp.config.security.permission.type.cl.manage=org.onap.clamp.clds.cl.manage diff --git a/src/test/resources/robotframework/robotframework-test.properties b/src/test/resources/robotframework/robotframework-test.properties index 1e173f961..a12f052ad 100644 --- a/src/test/resources/robotframework/robotframework-test.properties +++ b/src/test/resources/robotframework/robotframework-test.properties @@ -1,6 +1,6 @@ ### # ============LICENSE_START======================================================= -# ONAP CLAMP +# ONAP POLICY-CLAMP # ================================================================================ # Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights # reserved. @@ -79,10 +79,11 @@ camel.defaultthreadpool.maxpoolsize=20 camel.defaultthreadpool.maxqueuesize=1000 camel.defaultthreadpool.keepaliveTime=60 camel.defaultthreadpool.rejectpolicy=CallerRuns -#camel.springboot.xmlRoutes = false -camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml -camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml -#camel.springboot.typeConversion = false +camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml +camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml +camel.springboot.backlog-tracing=true +camel.springboot.tracing=true +camel.springboot.message-history=true #clds datasource connection details spring.datasource.driverClassName=org.mariadb.jdbc.Driver @@ -128,12 +129,15 @@ clamp.config.files.cldsUsers=classpath:/clds/clds-users.json clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json +clamp.config.httpclient.socketTimeout=20000 +clamp.config.httpclient.connectTimeout=10000 + # # Configuration Settings for Policy Engine Components -clamp.config.policy.api.url=http4://localhost:${docker.http-cache.port.host} +clamp.config.policy.api.url=http://localhost:${docker.http-cache.port.host} clamp.config.policy.api.userName=healthcheck clamp.config.policy.api.password=zb!XztG34 -clamp.config.policy.pap.url=http4://localhost:${docker.http-cache.port.host} +clamp.config.policy.pap.url=http://localhost:${docker.http-cache.port.host} clamp.config.policy.pap.userName=healthcheck clamp.config.policy.pap.password=zb!XztG34 @@ -142,12 +146,12 @@ clamp.config.policy.pap.password=zb!XztG34 clamp.config.sdc.csarFolder = ${project.build.directory}/sdc-tests #DCAE Inventory Url Properties -clamp.config.dcae.inventory.url=http4://localhost:${docker.http-cache.port.host} +clamp.config.dcae.inventory.url=http://localhost:${docker.http-cache.port.host} clamp.config.dcae.intentory.retry.interval=100 clamp.config.dcae.intentory.retry.limit=1 #DCAE Deployment Url Properties -clamp.config.dcae.deployment.url=http4://localhost:${docker.http-cache.port.host} +clamp.config.dcae.deployment.url=http://localhost:${docker.http-cache.port.host} clamp.config.dcae.deployment.userName=test clamp.config.dcae.deployment.password=test @@ -164,7 +168,7 @@ clamp.config.security.permission.instance=dev clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal # Configuration settings for CDS -clamp.config.cds.url=http4://localhost:${docker.http-cache.port.host} +clamp.config.cds.url=http://localhost:${docker.http-cache.port.host} clamp.config.cds.userName=ccsdkapps clamp.config.cds.password=ccsdkapps |