From 319d0ad25fc3c0f088b8cc6cebd1e03463bbb9d3 Mon Sep 17 00:00:00 2001
From: eHanan <eoin.hanan@est.tech>
Date: Tue, 3 Sep 2019 13:45:18 +0000
Subject: Create VNF Instantiation Testing

Change-Id: I230e569c0b25d31aaf63d5476c7585673c9eb58b
Issue-ID: SO-2238
Signed-off-by: eHanan <eoin.hanan@est.tech>
---
 plans/so/integration-etsi-testing/config/env          |  2 +-
 .../override-files/bpmn-infra/onapheat/override.yaml  |  6 ++++++
 .../vnfm-adapter/onapheat/override.yaml               | 19 +++++++++++++++++++
 plans/so/integration-etsi-testing/docker-compose.yml  |  4 ++--
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 plans/so/integration-etsi-testing/config/override-files/vnfm-adapter/onapheat/override.yaml

(limited to 'plans/so')

diff --git a/plans/so/integration-etsi-testing/config/env b/plans/so/integration-etsi-testing/config/env
index 54d67205..61603aac 100644
--- a/plans/so/integration-etsi-testing/config/env
+++ b/plans/so/integration-etsi-testing/config/env
@@ -1,5 +1,5 @@
 NEXUS_DOCKER_REPO_MSO=nexus3.onap.org:10001
-TAG=1.4.0-STAGING-latest
+TAG=1.4.3-STAGING-latest
 TIME_OUT_DEFAULT_VALUE_SEC=1200
 PROJECT_NAME=etsiintegrationtesting
 DEFAULT_NETWORK_NAME=etsiintegrationtesting_default
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 d38888d5..66e3b206 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
@@ -258,6 +258,12 @@ sdnc:
     svc:
       types: PORT-MIRROR,PPROBE
 
+so:
+  vnfm:
+    adapter:
+      url: http://vnfm-adapter:9092/so/vnfm-adapter/v1/
+      auth: Basic dm5mbTpwYXNzd29yZDEk
+
 appc:
   client:
     topic:
diff --git a/plans/so/integration-etsi-testing/config/override-files/vnfm-adapter/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/vnfm-adapter/onapheat/override.yaml
new file mode 100644
index 00000000..e2f8cc14
--- /dev/null
+++ b/plans/so/integration-etsi-testing/config/override-files/vnfm-adapter/onapheat/override.yaml
@@ -0,0 +1,19 @@
+server:
+    port: 9092
+    tomcat:
+        max-threads: 4
+ssl-enable: false
+aai:
+    auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
+    version: v15
+    endpoint:  https://aai-simulator:9993
+mso:
+      key: 07a7159d3bf51a0e53be7a8f89699be7
+sdc:
+  username: mso
+  password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F
+  key: 566B754875657232314F5548556D3665
+  endpoint: http://sdc-simulator:9991/
+  toscametapath: Artifacts/Deployment/OTHER/TOSCA.meta
+vnfmadapter:
+  endpoint: http://vnfm-adapter:9092
\ No newline at end of file
diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml
index 2c7261c2..76dd7b6a 100644
--- a/plans/so/integration-etsi-testing/docker-compose.yml
+++ b/plans/so/integration-etsi-testing/docker-compose.yml
@@ -234,7 +234,7 @@ services:
     ports:
       - "30224:30224"
     volumes:
-      - ${TEST_LAB_DIR}/volumes/so/config/api-handler-infra/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/override-files/so-monitoring/onapheat:/app/config
     environment:
       - APP=so-monitoring
       - JVM_ARGS=-Xms64m -Xmx512m
@@ -251,7 +251,7 @@ services:
       - "9092:9092"
     volumes:
       - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
-      - ${TEST_LAB_DIR}/volumes/so/config/vnfm-adapter/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/override-files/vnfm-adapter/onapheat:/app/config
     environment:
     - APP=vnfm-adapter
     - JVM_ARGS=-Xms64m -Xmx512m
-- 
cgit 1.2.3-korg