Merge "Update ca cert generating and correct path to certs"

4 files changed, 11 insertions, 11 deletions

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
index 018f590a..9461eeea 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
@@ -5,8 +5,8 @@
   "server.maxPayloadSizeBytes": 1048576,
   "cbs.firstRequestDelaySec": 3,
   "cbs.requestIntervalSec": 5,
-  "security.keys.keyStoreFile": "/etc/hv-ves/ssl/server.p12",
-  "security.keys.keyStorePasswordFile": "/etc/hv-ves/ssl/server.pass",
-  "security.keys.trustStoreFile": "/etc/hv-ves/ssl/trust.p12",
-  "security.keys.trustStorePasswordFile": "/etc/hv-ves/ssl/trust.pass"
+  "security.keys.keyStoreFile": "/etc/ves-hv/ssl/server.p12",
+  "security.keys.keyStorePasswordFile": "/etc/ves-hv/ssl/server.pass",
+  "security.keys.trustStoreFile": "/etc/ves-hv/ssl/trust.p12",
+  "security.keys.trustStorePasswordFile": "/etc/ves-hv/ssl/trust.pass"
 }
\ No newline at end of file
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh
index 33e3b32b..555590c7 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh
@@ -48,7 +48,7 @@ function gen_key() {
 
 function gen_ca() {
   local ca="$1"
-  keytool -genkeypair ${store_opts} -alias ${ca} -dname "${DNAME_PREFIX}-${ca}" -keystore ${ca}.p12
+  keytool -genkeypair ${store_opts} -alias ${ca} -dname "${DNAME_PREFIX}-${ca}" -keystore ${ca}.p12 -ext bc:c
   keytool -export -alias ${ca} -file ${ca}.crt ${store_opts} -keystore ${ca}.p12
 }
 
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
index 6f5f2ee1..d89e82bb 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -103,7 +103,7 @@ services:
     ports:
       - "6060:6060"
       - "6061:6061/tcp"
-    command: ["--configuration-file", "/etc/hv-ves/configuration/secure.json"]
+    command: ["--configuration-file", "/etc/ves-hv/configuration/secure.json"]
     environment:
       - JAVA_OPTS
       - HOSTNAME=${HV_VES_HOSTNAME}
@@ -116,7 +116,7 @@ services:
       retries: 2
       test: ${HV_VES_HEALTHCHECK_CMD}
     volumes:
-      - ./collector/:/etc/hv-ves/
+      - ./collector/:/etc/ves-hv/
     depends_on:
       - config-binding-service
       - kafka
@@ -128,7 +128,7 @@ services:
     ports:
       - "7060:6060"
       - "7061:6061/tcp"
-    command: ["--configuration-file", "/etc/hv-ves/configuration/insecure.json"]
+    command: ["--configuration-file", "/etc/ves-hv/configuration/insecure.json"]
     environment:
       - JAVA_OPTS
       - HOSTNAME=${HV_VES_HOSTNAME}
@@ -141,7 +141,7 @@ services:
       retries: 2
       test: ${HV_VES_HEALTHCHECK_CMD}
     volumes:
-      - ./collector/:/etc/hv-ves/
+      - ./collector/:/etc/ves-hv/
     depends_on:
       - config-binding-service
       - kafka
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
index a93df5d2..1bd0ba1f 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
@@ -26,8 +26,8 @@ export CONFIG_BINDING_SERVICE="config-binding-service"
 export CONFIG_BINDING_SERVICE_SERVICE_PORT="10000"
 
 export ONAP_NEXUS_REGISTRY="nexus3.onap.org:10001"
-export DOCKER_REGISTRY="docker.io"
-export DOCKER_REGISTRY_PREFIX=""
+export DOCKER_REGISTRY=${ONAP_NEXUS_REGISTRY}
+export DOCKER_REGISTRY_PREFIX="${DOCKER_REGISTRY}/"
 
 export KAFKA_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/kafka111:0.0.6"
 export ZOOKEEPER_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/zookeeper:4.0.0"