Merge "Adding vserver delete endpoints"
diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
index eaebbc2..81d85fe 100644
--- a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
+++ b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
@@ -2,7 +2,7 @@
running_containers=$(docker ps --filter name=dfc_ -qa)
running_images=$(docker images -q)
-docker exec -it dfc_app0 cat /var/log/ONAP/application.log >> $WORKSPACE/archives/dfc_app0_application.log
+docker exec dfc_app0 cat /var/log/ONAP/application.log >> $WORKSPACE/archives/dfc_app0_application.log
docker logs dfc_mr-sim >> $WORKSPACE/archives/dfc_mr-sim.log
if [ -z "$running_containers" ]
diff --git a/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/teardown.sh b/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/teardown.sh
index d8877fb..23581a0 100644
--- a/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/teardown.sh
+++ b/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/teardown.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set +e
-docker exec -it dfc_app0 cat /var/log/ONAP/application.log > $WORKSPACE/archives/dfc_app0_application.log
+docker exec dfc_app0 cat /var/log/ONAP/application.log > $WORKSPACE/archives/dfc_app0_application.log
kill-instance.sh dfc_app0
set -e
exit 0
diff --git a/plans/modeling-genericparser/sanity-check/setup.sh b/plans/modeling-etsicatalog/sanity-check/setup.sh
similarity index 82%
rename from plans/modeling-genericparser/sanity-check/setup.sh
rename to plans/modeling-etsicatalog/sanity-check/setup.sh
index 721885d..9157c41 100644
--- a/plans/modeling-genericparser/sanity-check/setup.sh
+++ b/plans/modeling-etsicatalog/sanity-check/setup.sh
@@ -55,14 +55,15 @@
echo sleep 60
sleep 60
-# start modeling-genericparser
-docker run -d --name modeling-genericparser -v /var/lib/mysql -e MSB_ADDR=${DISCOVERY_IP}:10081 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/modeling/genericparser
-GenericParser_IP=`get-instance-ip.sh modeling-genericparser`
+# start modeling-etsicatalog
+docker run -d --name modeling-etsicatalog -v /var/lib/mysql -e MSB_ADDR=${DISCOVERY_IP}:10081 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/modeling/etsicatalog
+EtsiCatalog_IP=`get-instance-ip.sh modeling-etsicatalog`
for i in {1..10}; do
- curl -sS -m 1 ${GenericParser_IP}:8806 && break
+ curl -sS -m 1 ${EtsiCatalog_IP}:8806 && break
echo sleep $i
sleep $i
done
+docker logs modeling-etsicatalog
# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v GenericParser_IP:${GenericParser_IP} -v MSB_DISCOVERY_IP:${DISCOVERY_IP}"
+ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v EtsiCatalog_IP:${EtsiCatalog_IP} -v MSB_DISCOVERY_IP:${DISCOVERY_IP}"
diff --git a/plans/modeling-genericparser/sanity-check/teardown.sh b/plans/modeling-etsicatalog/sanity-check/teardown.sh
similarity index 94%
rename from plans/modeling-genericparser/sanity-check/teardown.sh
rename to plans/modeling-etsicatalog/sanity-check/teardown.sh
index 3982a1e..1c483cb 100644
--- a/plans/modeling-genericparser/sanity-check/teardown.sh
+++ b/plans/modeling-etsicatalog/sanity-check/teardown.sh
@@ -20,4 +20,4 @@
kill-instance.sh msb_discovery
kill-instance.sh msb_consul
kill-instance.sh vfc-db
-kill-instance.sh modeling-genericparser
+kill-instance.sh modeling-etsicatalog
diff --git a/plans/modeling-genericparser/sanity-check/testplan.txt b/plans/modeling-etsicatalog/sanity-check/testplan.txt
similarity index 75%
rename from plans/modeling-genericparser/sanity-check/testplan.txt
rename to plans/modeling-etsicatalog/sanity-check/testplan.txt
index 25d2c5d..47dd50e 100644
--- a/plans/modeling-genericparser/sanity-check/testplan.txt
+++ b/plans/modeling-etsicatalog/sanity-check/testplan.txt
@@ -1,3 +1,3 @@
# Test suites are relative paths under [integration/csit.git]/tests/.
# Place the suites in run order.
-modeling-genericparser/test.robot
+modeling-etsicatalog/test.robot
diff --git a/plans/so/vnfm_adapter/docker-compose.yml b/plans/so/vnfm_adapter/docker-compose.yml
deleted file mode 100644
index 9519571..0000000
--- a/plans/so/vnfm_adapter/docker-compose.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: '3'
-services:
-################################################################################
- VNFM-adapter:
- image: nexus3.onap.org:10001/onap/so/vnfm-adapter:1.4.4
- ports:
- - "9092:9092"
- environment:
- - APP=VNFM-adapter
- - JVM_ARGS=-Xms64m -Xmx512m
- hostname:
- vnfm-adapter-test
- logging:
- driver: "json-file"
- options:
- max-size: "30m"
- max-file: "5"
-################################################################################
diff --git a/plans/so/vnfm_adapter/setup.sh b/plans/so/vnfm_adapter/setup.sh
deleted file mode 100644
index 518358b..0000000
--- a/plans/so/vnfm_adapter/setup.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-#
-# ============LICENSE_START=======================================================
-# Copyright (C) 2019 Nordix Foundation.
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-#
-
-export NEXUS_DOCKER_REPO_MSO=nexus3.onap.org:10001
-export TAG=1.4.0-STAGING-latest
-
-docker-compose pull
-docker-compose up -d
-
-sleep 2m
-
-REPO_IP='127.0.0.1'
-ROBOT_VARIABLES="-v REPO_IP:${REPO_IP}"
diff --git a/plans/so/vnfm_adapter/teardown.sh b/plans/so/vnfm_adapter/teardown.sh
deleted file mode 100644
index 8b778a5..0000000
--- a/plans/so/vnfm_adapter/teardown.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# ============LICENSE_START=======================================================
-# Copyright (C) 2019 Nordix Foundation.
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-#
-
-docker-compose down
diff --git a/plans/so/vnfm_adapter/testplan.txt b/plans/so/vnfm_adapter/testplan.txt
deleted file mode 100644
index 823990a..0000000
--- a/plans/so/vnfm_adapter/testplan.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-so/vnfm_adapter/vnfm_adapter_test.robot
diff --git a/plans/usecases/5G-bulkpm/assets/application.yaml b/plans/usecases/5G-bulkpm/assets/application.yaml
new file mode 100644
index 0000000..086babc
--- /dev/null
+++ b/plans/usecases/5G-bulkpm/assets/application.yaml
@@ -0,0 +1,26 @@
+spring:
+ profiles:
+ active: prod
+management:
+ endpoints:
+ web:
+ exposure:
+ include: "loggers,logfile,health,info,metrics"
+server:
+ port: 8433
+ ssl:
+ key-store-type: PKCS12
+ key-store-password: ericssondfc
+ key-store: classpath:keystore.jks
+ key-password: ericssondfc
+ keyAlias: tomcat-localhost
+logging:
+ level:
+ ROOT: ERROR
+ org.springframework: ERROR
+ org.springframework.data: ERROR
+ org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
+ org.onap.dcaegen2.collectors.datafile: TRACE
+ file: /var/log/ONAP/application.log
+app:
+ filepath: /opt/app/datafile/config/datafile_endpoints.json
diff --git a/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json b/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json
index 6ba0f25..cbb7cd5 100644
--- a/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json
+++ b/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json
@@ -1,14 +1,14 @@
{
"config": {
"//description": "This file is only used for testing purposes",
- "dmaap.ftpesConfig.keyCert": "/config/dfc.jks",
- "dmaap.ftpesConfig.keyPassword": "secret",
- "dmaap.ftpesConfig.trustedCa": "config/ftp.jks",
- "dmaap.ftpesConfig.trustedCaPassword": "secret",
- "dmaap.security.trustStorePath": "change it",
- "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath",
- "dmaap.security.keyStorePath": "keyStorePath",
- "dmaap.security.keyStorePasswordPath": "change it",
+ "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
+ "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
+ "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
+ "dmaap.ftpesConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
+ "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
+ "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
+ "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
+ "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
"dmaap.security.enableDmaapCertAuth": "false",
"streams_publishes": {
"PM_MEAS_FILES": {
diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh
index 31ac227..c2feb52 100644
--- a/plans/usecases/5G-bulkpm/setup.sh
+++ b/plans/usecases/5G-bulkpm/setup.sh
@@ -149,8 +149,13 @@
echo data_endpoints.json from DFC containter
cat /tmp/datafile_endpoints.json.fromcontainer
docker cp /tmp/datafile_endpoints.json dfc:/opt/app/datafile/config/
+docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/cert.jks.b64 dfc:/opt/app/datafile/etc/cert/
+docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/jks.pass dfc:/opt/app/datafile/etc/cert/
+docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.jks.b64 dfc:/opt/app/datafile/etc/cert/
+docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.pass dfc:/opt/app/datafile/etc/cert/
+docker cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/application.yaml dfc:/opt/app/datafile/config/
#Increase Logging
-docker exec dfc /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: WARN/org.onap.dcaegen2.collectors.datafile: TRACE/g' /opt/app/datafile/config/application.yaml"
+#docker exec dfc /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: WARN/org.onap.dcaegen2.collectors.datafile: TRACE/g' /opt/app/datafile/config/application.yaml"
docker restart dfc
sleep 2
diff --git a/tests/modeling-genericparser/test.robot b/tests/modeling-etsicatalog/test.robot
similarity index 72%
rename from tests/modeling-genericparser/test.robot
rename to tests/modeling-etsicatalog/test.robot
index b3da1c0..2627740 100644
--- a/tests/modeling-genericparser/test.robot
+++ b/tests/modeling-etsicatalog/test.robot
@@ -6,15 +6,15 @@
*** Variables ***
@{return_ok_list}= 200 201 202
-${queryswagger_url} /api/parser/v1/swagger.json
-${queryVNFPackage_url} /api/parser/v1/vnfpackages
-${queryNSPackages_url} /api/parser/v1/nspackages
-${healthcheck_url} /api/parser/v1/health_check
+${queryswagger_url} /api/catalog/v1/swagger.json
+${queryVNFPackage_url} /api/catalog/v1/vnfpackages
+${queryNSPackages_url} /api/catalog/v1/nspackages
+${healthcheck_url} /api/catalog/v1/health_check
*** Test Cases ***
GetVNFPackages
${headers} Create Dictionary Content-Type=application/json Accept=application/json
- Create Session web_session http://${GenericParser_IP}:8806 headers=${headers}
+ Create Session web_session http://${EtsiCatalog_IP}:8806 headers=${headers}
${resp}= Get Request web_session ${queryVNFPackage_url}
${responese_code}= Convert To String ${resp.status_code}
List Should Contain Value ${return_ok_list} ${responese_code}
@@ -22,7 +22,7 @@
HealthCheckTest
[Documentation] check health for catalog by MSB
${headers} Create Dictionary Content-Type=application/json Accept=application/json
- Create Session web_session http://${GenericParser_IP}:8806 headers=${headers}
+ Create Session web_session http://${EtsiCatalog_IP}:8806 headers=${headers}
${resp}= Get Request web_session ${healthcheck_url}
${responese_code}= Convert To String ${resp.status_code}
List Should Contain Value ${return_ok_list} ${responese_code}
diff --git a/tests/so/vnfm_adapter/vnfm_adapter_test.robot b/tests/so/vnfm_adapter/vnfm_adapter_test.robot
deleted file mode 100644
index d0c7034..0000000
--- a/tests/so/vnfm_adapter/vnfm_adapter_test.robot
+++ /dev/null
@@ -1,16 +0,0 @@
-*** Settings ***
-Library Collections
-Library RequestsLibrary
-Library OperatingSystem
-Library json
-
-*** Variables ***
-
-
-*** Test Cases ***
-
-Healthcheck
- Create Session refrepo http://${REPO_IP}:9092
- &{headers}= Create Dictionary Authorization=Basic dm5mbTpwYXNzd29yZDEk== Content-Type=application/json
- ${resp}= Get Request refrepo /manage/health headers=${headers}
- Run Keyword If '${resp.status_code}' == 'UP' log to console \nexecuted with expected result