summaryrefslogtreecommitdiffstats
path: root/src/test/resources/https
diff options
context:
space:
mode:
authorSirisha_Manchikanti <sirisha.manchikanti@est.tech>2021-05-07 15:17:52 +0100
committerSirisha_Manchikanti <sirisha.manchikanti@est.tech>2021-05-13 09:00:52 +0100
commitf83411a86e2277adae69e780e8511913d61a0f17 (patch)
treed75f197e703270cda608c9bd0d236f7ce8c12e13 /src/test/resources/https
parentcac5cc982413ab9593186d308eda8936e9603ad9 (diff)
Modular structure of clamp including controlloop
This commit is the first commit that puts in multi module structure while changing the existing CLAMP code as little as possible. It adds a structure where common, models, participant and runtime are direct children under clamp, and current clamp code is moved under runtime. This runtime directory will host controlloop runtime code in later commits. Issue-ID: POLICY-3215 Signed-off-by: Sirisha_Manchikanti <sirisha.manchikanti@est.tech> Change-Id: I15bc8be92ed020343bff4024c4718fec462c40d7 Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'src/test/resources/https')
-rw-r--r--src/test/resources/https/https-test.properties135
-rw-r--r--src/test/resources/https/keystore-test.jksbin2244 -> 0 bytes
2 files changed, 0 insertions, 135 deletions
diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties
deleted file mode 100644
index 14079a78e..000000000
--- a/src/test/resources/https/https-test.properties
+++ /dev/null
@@ -1,135 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP CLAMP
-# ================================================================================
-# Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights
-# reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END============================================
-# ===================================================================
-#
-###
-
-### Set the port for HTTP or HTTPS protocol (Controlled by Spring framework, only one at a time).
-### (See below for the parameter 'server.http.port' if you want to have both enabled)
-### To have only HTTP, keep the lines server.ssl.* commented
-### To have only HTTPS enabled, uncomment the server.ssl.* lines and specify a right keystore location
-server.port=${clamp.it.tests.https}
-### Settings for HTTPS (this automatically enables the HTTPS on the port 'server.port')
-server.ssl.key-store=classpath:clds/aaf/org.onap.clamp.p12
-server.ssl.key-store-password=enc:WWCxchk4WGBNSvuzLq3MLjMs5ObRybJtts5AI0XD1Vc
-server.ssl.key-password=enc:WWCxchk4WGBNSvuzLq3MLjMs5ObRybJtts5AI0XD1Vc
-server.ssl.key-store-type=PKCS12
-server.ssl.key-alias=clamptest
-
-# The key file used to decode the key store and trust store password
-# If not defined, the key store and trust store password will not be decrypted
-clamp.config.keyFile=classpath:clds/aaf/org.onap.clamp.keyfile
-clamp.config.caCerts=classpath:clds/aaf/ssl/ca-certs.pem
-
-## Config part for Client certificates
-server.ssl.client-auth=want
-server.ssl.trust-store=classpath:clds/aaf/truststoreONAPall.jks
-server.ssl.trust-store-password=enc:iDnPBBLq_EMidXlMa1FEuBR8TZzYxrCg66vq_XfLHdJ
-
-### In order to be user friendly when HTTPS is enabled,
-### you can add another HTTP port that will be automatically redirected to HTTPS
-### by enabling this parameter (server.http.port) and set it to another port (80 or 8080, 8090, etc ...)
-server.http-to-https-redirection.port=${clamp.it.tests.http-redirected}
-
-### HTTP Example:
-###--------------
-### server.port=8080
-
-### HTTPS Example:
-### --------------
-### server.port=8443
-### server.ssl.key-store=file:/tmp/mykey.jks
-### server.ssl.key-store-password=mypass
-### server.ssl.key-password=mypass
-
-### HTTP (Redirected to HTTPS) and HTTPS Example:
-### --------------------------------------------
-### server.port=8443 <-- The HTTPS port
-### server.ssl.key-store=file:/tmp/mykey.jks
-### server.ssl.key-store-password=mypass
-### server.ssl.key-password=mypass
-### server.http-to-https-redirection.port=8090 <-- The HTTP port
-
-server.servlet.context-path=/
-#Modified engine-rest applicationpath
-spring.profiles.active=clamp-default, clamp-aaf-authentication,clamp-ssl-config
-
-
-#clds datasource connection details
-spring.datasource.driverClassName=org.mariadb.jdbc.Driver
-spring.datasource.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647
-spring.datasource.username=clds
-spring.datasource.password=sidnnd83K
-spring.datasource.validationQuery=SELECT 1
-spring.datasource.validationQueryTimeout=20000
-spring.datasource.validationInterval=30000
-spring.datasource.testWhileIdle = true
-spring.datasource.minIdle = 0
-spring.datasource.initialSize=0
-# Automatically test whether a connection provided is good or not
-spring.datasource.testOnBorrow=true
-spring.datasource.ignoreExceptionOnPreLoad=true
-
-camel.springboot.consumer-template-cache-size=1000
-camel.springboot.producer-template-cache-size=1000
-# JMX enabled to have Camel Swagger runtime working
-camel.springboot.jmx-enabled=true
-camel.defaultthreadpool.poolsize=10
-camel.defaultthreadpool.maxpoolsize=20
-camel.defaultthreadpool.maxqueuesize=1000
-camel.defaultthreadpool.keepaliveTime=60
-camel.defaultthreadpool.rejectpolicy=CallerRuns
-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=
-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
-clamp.config.security.permission.type.cl.event=org.onap.clamp.clds.cl.event
-clamp.config.security.permission.type.filter.vf=org.onap.clamp.clds.filter.vf
-clamp.config.security.permission.type.template=org.onap.clamp.clds.template
-clamp.config.security.permission.type.tosca=org.onap.clamp.clds.tosca
-clamp.config.security.permission.type.policies=org.onap.clamp.clds.policies
-#This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
-clamp.config.security.permission.instance=dev
-clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
-
-#AAF related parameters
-clamp.config.cadi.cadiLoglevel=DEBUG
-clamp.config.cadi.cadiLatitude=10
-clamp.config.cadi.cadiLongitude=10
-clamp.config.cadi.aafLocateUrl=https://aaf-locate:8095
-clamp.config.cadi.oauthTokenUrl= https://AAF_LOCATE_URL/locate/onap.org.osaaf.aaf.token:2.1/token
-clamp.config.cadi.oauthIntrospectUrll=https://AAF_LOCATE_URL/locate/onap.org.osaaf.aaf.introspect:2.1/introspect
-clamp.config.cadi.aafEnv=DEV
-clamp.config.cadi.aafUrl=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
-clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US \ No newline at end of file
diff --git a/src/test/resources/https/keystore-test.jks b/src/test/resources/https/keystore-test.jks
deleted file mode 100644
index 04ad3b114..000000000
--- a/src/test/resources/https/keystore-test.jks
+++ /dev/null
Binary files differ