diff options
| author |   MukeshKumar <mukeshsharma@est.tech> | 2020-11-02 13:01:25 +0000 |
|---|---|---|
| committer | Mukesh <mukeshsharma@est.tech> | 2020-11-06 16:06:26 +0000 |
| commit | d013ef614cab77cd57c4aa4d8f73b63febc193ba (patch) | |
| tree | 6e7637f2ebdd16aaff786bec71ae52c0ddea9d76 /plans/so/integration-etsi-testing/config | |
| parent | 946835729ed4f1c8b31fdc806f80ab8c00260e21 (diff) | |
Https to Http from vnfm-adapter to simulator
remove HTTPs for BPMN-Infra and SOL003 Adapter & ETSI NFVO to SOL003 Adapter & SOL003 Adapter & VNFM Simulator communications
Change-Id: I56548b8faad492af4f6f3b3ca061e723ec6c4d2c
Issue-ID: SO-3349
Signed-off-by: Mukesh <mukeshsharma@est.tech>
Diffstat (limited to 'plans/so/integration-etsi-testing/config')
3 files changed, 6 insertions, 25 deletions
diff --git a/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/esr-system-info.json b/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/esr-system-info.json index d204a774..fcc85379 100644 --- a/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/esr-system-info.json +++ b/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/esr-system-info.json @@ -4,8 +4,8 @@ "type": "simulator", "vendor": "EST", "version": "V1.0", - "service-url": "https://so-vnfm-simulator:9093/vnflcm/v1", - "user-name": "", - "password": "", + "service-url": "http://so-vnfm-simulator:9093/vnflcm/v1", + "user-name": "vnfm", + "password": "password1$", "system-type": "VNFM" } diff --git a/plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml index 8ecd6033..684c675e 100644 --- a/plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml +++ b/plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml @@ -358,19 +358,10 @@ spring: so: vnfm: adapter: - url: https://so-vnfm-adapter:9092/so/vnfm-adapter/v1/ + url: http://so-vnfm-adapter:9092/so/vnfm-adapter/v1/ auth: Basic dm5mbTpwYXNzd29yZDEk org: onap: so: cloud-owner: CloudOwner -rest: - http: - client: - configuration: - ssl: - keyStore: file:/app/bpmn-infra-certs/org.onap.so.p12 - keyStorePassword: 'RLe5ExMWW;Kd6GTSt0WQz;.Y' - trustStore: file:/app/bpmn-infra-certs/org.onap.so.trust.jks - trustStorePassword: '[)3KV.k*!IlkFhWEq0Nv2dDa' diff --git a/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml index ec2031c6..99c9dbd0 100644 --- a/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml +++ b/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml @@ -3,17 +3,7 @@ server: tomcat: max-threads: 4 ssl: - key-alias: so@so.onap.org - key--store-password: 'ywsqCy:EEo#j}HJHM7z^Rk[L' - key-store: file:/app/so-vnfm-adapter-certs/so-vnfm-adapter.p12 - key-store-type: PKCS12 - client-auth: need - -http: - client: - ssl: - trust-store: file:/app/so-vnfm-adapter-certs/org.onap.so.trust.jks - trust-store-password: ',sx#.C*W)]wVgJC6ccFHI#:H' + enabled: false aai: auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885 version: v15 @@ -38,7 +28,7 @@ sdc: endpoint: http://sdc-simulator:9991/ toscametapath: Artifacts/Deployment/OTHER/TOSCA.meta vnfmadapter: - endpoint: https://so-vnfm-adapter:9092 + endpoint: http://so-vnfm-adapter:9092 etsi-catalog-manager: vnfpkgm: endpoint: http://modeling-etsicatalog:8806/api/vnfpkgm/v1 |