From 5ab4b09170106548b78b949e7cc670201a2b2ef7 Mon Sep 17 00:00:00 2001 From: Dileep Ranganathan Date: Fri, 2 Nov 2018 06:27:20 -0700 Subject: [PATCH 01/16] Update OOF version for OSDF and HAS Update version to 1.2.4-SNAPSHOT-latest Change-Id: I5b96beee7e5c4635b6793b35757130267002efb8 Issue-ID: OPTFRA-384 Signed-off-by: Dileep Ranganathan --- scripts/optf-has/has/has_script.sh | 2 +- scripts/optf-osdf/osdf/osdf_script.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/optf-has/has/has_script.sh b/scripts/optf-has/has/has_script.sh index bee7dad6..e6558cb8 100755 --- a/scripts/optf-has/has/has_script.sh +++ b/scripts/optf-has/has/has_script.sh @@ -31,7 +31,7 @@ cd ${DIR} COND_CONF=/tmp/conductor/properties/conductor.conf LOG_CONF=/tmp/conductor/properties/log.conf IMAGE_NAME=nexus3.onap.org:10001/onap/optf-has -IMAGE_VER=1.2.3-SNAPSHOT-latest +IMAGE_VER=1.2.4-SNAPSHOT-latest BUNDLE=/tmp/conductor/properties/AAF_RootCA.cer mkdir -p /tmp/conductor/properties diff --git a/scripts/optf-osdf/osdf/osdf_script.sh b/scripts/optf-osdf/osdf/osdf_script.sh index 6eb2aa81..6d4efa19 100755 --- a/scripts/optf-osdf/osdf/osdf_script.sh +++ b/scripts/optf-osdf/osdf/osdf_script.sh @@ -34,7 +34,7 @@ cd ${DIR} # run docker containers OSDF_CONF=/tmp/osdf/properties/osdf_config.yaml IMAGE_NAME=nexus3.onap.org:10001/onap/optf-osdf -IMAGE_VER=1.2.3-SNAPSHOT-latest +IMAGE_VER=1.2.4-SNAPSHOT-latest mkdir -p /tmp/osdf/properties mkdir -p /tmp/sms/properties -- 2.16.6 From 0e97753e90f5ac38e5f952f6f7e39b02e6aad15d Mon Sep 17 00:00:00 2001 From: Instrumental Date: Sun, 4 Nov 2018 18:01:31 -0600 Subject: [PATCH 02/16] Liveness for CSIT Issue-ID: AAF-606 Change-Id: Ia8f243748b79d8ae974f6015e94ebb294b1b1c05 Signed-off-by: Instrumental --- plans/aaf/aafapi/setup.sh | 16 ++++------------ plans/aaf/aafapi/teardown.sh | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/plans/aaf/aafapi/setup.sh b/plans/aaf/aafapi/setup.sh index 114cd7aa..6c88ceb7 100644 --- a/plans/aaf/aafapi/setup.sh +++ b/plans/aaf/aafapi/setup.sh @@ -116,19 +116,11 @@ docker images docker ps -a -docker logs aaf_hello +for C in aaf_service aaf_locate aaf_oauth aaf_cm aaf_gui aaf_hello aaf_fs; do + docker logs $C +done -docker logs aaf_locate - -docker logs aaf_cm - -docker logs aaf_gui - -docker logs aaf_fs - -docker logs aaf_oauth - -docker logs aaf_service +bash ./aaf.sh wait aaf_service AAF_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' aaf_service) echo AAF_IP=${AAF_IP} diff --git a/plans/aaf/aafapi/teardown.sh b/plans/aaf/aafapi/teardown.sh index 957bb356..f80c3ad2 100644 --- a/plans/aaf/aafapi/teardown.sh +++ b/plans/aaf/aafapi/teardown.sh @@ -25,6 +25,6 @@ cd "$WORKSPACE/archives/opt/authz/auth/docker" bash dstop.sh bash dstop.sh cass echo "Y" | docker container prune -docker volume remove aaf_config aaf_cass_data +docker volume remove aaf_config aaf_cass_data aaf_status cd - -- 2.16.6 From 46d54d4e75796de4a0b1676c05fe23833ec005ba Mon Sep 17 00:00:00 2001 From: eh552t Date: Mon, 5 Nov 2018 15:31:34 +0100 Subject: [PATCH 03/16] Fix CSIT for CLAMP as UI was reworked Change-Id: Ifebbfccef33187bfb142aece32369d4168153340 Signed-off-by: eh552t Issue-ID: CLAMP-233 --- tests/clamp/APIs/data/createClHolmes1.json | 2 +- tests/clamp/UIs/03__Verify_UI_Models.robot | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/clamp/APIs/data/createClHolmes1.json b/tests/clamp/APIs/data/createClHolmes1.json index 5c89efdb..696145b8 100644 --- a/tests/clamp/APIs/data/createClHolmes1.json +++ b/tests/clamp/APIs/data/createClHolmes1.json @@ -2,7 +2,7 @@ "name":"ClHolmes1", "controlNamePrefix":"ClosedLoop-", "bpmnText":"", - "propText":"{\"global\":[{\"name\":\"service\",\"value\":[\"4cc5b45a-1f63-4194-8100-cd8e14248c92\"]},{\"name\":\"vf\",\"value\":[\"07e266fc-49ab-4cd7-8378-ca4676f1b9ec\"]},{\"name\":\"actionSet\",\"value\":[\"vnfRecipe\"]},{\"name\":\"location\",\"value\":[\"DC1\",\"DC2\"]}],\"Holmes_1gxp0mm\":[{\"name\":\"correlationalLogic\",\"value\":\"correlational logic1\"},{\"name\":\"configPolicyName\",\"value\":\"Config Policy name1\"}],\"Policy_136qatf\":{\"Policy1\":[{\"name\":\"pname\",\"value\":\"Policy1\"},{\"name\":\"pid\",\"value\":\"0\"},{\"name\":\"timeout\",\"value\":\"345\"},{\"policyConfigurations\":[[{\"name\":\"recipe\",\"value\":[\"restart\"]},{\"name\":\"maxRetries\",\"value\":[\"3\"]},{\"name\":\"retryTimeLimit\",\"value\":[\"180\"]},{\"name\":\"_id\",\"value\":[\"QxHBjiW\"]},{\"name\":\"parentPolicy\",\"value\":[\"\"]},{\"name\":\"targetResourceId\",\"value\":[\"\"]}]]}]}}", + "propText":"{\"global\":[{\"name\":\"service\",\"value\":[\"4cc5b45a-1f63-4194-8100-cd8e14248c92\"]},{\"name\":\"vf\",\"value\":[\"07e266fc-49ab-4cd7-8378-ca4676f1b9ec\"]},{\"name\":\"actionSet\",\"value\":[\"vnfRecipe\"]},{\"name\":\"location\",\"value\":[\"DC1\",\"DC2\"]}],\"Holmes_1gxp0mm\":[{\"name\":\"correlationalLogic\",\"value\":\"correlational logic1\"},{\"name\":\"configPolicyName\",\"value\":\"Config Policy name1\"}],\"Policy_136qatf\":{\"Policy1\":[{\"name\":\"pname\",\"value\":\"Policy1\"},{\"name\":\"pid\",\"value\":\"0\"},{\"name\":\"timeout\",\"value\":\"345\"},{\"policyConfigurations\":[[{\"name\":\"recipe\",\"value\":[\"Restart\"]},{\"name\":\"maxRetries\",\"value\":[\"3\"]},{\"name\":\"retryTimeLimit\",\"value\":[\"180\"]},{\"name\":\"_id\",\"value\":[\"QxHBjiW\"]},{\"name\":\"parentPolicy\",\"value\":[\"\"]},{\"name\":\"targetResourceId\",\"value\":[\"\"]}]]}]}}", "imageText":"VESVesCollectorHHolmesPolicy", "templateName":"templateHolmes1", "typeId":null, diff --git a/tests/clamp/UIs/03__Verify_UI_Models.robot b/tests/clamp/UIs/03__Verify_UI_Models.robot index 66bc3b15..e5f6efdb 100644 --- a/tests/clamp/UIs/03__Verify_UI_Models.robot +++ b/tests/clamp/UIs/03__Verify_UI_Models.robot @@ -26,7 +26,7 @@ Verify HolmesModel1 Should Contain Match ${resp} *DC3* Should Contain Match ${resp} *Policy1* Should Contain Match ${resp} *07e266fc-49ab-4cd7-8378-ca4676f1b9ec* - Should Contain Match ${resp} *migrate* + Should Contain Match ${resp} *Migrate* Should Contain Match ${resp} *240* Should Contain Match ${resp} *390* Should Contain Match ${resp} *Logic1* @@ -40,7 +40,7 @@ Verify TCAModel1 Should Contain Match ${resp} *DC1* Should Contain Match ${resp} *DC3* Should Contain Match ${resp} *Policy2* - Should Contain Match ${resp} *restart* + Should Contain Match ${resp} *Restart* Should Contain Match ${resp} *280* Should Contain Match ${resp} *400* -- 2.16.6 From 72141ca7038d1ae5657596e4db1e1f55eef7e5b9 Mon Sep 17 00:00:00 2001 From: Dileep Ranganathan Date: Mon, 5 Nov 2018 07:26:32 -0800 Subject: [PATCH 04/16] Remove Busybox netcat check for music-db Change-Id: I27d035145bdc1ef6f727ad92afc21f35ef3b2f21 Issue-ID: MUSIC-176 Signed-off-by: Dileep Ranganathan --- scripts/optf-has/has/music_script.sh | 8 +++----- scripts/optf-has/has/music_teardown_script.sh | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/optf-has/has/music_script.sh b/scripts/optf-has/has/music_script.sh index ba37d901..4257dad7 100755 --- a/scripts/optf-has/has/music_script.sh +++ b/scripts/optf-has/has/music_script.sh @@ -66,17 +66,15 @@ docker run -d --name music-db --network music-net -p "7000:7000" -p "7001:7001" -v $MUSIC_TRIGGER_DIR/$TRIGGER_JAR:/etc/cassandra/triggers/$TRIGGER_JAR \ ${CASS_IMG}; +# See if cassandra is up. +echo "########## Running Test to see if Cassandra is up ##########" CASSA_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-db` echo "CASSANDRA_IP=${CASSA_IP}" ${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042 -# See if cassandra is up. -echo "########## Running Test to see if Cassandra is up ##########" -docker run --name music-casstest --network music-net \ -$BUSYBOX_IMG sh -c "until nc -z music-db 9042 && echo "success"; do echo 'No connection .. Sleeping for $TT seconds';sleep $TT; done;" - # Sleep 60 seconds to ensure Cassandra is up and running. sleep 60; + # Check to see if Keyspaces are there. docker exec music-db cqlsh -u cassandra -p cassandra -e "DESCRIBE keyspaces;" diff --git a/scripts/optf-has/has/music_teardown_script.sh b/scripts/optf-has/has/music_teardown_script.sh index e05ef9d1..2e7d707b 100755 --- a/scripts/optf-has/has/music_teardown_script.sh +++ b/scripts/optf-has/has/music_teardown_script.sh @@ -40,14 +40,12 @@ docker stop music-tomcat docker stop music-war docker stop music-zk docker stop music-job -docker stop music-casstest docker stop music-db docker rm music-zk docker rm music-tomcat docker rm music-war docker rm music-job -docker rm music-casstest docker rm music-db docker network rm music-net; -- 2.16.6 From cd5c61158efb25f21273b13e4423c7f690067fc0 Mon Sep 17 00:00:00 2001 From: vrvarma Date: Mon, 5 Nov 2018 11:08:44 -0500 Subject: [PATCH 05/16] Add snapshot version to the csit docker instance Change-Id: I749c541e0cad832c87f1a29a345d08535d9814a6 Signed-off-by: vrvarma Issue-ID: OPTFRA-392 --- scripts/optf-cmso/cmso/start_cmso_containers.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/optf-cmso/cmso/start_cmso_containers.sh b/scripts/optf-cmso/cmso/start_cmso_containers.sh index 10e0855d..ded86d7c 100644 --- a/scripts/optf-cmso/cmso/start_cmso_containers.sh +++ b/scripts/optf-cmso/cmso/start_cmso_containers.sh @@ -20,6 +20,9 @@ echo "This is ${WORKSPACE}/scripts/opft-cmso/cmso/start_cmso_containers.sh" +DB_IMAGE_VERSION=1.0-SNAPSHOT-latest +SERVICE_IMAGE_VERSION=1.0-SNAPSHOT-latest + # start cmso mariadb and db-init containers with docker compose and configuration from cmso/cmso-service/extra/docker/cmso-service/docker-compose.yml docker run -p 3306:3306 --name cmso-mariadb -v $(pwd)/mariadb/conf1:/etc/mysql/conf.d -e MYSQL_ROOT_PASSWORD=beer -d mariadb:10.1.11 @@ -32,11 +35,13 @@ sed -i -e "s%192.168.56.101:3306%${CMSO_DB_IP}:3306%g" ./etc/config/cmso.proper sed -i -e "s%192.168.56.101:3306%${CMSO_DB_IP}:3306%g" ./etc/config/liquibase.properties -docker run --name cmso-db-init -v $(pwd)/etc:/share/etc -v $(pwd)/logs:/share/logs -d nexus3.onap.org:10001/onap/optf-cmso-dbinit +docker run --name cmso-db-init -v $(pwd)/etc:/share/etc -v $(pwd)/logs:/share/logs \ + -d nexus3.onap.org:10001/onap/optf-cmso-dbinit:${DB_IMAGE_VERSION} sleep 30 -docker run --name cmso-service -p 8080:8080 -v $(pwd)/etc:/share/etc -v $(pwd)/logs:/share/logs -v $(pwd)/debug-logs:/share/debug-logs -d nexus3.onap.org:10001/onap/optf-cmso-service +docker run --name cmso-service -p 8080:8080 -v $(pwd)/etc:/share/etc -v $(pwd)/logs:/share/logs\ + -v $(pwd)/debug-logs:/share/debug-logs -d nexus3.onap.org:10001/onap/optf-cmso-service:${SERVICE_IMAGE_VERSION} CMSO_SERVICE_IP=`get-instance-ip.sh cmso-service` -- 2.16.6 From a8bbfd3f9ad3ef5cc27276061d58eef06d54f9a3 Mon Sep 17 00:00:00 2001 From: "Tschaen, Brendan" Date: Mon, 5 Nov 2018 17:17:01 -0500 Subject: [PATCH 06/16] Remove redundant cassandra check Change-Id: If90e97e53c823bb1511ef52c1b37ae73c9367f34 Issue-ID: MUSIC-176 Signed-off-by: Tschaen, Brendan --- plans/music/music-test-plan/setup.sh | 8 +++----- plans/music/music-test-plan/teardown.sh | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/plans/music/music-test-plan/setup.sh b/plans/music/music-test-plan/setup.sh index add34b1a..1b4896ef 100755 --- a/plans/music/music-test-plan/setup.sh +++ b/plans/music/music-test-plan/setup.sh @@ -68,17 +68,15 @@ docker run -d --name music-db --network music-net -p "7000:7000" -p "7001:7001" -v $MUSIC_TRIGGER_DIR/$TRIGGER_JAR:/etc/cassandra/triggers/$TRIGGER_JAR \ ${CASS_IMG}; +# See if cassandra is up. +echo "########## Running Test to see if Cassandra is up ##########" CASSA_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-db` echo "CASSANDRA_IP=${CASSA_IP}" ${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042 -# See if cassandra is up. -echo "########## Running Test to see if Cassandra is up ##########" -docker run --name music-casstest --network music-net \ -$BUSYBOX_IMG sh -c "until nc -z music-db 9042 && echo "success"; do echo 'No connection .. Sleeping for $TT seconds';sleep $TT; done;" - # Sleep 60 seconds to ensure Cassandra is up and running. sleep 60; + # Check to see if Keyspaces are there. docker exec music-db cqlsh -u cassandra -p cassandra -e "DESCRIBE keyspaces;" diff --git a/plans/music/music-test-plan/teardown.sh b/plans/music/music-test-plan/teardown.sh index e05ef9d1..2e7d707b 100755 --- a/plans/music/music-test-plan/teardown.sh +++ b/plans/music/music-test-plan/teardown.sh @@ -40,14 +40,12 @@ docker stop music-tomcat docker stop music-war docker stop music-zk docker stop music-job -docker stop music-casstest docker stop music-db docker rm music-zk docker rm music-tomcat docker rm music-war docker rm music-job -docker rm music-casstest docker rm music-db docker network rm music-net; -- 2.16.6 From c4b24af1cc608d086b5d7938fdfc691ca016e838 Mon Sep 17 00:00:00 2001 From: pkaras Date: Wed, 7 Nov 2018 09:02:47 +0100 Subject: [PATCH 07/16] ssl set-up between PRH, AAI, DmaaP Change-Id: I1f13305a25f684df23c58067f5eec01d25e7d01c Issue-ID: DCAEGEN2-956 Signed-off-by: piotr.karas --- .../prh-testcases/resources/docker-compose.yml | 32 +++++++----- .../prh-testcases/resources/simulator/AAI.py | 2 +- .../prh-testcases/resources/simulator/DMaaP.py | 2 +- .../resources/simulator/certs/aai_aai.onap.org.cer | 55 +++++++++++++++++++++ .../resources/simulator/certs/ca_local_0.cer | 31 ++++++++++++ .../resources/simulator/certs/client.crt | 18 ------- .../resources/simulator/certs/client.key | 27 ---------- .../certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer | 51 +++++++++++++++++++ .../resources/simulator/certs/keystore.password | 1 + .../resources/simulator/certs/org.onap.aai.key | 29 +++++++++++ .../resources/simulator/certs/org.onap.dcae.jks | Bin 0 -> 4512 bytes .../simulator/certs/org.onap.dcae.trust.jks | Bin 0 -> 1413 bytes .../simulator/certs/org.onap.dmaap-bc.key | 29 +++++++++++ .../resources/simulator/certs/server.crt | 19 ------- .../resources/simulator/certs/server.key | 27 ---------- .../resources/simulator/certs/truststore.password | 1 + .../resources/simulator/httpServerLib.py | 3 +- 17 files changed, 221 insertions(+), 106 deletions(-) create mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/aai_aai.onap.org.cer create mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/ca_local_0.cer delete mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/client.crt delete mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/client.key create mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer create mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/keystore.password create mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.aai.key create mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dcae.jks create mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dcae.trust.jks create mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dmaap-bc.key delete mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/server.crt delete mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/server.key create mode 100644 tests/dcaegen2/prh-testcases/resources/simulator/certs/truststore.password diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index 6d646801..bc42a942 100644 --- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -3,9 +3,9 @@ services: prh: image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest command: > - --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap + --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-bc --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222 - --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap + --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap-bc --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2222 --aai.aaiClientConfiguration.aaiHostPortNumber=3333 --aai.aaiClientConfiguration.aaiHost=aai @@ -21,19 +21,27 @@ services: - "8433:8433" container_name: prh depends_on: - - dmaap + - dmaap-bc - aai ssl_prh: image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest command: > - --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap - --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222 - --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap - --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2222 - --aai.aaiClientConfiguration.aaiHostPortNumber=3333 + --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-bc + --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2223 + --dmaap.dmaapConsumerConfiguration.dmaapProtocol=https + --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap-bc + --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2223 + --dmaap.dmaapProducerConfiguration.dmaapProtocol=https + --aai.aaiClientConfiguration.aaiHostPortNumber=3334 --aai.aaiClientConfiguration.aaiHost=aai - --aai.aaiClientConfiguration.aaiProtocol=http + --aai.aaiClientConfiguration.aaiProtocol=https + --security.enableAaiCertAuth=true + --security.enableDmaapCertAuth=true + --security.keyStorePath=/tmp/certs/org.onap.dcae.jks + --security.keyStorePasswordPath=/tmp/certs/keystore.password + --security.trustStorePath=/tmp/certs/org.onap.dcae.trust.jks + --security.trustStorePasswordPath=/tmp/certs/truststore.password entrypoint: - java - -Dspring.profiles.active=dev @@ -43,12 +51,14 @@ services: ports: - "8200:8100" - "8533:8433" + volumes: + - ./simulator/certs:/tmp/certs container_name: ssl_prh depends_on: - - dmaap + - dmaap-bc - aai - dmaap: + dmaap-bc: build: context: simulator dockerfile: DMaaP_simulator diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py index 416e7f45..bacd1065 100644 --- a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py +++ b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py @@ -43,7 +43,7 @@ class AAIHandler(BaseHTTPRequestHandler): def _main_(handler_class=AAIHandler, protocol="HTTP/1.0"): handler_class.protocol_version = protocol httpServerLib.start_http_endpoint(3333, AAIHandler) - httpServerLib.start_https_endpoint(3334, AAIHandler) + httpServerLib.start_https_endpoint(3334, AAIHandler, keyfile="certs/org.onap.aai.key", certfile="certs/aai_aai.onap.org.cer", ca_certs="certs/ca_local_0.cer") httpServerLib.start_http_endpoint(3335, AAISetup) while 1: time.sleep(10) diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py b/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py index bb37ddd0..392c460d 100644 --- a/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py +++ b/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py @@ -58,7 +58,7 @@ class DMaaPHandler(BaseHTTPRequestHandler): def _main_(handler_class=DMaaPHandler, protocol="HTTP/1.0"): handler_class.protocol_version = protocol httpServerLib.start_http_endpoint(2222, DMaaPHandler) - httpServerLib.start_https_endpoint(2223, DMaaPHandler) + httpServerLib.start_https_endpoint(2223, DMaaPHandler, keyfile="certs/org.onap.dmaap-bc.key", certfile="certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer", ca_certs="certs/ca_local_0.cer") httpServerLib.start_http_endpoint(2224, DmaapSetup) while 1: time.sleep(10) diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/aai_aai.onap.org.cer b/tests/dcaegen2/prh-testcases/resources/simulator/certs/aai_aai.onap.org.cer new file mode 100644 index 00000000..327f57b6 --- /dev/null +++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/aai_aai.onap.org.cer @@ -0,0 +1,55 @@ +-----BEGIN CERTIFICATE----- +MIIE5TCCA82gAwIBAgIJAI5fEseaW2LVMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNV +BAYTAlVTMQ0wCwYDVQQKDARPTkFQMQ4wDAYDVQQLDAVPU0FBRjEZMBcGA1UEAwwQ +aW50ZXJtZWRpYXRlQ0FfMjAeFw0xODEwMTgxMDM3MzJaFw0xOTA0MTgxMDM3MzJa +MGYxDDAKBgNVBAMMA2FhaTEPMA0GCSqGSIb3DQEJARYAMRkwFwYDVQQLDBBhYWlA +YWFpLm9uYXAub3JnMQ4wDAYDVQQLDAVPU0FBRjENMAsGA1UECgwET05BUDELMAkG +A1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCnz1BBkcD +y1M73ANgkbfwYANSJPdnU/meXpgHKYvXa8xbEI3Lsi5EnB7o9nthZFdU5dPZRFV5 +uJEOl0pjt3ogmPo0XZGYO++GfRNLq+c2YVmYjTLgFvEz6GzUtLueYjrl2JItGRug +x0wNPXQmaAX3/8wD7nOTAZjlmuSWCeeJu5GBaX4aaiwVOONDGhmZZ7jISTE0xvvU +936ECnUhSZtt/qRvnA1EJB/Hhs5Se4VPx6lTXYf8PXquI0IgDV49hlLhbPMKadQ8 +lo2yitiaSMJHsLZ1Wt6ob9oNFlBcceq3tfXPMVVylssuAI1pc3HsbmV7kMIwg0P1 +fyVoIALHlXgDAgMBAAGjggGzMIIBrzAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIF +4DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwVAYDVR0jBE0wS4AU +BASNACQ4xpx414BXQWdJBoDmckehMKQuMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYD +VQQKDARPTkFQMQswCQYDVQQGEwJVU4IBAjAdBgNVHQ4EFgQUMghLmZ4l0T+MY3uk +AR6YBJP5gwMwgfoGA1UdEQSB8jCB74IDYWFpgoHnYWFpLmFwaS5zaW1wbGVkZW1v +Lm9uYXAub3JnIGFhaS5lbGFzdGljc2VhcmNoLnNpbXBsZWRlbW8ub25hcC5vcmcg +YWFpLmdyZW1saW5zZXJ2ZXIuc2ltcGxlZGVtby5vbmFwLm9yZyBhYWkuaGJhc2Uu +c2ltcGxlZGVtby5vbmFwLm9yZyBhYWkub25hcCBhYWkuc2VhcmNoc2VydmljZS5z +aW1wbGVkZW1vLm9uYXAub3JnIGFhaS5zaW1wbGVkZW1vLm9uYXAub3JnIGFhaS51 +aS5zaW1wbGVkZW1vLm9uYXAub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQBJyXk6ZTfA +f9mYi5ey/ZpchB9egJfwEXXOqSKeYYTjqUr3uXXk+usb8YXsFVoD9Id5do3Hnxv+ +J3ISGmyPTgQfV/9KDmtHPTyclR9mLji+j4GviZnIpAIsI/duPKlEfLcym9smAC7Q ++HYanUQ7s8sjJJ4ORdBLOy1HkfTu9pjNKZ1CcEnJZ8Y5juLOeEj+Xa+QzcywSK2E +iuPXJwFFtcX9fO+ojiQV9g0L9JgABMqm4Q6si03gXofYEgvAUJSxsirydB8kcqPU +jCgw8/XIsHj4VRNNWlwkvzskeX9ZlcFMmn6DTfyDD1Rrij1efotO2ie3OrKUEzpH +N1G5vCuZqOla +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEVDCCAjygAwIBAgIBAjANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB +RjENMAsGA1UECgwET05BUDELMAkGA1UEBhMCVVMwHhcNMTgwOTI0MTE0MjE2WhcN +MjMwOTI0MTE0MjE2WjBHMQswCQYDVQQGEwJVUzENMAsGA1UECgwET05BUDEOMAwG +A1UECwwFT1NBQUYxGTAXBgNVBAMMEGludGVybWVkaWF0ZUNBXzIwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjPFeAho7BtWjB4Enww/KXD0tTuoda/Fkc +o/yv2waNNsx+pOYGdJwNHYvNS7/RLBHc8kCN+TbKnYZ6AE97wD1Pzrc7AZ58qpjq +Ob7aTp4u3IAMWR5YOkDyjiibA5X7z9N/wveG/Ei2SgN2pY7O2lK5ucm6igarfxll +rZC1MA9zAXrfmd5bLJQQqACT6q15KQaCIwhqwoXp8w+s0rXcZ2/L303lFIUXoHUp +kzMsIPhJ/ZoEvAEkXIPgT2uFgOwIyWmr8Rg5jYzZhV7vey3bQUBlue9aiMIXih3d +b4AVD6J6eF/NmJygtUfHFrWeTAYLppA0d69BWUQZ+XQgCwjOMLaNAgMBAAGjZjBk +MB0GA1UdDgQWBBQEBI0AJDjGnHjXgFdBZ0kGgOZyRzAfBgNVHSMEGDAWgBTtc8Wb +I4DL8Bm6CVi8//GsTyq8NTASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQE +AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAt4VCLb2UHiZpDfSQbe62vlFzsGlODYKF +k7BhW9Q5jfIXpPhhtBLFwJFEKAWFLVWubz+YIa7I5wtniS6zEPC/5t3JOiEXMJQY +PfaPDSsovZ+eShu0QtrjjldFwL2MiqNsd2IWLSIRQUP63RZGBRTTxSsxB0VAfRyT +cu/8znpmZsHna3DspGZQputm7qsxgUhAcPCdo9RQtG6Ox6L1wTXUJmTPHdKQtZjr +qqSQ7kn8u3i5KQYYapmc3UO+CBbzoLPD5Rrlq+ROBbiNd9R/j5vVgRO7vsU9SHnm +AaKFEjDPTSjDtMOxu1BsTNmftaE2jcYa9/ZW67H8URCuo92NE0cZRxBqHkPUjH3/ +/S43/TBAfjfarF5WW7iMAEZfEGhrQu26JWXBMcZshStuHUEPl2b+RC5LZcBMYKgi +SqSOXzpiJeRNASpXKCQQZG8n03c/jBf1U20HaK/4Z2ikOql5B21suxhUbixG1EQN +DOrFGOFUqG4Eyw+xjUR5rTfDnpKgQfJo0/aohZs9p5x+UwitkrQkJQ1ZmEzeVDjm +7xsmOcAJS2T9DLle6fDWvyh76InymAPxzk1/2AWOp8uw8iwNfFxE+p+M7h0psZxp +SnvlgASASdWlZLcMQtNiiKzMK75FW9SMctQfA/RfohNEwivpp6tNpgJozoKmhoPK +zs5HS/mx8GI= +-----END CERTIFICATE----- diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/ca_local_0.cer b/tests/dcaegen2/prh-testcases/resources/simulator/certs/ca_local_0.cer new file mode 100644 index 00000000..ff37eaf7 --- /dev/null +++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/ca_local_0.cer @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFPjCCAyagAwIBAgIJAMhpcvbx/8/AMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV +BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA4MDMx +MzI2NTBaFw0zODA3MjkxMzI2NTBaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK +DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC +ggIBAO4j7nmAY9KX/ceFCITuWAMCHAmSoeHCTs+lgkYX7DpXPidsF5t0ijPaElUC +rwwMnXz5h1o8FzXD64FMbqMVEseLUDZGelRZ7Rkz+hy0Y5i8QKsBTfeo7sP7ZEaC +vpqom9imPLFUn4oDeYspCKjMF93Z69Cv8pxFYCFpZwY3eR9V4xOB613k8guBJtHR +ccY9/NbdfbkrtUz5kNuQqwLj5ttvesqxPq0L4m3bPjkubQCb+QiJxx10Xcx6fcfu +wIu7NR63qDlWFYstsDnH/VIT1pSCBHEw+muSEQ44sgPFy+AxB8O8HKd8wRfmkV2d +YNPyotTLD+aLzDlCWtC0pGnTTJimdu9+hZRIZz5YT4m8BdLQ/jTBd6Gx2tVLvWso +9IJSjfkhj6EtVxyZ81jM+rLAnKy3qPXDCN6CIKL07hNuSzIIhCrK2L4f82JWS7dP +mg2acuhCH56qrhEr42Kjeak181KM/QKiRPgNyOSygJ7uRaLbqOQRh46c68NcmW4F +13OwJQAsrjgaQY1ZWnFsvRYK9NnUqK+2XuCQFS7EYm02M2UwO2GCD88In8PCzzv8 +Q0Zj8Hb4h79fVRjG8/3MnQCJ164+9PfXyu9dj5l6XkkSvdj1IsewaSMy9NccGx7Q +rE7yRPMB6FlAnGPj0KbJXHXJyiujPHSCF0D+Hbl9rxU7FRAbAgMBAAGjYzBhMB0G +A1UdDgQWBBTtc8WbI4DL8Bm6CVi8//GsTyq8NTAfBgNVHSMEGDAWgBTtc8WbI4DL +8Bm6CVi8//GsTyq8NTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN +BgkqhkiG9w0BAQsFAAOCAgEAW4IYy1PUrV/wHblIGFTBo5z7EB33rpHfAJzbDkop +2n5wOlmh78pkeRNb1TOKcSHJPw0MdkwVBPI1wm/SOpHUPmKTW1muO6RUnFjZ68y9 +DiVa6zCW/RBFeG3f8kywxgqPLml1TbikRuMBU0ucOa/bXZ98P2hMLkjWTgeARGSj +QCb7QyqeFzG0mPmAuX6zMj5xwpdyPB0zCoRGXa/BIWEvYjgkaRM+E+9oRWt/6BHQ +4uw11R7gAV4/TSu7qYNfTMllBaLJ0o/1q0QF16e4mV1E4erDfWKlrvUlgCaHCx8Q +3PL7ovM4jjrTNAjnX0q5xtWbF0mlJhJk/NbPDb7hArBv4vp9XoITyRW1vcbe94jv +GzqLKlvBQUxGue4kLYDmUFdog7gaCkEH3N4mH3ad4HZUsOMeanvVgbVZr10VOlNq +TEWqDPATayJdo+VhJCGc6hVa+IJsDTAa/z2MLybqcoOfNT/rxYIdvlX4OjSqAqOj +bSivsCe9c4km56pP2ufA/woPzh+Z46Ukt+krGyFQwKdQQLh5Pp7Yuhvdld/5kd8M +S2fqcBFpzzBSj+huVayw6jFi5qLlISouhCVsc0rBqvnfuQTQwmfFIlfaHBTSjniv +5DdibZEtMqYYXl1VB4XUHTt5dOGHLEX2w/d5887DQVLUbaUKm1mfScb/vPjGgk6/ +re4= +-----END CERTIFICATE----- diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/client.crt b/tests/dcaegen2/prh-testcases/resources/simulator/certs/client.crt deleted file mode 100644 index 35123683..00000000 --- a/tests/dcaegen2/prh-testcases/resources/simulator/certs/client.crt +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC+DCCAeCgAwIBAgIJAKCcXOpDPyjQMA0GCSqGSIb3DQEBCwUAMBExDzANBgNV -BAMMBmNsaWVudDAeFw0xODEwMTgwNzU1NDlaFw0zODEwMTMwNzU1NDlaMBExDzAN -BgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/V -zZE2xloz06wO+Fj6GA26pzEFhTHpMOG20woWIkzL7N/TuTyPi24ZqzhyFvGmn71K -eDC14zYeZVTj+8OoJKRSPYcPiyGqMK46hkUNJ9LjVCLGBhqqgTGYd4YTn2FeTAiR -2/rduOD4N7AzYiJlZHcd1zls+QQOyQkFcuO4xKQiwjyC2djDx7W9qUsPZVha/9v9 -u7PcPZ7LnsAPdDSaL/bBz5aYFTX8IMo1nBIujpETCPyQoNc3h+lMilFhY4A1Nj0F -hkwF7GB9Xh7aLC2rEobVbn6s6biUq9+hg7OgTYZtQX7/SfD+6nioXSHMJNGYm7j9 -Z4Yf26BfQStd0cL9GwkCAwEAAaNTMFEwHQYDVR0OBBYEFK+hMFIwHNrVNqudmcQ+ -sLABdVMuMB8GA1UdIwQYMBaAFK+hMFIwHNrVNqudmcQ+sLABdVMuMA8GA1UdEwEB -/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAMzawFZ8j99zdWhavqBpTeulsisL -IthHkRT8sIBnAkimS5Bujjix8NHsaqUc/1d56KPerDWJ4tXx7Sd4+F7aNIpIkp+1 -lFxKLPU4Fnsbq/IEWAJOuVOWZ0Lug/8UcJbp0Ma/ac1t76uHBQ/mmiJUu/22FUrA -X0Udg3q/xAT2H0QLLK/s2jfR511rNOY5u9zcdKArmHoN13ZuVeZ6HMVO6U78rqZk -TTbdhO9BieARIhoPC+/G9eTV7uJyzi4n60HDpxA0j+ZsH5L6CdU5M3XATMCxpxm4 -xAnHVb0fcudNzIsqZlP0jrJdrNOKkX8qij1poKvvJ2Ap/vKtZZVPL76GHCk= ------END CERTIFICATE----- diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/client.key b/tests/dcaegen2/prh-testcases/resources/simulator/certs/client.key deleted file mode 100644 index 17eebd2a..00000000 --- a/tests/dcaegen2/prh-testcases/resources/simulator/certs/client.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAz9XNkTbGWjPTrA74WPoYDbqnMQWFMekw4bbTChYiTMvs39O5 -PI+LbhmrOHIW8aafvUp4MLXjNh5lVOP7w6gkpFI9hw+LIaowrjqGRQ0n0uNUIsYG -GqqBMZh3hhOfYV5MCJHb+t244Pg3sDNiImVkdx3XOWz5BA7JCQVy47jEpCLCPILZ -2MPHtb2pSw9lWFr/2/27s9w9nsuewA90NJov9sHPlpgVNfwgyjWcEi6OkRMI/JCg -1zeH6UyKUWFjgDU2PQWGTAXsYH1eHtosLasShtVufqzpuJSr36GDs6BNhm1Bfv9J -8P7qeKhdIcwk0ZibuP1nhh/boF9BK13Rwv0bCQIDAQABAoIBAA2Fs6JHFhC4XoVL -VA01+GqsQkSGP2xH585HvuNhHUox2m+Vru+px0CamvFJOwTt+mauebNxoh7bS2yC -iNbqEbg/QZGQCVVfZVtwo1vKx1SJRegdSjhh75XyfZRTooMLR5cnJlDkLCs2+yiT -r0bdofO+FUq/NFR3Qc08dYUreF/VZQzGT86vgpxTqFE1xdVX3mL5X/RFYED25s/n -nw+v8uRVcb21OGsEnHar4wV5VyyG6g0nZGk4uAfLGvvYKwcmMTtKulYtqnZ+0RNI -Iqu3siXOq6BcKly+TzKZ6kpqn+hsD9V9plQ45yPOswboToOnOBanZUxsEJ1mT5lO -wbpqYoECgYEA9IbxrWMri2b5kXz8o6O33RsG6qLrkaOU8M4PJOvxn7LaD9WLbsZZ -J6vv6eXAbHqF1ZfXv52sSZu9Bug3x8cv0ItOiOCPf5T6nTrdLjnCthivNUfLHVJ8 -nonzA2YJWaYe6u5sFtUSifQaHnrAMKqoX2D1qY7SD1QWWbSoK7cRxY0CgYEA2ZYl -T7OYKGKP8Ra2mLFpwY/84n+Rx/A3p0rzZ1cge9Xldo8pGbGduI+aII+XKPC4/lDx -dhS7rbOtIA08aF8htkunSErNUiDtZ+i386KYR3JsQuDruKbk51YYWpRhBPvs0mOT -7lBSeqbJZEJ2vDMU/oNJyUOW+0eL2Jjo28URdm0CgYEA2yucsPFDVVZ9+LZTZ4TV -xvtzjplqlYZOeCvpjQlh7+cJ5slbiXWE8bb9eeLxPwnurUzFFz2G8A8ENY2seYcC -R2Slhq/oTs1Ed+sL1mP1LuwfFp1745NMmXlB9NjfJphr+9ypyyk9zaKaSplxa+16 -rsqkRk753r1arxrq5QvYhP0CgYB8nJW/wI4qys++9hAbALgdh7X/janSxMtKvw0J -KQfMhCKHNNQICAXY9j0B2tpqMvrvgzHWO2eEwnsq+QmYiKsI+OjT6SsPlxX/xXLc -UEk/2dMQtjmppcNAjbki3wl1TkZB8498E3o5Dh4Wkk3n2KV0YYI3hsMII+B+aowp -mQI4PQKBgH8MZj1WDB05mgxC3jK6wNEM+0V08xL8sooYCEST11uZ1Pj7vZmRNjWn -/4pUrIOp1P9EnrS9RsWlVgRKUo6+yvPqdmenq5k7w7dSSowmAnW68rUV+HHuueXQ -9V98fkg3hAnI7ioV19bDaL6EtMvYLg+xSq2GmKvUqRcBRmlObW1L ------END RSA PRIVATE KEY----- diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer b/tests/dcaegen2/prh-testcases/resources/simulator/certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer new file mode 100644 index 00000000..756dd3a0 --- /dev/null +++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/dmaap_bc_topic_mgr_dmaap_bc.onap.org.cer @@ -0,0 +1,51 @@ +-----BEGIN CERTIFICATE----- +MIIELDCCAxSgAwIBAgIJAI5fEseaW2LbMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNV +BAYTAlVTMQ0wCwYDVQQKDARPTkFQMQ4wDAYDVQQLDAVPU0FBRjEZMBcGA1UEAwwQ +aW50ZXJtZWRpYXRlQ0FfMjAeFw0xODEwMjIxMjM4MTZaFw0xOTA0MjIxMjM4MTZa +MH8xETAPBgNVBAMMCGRtYWFwLWJjMQ8wDQYJKoZIhvcNAQkBFgAxLTArBgNVBAsM +JGRtYWFwLWJjLXRvcGljLW1nckBkbWFhcC1iYy5vbmFwLm9yZzEOMAwGA1UECwwF +T1NBQUYxDTALBgNVBAoMBE9OQVAxCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAs2mQSeSshK4ZrAwc8/QNHZiUVILlQwYyoviPfL27 +8mV1OXSYoTW+PzFU1Tv6HwKEFL3q9i9/y1m0DjhP4frHpNVVTo5KIeCv6fIsAYnp +/p50P3EOh3AJehtZm4AtxN6DeMlaBv11GYUUm6E60Q36Y6Wgklq8u1KDngYJy1/Q +Bl8aAiJbj2vpL64WSI3cyNz/qeI4/PxHsqBHUFI96GcLtLPLDSlIQWoWoZhkiQTH +rU4Sx5/nVdWihfc0R0+jG5IH+mDb8WUNmyHnaHinrt5Er1sypU/NxD+NlRPFO1K4 +Dx40sxfAlu2LFCllDgSS/Xcfse0ny/TrL2RWELoIOz9NjQIDAQABo4HiMIHfMAkG +A1UdEwQCMAAwDgYDVR0PAQH/BAQDAgXgMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMB +BggrBgEFBQcDAjBUBgNVHSMETTBLgBQEBI0AJDjGnHjXgFdBZ0kGgOZyR6EwpC4w +LDEOMAwGA1UECwwFT1NBQUYxDTALBgNVBAoMBE9OQVAxCzAJBgNVBAYTAlVTggEC +MB0GA1UdDgQWBBTvkTjHV87v4IBJ8N/PqkjjWGKICjArBgNVHREEJDAigghkbWFh +cC1iY4IWZG1hYXAtYmMgZG1hYXAtYmMub25hcDANBgkqhkiG9w0BAQsFAAOCAQEA +EJFyoeQtkjDf/yUyWReewxiOfDdmmrDOO4gbxt6hd3ilOflmC7QolR1NAzmCML3b +vmLS7a8zhwBsUU11wjasN8PI3qG7H36U7hP/NVwvql0YNGIcxvukPJJvDqW6V3MI +fOaCFs4uJexSYeaXRWdk0Rq8GY9gB2j1TUsl+we9zJeErKr2vY2LAJI0iYJ+v6YY +Ug14aPYu4m4ABUDhqfM+4z580h8GA+5ZkWNr5z9xfeJB520jAc6zx86obx9hep74 +OByfVqleMV0QfZeH9oLGYh2FnSSEG60GyWFIf9k76kh2LREVCbU+nOhFfVy9YD5Q ++2TXjh/wMcv3RxAHqSeW9A== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEVDCCAjygAwIBAgIBAjANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB +RjENMAsGA1UECgwET05BUDELMAkGA1UEBhMCVVMwHhcNMTgwOTI0MTE0MjE2WhcN +MjMwOTI0MTE0MjE2WjBHMQswCQYDVQQGEwJVUzENMAsGA1UECgwET05BUDEOMAwG +A1UECwwFT1NBQUYxGTAXBgNVBAMMEGludGVybWVkaWF0ZUNBXzIwggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjPFeAho7BtWjB4Enww/KXD0tTuoda/Fkc +o/yv2waNNsx+pOYGdJwNHYvNS7/RLBHc8kCN+TbKnYZ6AE97wD1Pzrc7AZ58qpjq +Ob7aTp4u3IAMWR5YOkDyjiibA5X7z9N/wveG/Ei2SgN2pY7O2lK5ucm6igarfxll +rZC1MA9zAXrfmd5bLJQQqACT6q15KQaCIwhqwoXp8w+s0rXcZ2/L303lFIUXoHUp +kzMsIPhJ/ZoEvAEkXIPgT2uFgOwIyWmr8Rg5jYzZhV7vey3bQUBlue9aiMIXih3d +b4AVD6J6eF/NmJygtUfHFrWeTAYLppA0d69BWUQZ+XQgCwjOMLaNAgMBAAGjZjBk +MB0GA1UdDgQWBBQEBI0AJDjGnHjXgFdBZ0kGgOZyRzAfBgNVHSMEGDAWgBTtc8Wb +I4DL8Bm6CVi8//GsTyq8NTASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQE +AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAt4VCLb2UHiZpDfSQbe62vlFzsGlODYKF +k7BhW9Q5jfIXpPhhtBLFwJFEKAWFLVWubz+YIa7I5wtniS6zEPC/5t3JOiEXMJQY +PfaPDSsovZ+eShu0QtrjjldFwL2MiqNsd2IWLSIRQUP63RZGBRTTxSsxB0VAfRyT +cu/8znpmZsHna3DspGZQputm7qsxgUhAcPCdo9RQtG6Ox6L1wTXUJmTPHdKQtZjr +qqSQ7kn8u3i5KQYYapmc3UO+CBbzoLPD5Rrlq+ROBbiNd9R/j5vVgRO7vsU9SHnm +AaKFEjDPTSjDtMOxu1BsTNmftaE2jcYa9/ZW67H8URCuo92NE0cZRxBqHkPUjH3/ +/S43/TBAfjfarF5WW7iMAEZfEGhrQu26JWXBMcZshStuHUEPl2b+RC5LZcBMYKgi +SqSOXzpiJeRNASpXKCQQZG8n03c/jBf1U20HaK/4Z2ikOql5B21suxhUbixG1EQN +DOrFGOFUqG4Eyw+xjUR5rTfDnpKgQfJo0/aohZs9p5x+UwitkrQkJQ1ZmEzeVDjm +7xsmOcAJS2T9DLle6fDWvyh76InymAPxzk1/2AWOp8uw8iwNfFxE+p+M7h0psZxp +SnvlgASASdWlZLcMQtNiiKzMK75FW9SMctQfA/RfohNEwivpp6tNpgJozoKmhoPK +zs5HS/mx8GI= +-----END CERTIFICATE----- diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/keystore.password b/tests/dcaegen2/prh-testcases/resources/simulator/certs/keystore.password new file mode 100644 index 00000000..39823872 --- /dev/null +++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/keystore.password @@ -0,0 +1 @@ +mYHC98!qX}7h?W}jRv}MIXTJ \ No newline at end of file diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.aai.key b/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.aai.key new file mode 100644 index 00000000..b9a22cf3 --- /dev/null +++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.aai.key @@ -0,0 +1,29 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCCnz1BBkcDy1M7 +3ANgkbfwYANSJPdnU/meXpgHKYvXa8xbEI3Lsi5EnB7o9nthZFdU5dPZRFV5uJEO +l0pjt3ogmPo0XZGYO++GfRNLq+c2YVmYjTLgFvEz6GzUtLueYjrl2JItGRugx0wN +PXQmaAX3/8wD7nOTAZjlmuSWCeeJu5GBaX4aaiwVOONDGhmZZ7jISTE0xvvU936E +CnUhSZtt/qRvnA1EJB/Hhs5Se4VPx6lTXYf8PXquI0IgDV49hlLhbPMKadQ8lo2y +itiaSMJHsLZ1Wt6ob9oNFlBcceq3tfXPMVVylssuAI1pc3HsbmV7kMIwg0P1fyVo +IALHlXgDAgMBAAECggEATFkLEpC6vWsAsYI9rxo9KxDToBXfTdP1mS2tKrKL/FQT +1D5uwtrY1F10a7J2F0zxBrx3AQ1B8K2Ci8a+Ql6h0Z/YzvbJ/PM7Y56Dwr0tncl0 +9wfA7t46CZ8WzZT9/OtphaL6fcWpMmaK+0oqM7ClnHk1JC8h+pD6b2oDpfcQEJ5r +hxFxdOotKgMzANMqTydteecfefy9l0hzgFiymxLZAo7ktW3HFpXO5HOgh1vkm5Pu +FedGRwiI/RBqad2T59J/XcRH0f5Ky7sgpyCShwqIp23xpdum10N0/MTzY5iu/gvR +pXGaPeYUrSPoLwuoMGAUm9wFbDqskI/mQzw6/rnfsQKBgQDU2O7ogZ/BjDVtjpfL +NntXhLOq02U+dB16ZXSalMbsG//FILVLL/Ths2wutKk/9IIiC1qI4NhDc0smDkgJ +l+oTZTnhVxZhWvOYovz7T3L3mp9VBIA0lW62dTDLK9gT6IRoQGN1fzzXF7ZfgOME +irDQqBSfMqt5YCeQOKNe29eo5QKBgQCdGrLaGHBeWBdhvG8XcybJDk2Q9XnojO69 +2UtfJ64+hzTc2MFvyBlWymZt3/Qq3llP/K9WUYW/ohL9l8rTXHEfBGpQVPzU2roQ +iicbx/zc2qfO79YaE10D/paekX2vrpoJlhtp0yMU/HMEYxrucbYQJEdKx9frcTXo +fQ9l5V+WxwKBgQDKEkYGsQGFk+IpZ+XOhKPmu9KDDH0jJMPTrrxcAYE1KYPSl7Hm +dtoK6Pd9BAFm+XAOeC70olpO9wdSUt6rVPFihojD2ZUiymFX+O0qfgwM7Fv2L/az +dWcNjAbN7IsQo4AJJZAHPcv5/MYkt01Pw4gIIHqrhURsUBBfiJX5ecetzQKBgC9I +NcPFzyvVv1O+7oBUO7wO/fE+r+35XHDu0OxWeO6Aqrw80BrgUh/40lMHL+km+iJE +nlCQQHyoPqbr5DMwgysenRCIQ3+cRJttuM93pPajKBXzwLAgW8I0AQjAKN+S4PE5 +qA51aP2L7OHJIfXZaz34bSxocOd/LwZFfTjhi59JAoGAVc3HAzQOkrCs1GPXvuOx +YwJUyuwLtCzcb05q+ys/5b/02RxTl4QPfOPqj47y8SDUUC7Cbr6ktqAkfsBOyPPj +tSniVhPKa4XdP0Brsil934sd3shvwrpEb9Xs6ialTid+PKaU/rFn1DYWZUP8lNMK +tq0nYLX/Z6N7LHiz32G9Kjs= +-----END PRIVATE KEY----- + diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dcae.jks b/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dcae.jks new file mode 100644 index 0000000000000000000000000000000000000000..e74ce64f4b680b9f7b226086ff7632ad594a7174 GIT binary patch literal 4512 zcmb`JcT|(f8piXbQ6oqwB1M!UC}F=)MWspaC?HMg2?>ORE{I|bg33~qvVwF7h|(2M z5Gk^t2!cvcY2vydWx;?-lX8RH-Ghqvo_o&y<4fj!X685byw9votxiE85GeBlzJ5IJ zZZ0^@^&dG3*~LeW;^)Dv!bjeXScE_j07!$cfZLGl`;h<~*azJX00;=21|L_t_`qVp zF)iQ!rfR-6Vh5CR(YcaWapx;pi9Z;&XZ6g{qR%us7uIYpoCJ)ca_DQf1y@1}D-zzR zvKU2%2D>_#Fr2S~o@r)veDO||BZu<1anFD8jY^pT-Z-3NWQ>I!5|CiCOY_cgm_k!a zTrH{>r_9P$e=|QzcjwWF%`_?8{qg`y1TOiaXWm4)*!ke@xMpXO-3PA*pXt8Cp)8E% zzuFupiKi!z;Xhu-EedK#NBS$M2&;@J3|!)>nqcAnBBhv_WWLa^Z9v^=Z)w;R#p3;0 zDlv8Zd_n~M8Gdph?-1F8H%crm{ZT|UnRAFK$;ld0}iXw=UB ztx@G8q6L+c(k+1hEFR6^E+3rXW8Xd_;Z<|tRbs%rc#qz^FWS_v?0GY`uXss%xcglz zB~AHNlMM`LR)eNr)a{fs)(k5bd&!bn`~LUE(jJ(9^ZEVD5=x?H7Zzemr6xsRiTN+t zv=Lfi^kzLaUD+?gVc~%#ekt5KE^p~pd~?>sPq8akGLla6yS@URiTiUO--c;l8tISm zZ^icJCS08kMH1tH zhdJ2EUNk(}rMa3gsa4-;rT3n;p!{4gx?YuL&xQEY3dfC3QrvUe71w8FK}6iMz7sr4 z+Pb+f8c2)`#WtZ7XCV&{OG-U)mNZ3M%1gie_~!NdlGpae$W&WRAMjl`@2*WtR?M0g zwcq=CN_)1`fV2XRYMdW(CL9o-5HWw*vid|IL9ipR@U2eCU;)_HNFDpEHv07+${P z_>A!c>2q$osu7mmXB6P@+u@bftS3=BO|qN_iw$)LNH7#js(XKe;jp#Ttr^`%lZ-yF zmpjJOuB-qp?>pJB`fR#FJ-x<43&SXS&&v^Yr489AydW7s$*kFkpuhc|^URm8TNpIYrWo1!dhnzHP}!e4#u(3rs*3=&wz zDv!ay0xNhI3iaeZ-Ey+vF&>^37MKseP*K)l7tA*AXz(CizNbq#H^lc!wT#MjBN21w zhDLw}*=BmxvVWd$<*`=VIK6k`k!LQ+>{wXL?Du>0RRUA0_tNqKsF@I8jeImtu3)AkYhby=Y*S^X<1;mft>3h2PeYZQcFt@ zD+mg#$1qNAA~^u(=Z$kGx&+{~wVdQZQ2`Y802W;T%1)YL>=rx!GC z^FFq^J+?gRA@71BeQckR<3NpIN!HUpUT5`5H`TV6d1+6bA!ihft7mQ#Q!!hPQrfxb z6!Kz;tlgy8qje*_5F#01TO<7}(B`?}m~vokiO+BMCVP)+%(WRAY1(r=>_{8#vF^8$ z=O30ykF>~fpGR;9RD5E$?DHB#wYIRJ7ix)BBJBl#26Hrwog4u2#f4jJt8Y>z8ELx@yGcE5#4ZN zTgzYH5&x-9&OgXa&W#l4&%Ek#B#N60No@V*V%$iSKzAZO1mo>OcJaXZZLMzLx9qU- zg82#E-6g;UPb4vip^!*8w*bn&`9JELM)*nP&sIPP!UW;`zaQaybrXNfs-Mw){0JLc z!YpiJ{2l$QTY#GjhPk1nkN~2a{|4Y2X%p&4{b$fEmidje3HqbH6%^+~qJ((k$N?CF z3)!8te)>O1|Aua@ZviDxNZ!ojz>z(OWE{rZ!#hCiM`;846aD8w2o~S`p0Zs^a7=Iez$ehsj>Uo9xSXJ7ke8_>s-$_47 z=nO?Z7^6B5PHcaFtk7ws2z~O4^GDvyxX+H;T=3T+H;TztnicLI(-hkEG zpjvw31c+3-Cmnynt3~%3-q&sCDT7g)UBBYdLwowU%yZ7D3q7vouNm?kt0{*3?fGz9 zW;(Y5Y0$$Pp3lsq-+BH2l!rGA9aNQ9#9|fYvFnB|udpfn|Ggakn_cG~wxLGGHdYcE zhYcA`v)8zcEo&~?FWU*{E|>NrW0c#&=%dJhG?d7%PmSxJ%WfZ-)r?tGev%$}8e$&W zpl052_YjbA=2r5AYF(dMhTH&^(@xa(pyq6>bSf)6522WTElphY2m4D81)@X- zDO5hLoYTQhPm|NKD)k@nS7w+XIr6V4o+{O{(-B+@5aVF&0IOm)>>3ZcZ}P>hycXQG zVa7W^ek$*je{-rhwT&TI!)9B%HdAE2uT}}mp027p>R(1QL(w7<%3K_}Rbyra=nF0tJk1SPb)*py80!*>M)K~G z$L~2jF3a8FX4H=kwjSIq04DBGn~Ov3mwu3$VI)*>r0-p7@4bBfqT?;{C-KvT*z*ROK8*C-Zi@7=zXq)aUjT z)$WcyyS5^yvI1&`sq_^&9(TAG4bgMrCU_m0s*%JsVp~WN`^h3&T-WfcI&#Li1{3Fk zJx26cr-QDNf0_dOY@{W)-6?y!PH997e75vvA(Sq75a!m}-F3%>zW;#sIy+Xv^Xe*nQMV&dJvy>S3--w=2d(pP|M-nU(|jnQgO(o|{-mQr-*~Z{;Y!IJnmS{4 T=H#ViMFn!SC%a)<6wki^WqwD} literal 0 HcmV?d00001 diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dcae.trust.jks b/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dcae.trust.jks new file mode 100644 index 0000000000000000000000000000000000000000..10103cfbcd527d081f04dacd1a06f6ddffb72d3c GIT binary patch literal 1413 zcmezO_TO6u1_mY|W(3n*$%*kf`N@en@diMlw6^W7zZqB~^h^yb85mfd44PQ&44RnL z7BDk0GBI&7oX9Nt_VNGu0|vZooLX%jZQpqr8M#>*40H_n40za>Ls__aSp9N(=GOS+72357DP=i!-K^Rqq5M%?u9>qeiv#iByTy93PJszM^)N*e!?*^)eC zkHcz4-|s8l9sZr-*0gWdirF`o*=!7%-^ElQjWcmQH42s#kjuQys~2bwzvlqMD>m&<(e6%8dxVb@t^0I zfB4XO>p#wJ$sfvowC|4(l{ohK@0qy_o!8gdeffU<)ce@}nN@L~LVIs~RXV;QQ`zXt zbs1^73v2v7xqN1P5$P}|`SFEiCu2%ap3+`yQ_>{v@K1JU?RrsbQ2}WtW=00a#mNSV z2C~2;D9gtp#v<~z_~>lqhSMJ;cX3AS`Tuc^zt$d819_0NGK++PSOazi{2&FwjEw(T zSPhtglmQ<|fFC5l0?Z(7$jK0xD}c$6ks-QC;&kwpwecThcX~*K99%r-w}9;TbrbJ1 z%(>0yrFpBaz$$X#`%@{E!qHcay9yOg+Vk?1`G~T7GCh=k$!g*iyQIm{k?X9Ngv^P! z`TERWKGmq#2GjluxK`xe|Kzjb7+1euW~uLvC2o%ygT3ciuD=~Szs5epN6+J$AA5sK z%3=q#-_Ba|#0|I1_}Q?tZnKeH;i2h8HnPTCEpD;v4=N_=Ct0Xu3fl?4&v4DIe<66` z(HqmNat|2e?0vO&uWXL@Iho43=;WpTud7{HuP@&*GuGwdtHZTPOV@o>ZBT3HmKV75 z>Gz_~7JXKiO*o#%d+j`Sb+)+YQZ=EJKiAIl?t93zA^*{@+PEg+lcHPq9=rFw!VGw`$B(MnXF=3yf{~5{RZ{D z#hq%;SNY$1e&9bB|2g@YkC&=!f2l347;s>DfWwYTyLmTuN#C7%|L4T}Jl^TA3IsFH z8wB;g$O~Pw;gw<1vqeu8we(t4bBetVuKIa@C(DIH=|`2qZ^?*U>Z@4)#5^f?qOQ?0 ziMZHM_SP%1)|Dj>+jU&O9sXYV`P^a0pewmcxn@Vs_dNE0&yQnGe*4$H+p}t|)H;>Z S3!ZDgSsuSksc^Oa0tNs)*<1kt literal 0 HcmV?d00001 diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dmaap-bc.key b/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dmaap-bc.key new file mode 100644 index 00000000..880a33bf --- /dev/null +++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/org.onap.dmaap-bc.key @@ -0,0 +1,29 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCzaZBJ5KyErhms +DBzz9A0dmJRUguVDBjKi+I98vbvyZXU5dJihNb4/MVTVO/ofAoQUver2L3/LWbQO +OE/h+sek1VVOjkoh4K/p8iwBien+nnQ/cQ6HcAl6G1mbgC3E3oN4yVoG/XUZhRSb +oTrRDfpjpaCSWry7UoOeBgnLX9AGXxoCIluPa+kvrhZIjdzI3P+p4jj8/EeyoEdQ +Uj3oZwu0s8sNKUhBahahmGSJBMetThLHn+dV1aKF9zRHT6Mbkgf6YNvxZQ2bIedo +eKeu3kSvWzKlT83EP42VE8U7UrgPHjSzF8CW7YsUKWUOBJL9dx+x7SfL9OsvZFYQ +ugg7P02NAgMBAAECggEAfPetwlqe9DgUt6skS6SVsiTCRO9746iggrXhtECwdlHH +SkL1wWye3INvFKwXN5xYBd6Xl+1T9X/BFBqTQdOdViompnYkGt7XiXvevR+kNm+G +h14ngZ0/bKc6Tj8FIljfeLW/mJjZBPKWfSTbxBwZaWlHpEnBpjT+aobIMbnGO3i8 +iuPEIlSTmI/MmIvwyXkJ8r41phIZpdhtyKACx5LSvSArwPTYzVLyaGBJ63T4Qcat +GY/Oa1nAJkbFT46sP06O+sm1UIVUGbjewzPaDnfdFyJWmae0nGn1xU8VZUPI7rfu +YCf7le2grgtKy16jQo0o69RGYc4ebP27DKGd8YJHHQKBgQDts/7x6sG3fqPvbv9D +M5LDraslrj+noHGVcvCfigcgngvnMGcB/R8IT6YPmNRfATHV/UTLuW++PuqXsR21 +/WwJVbxudZ3alX7sz6CTGvcCQvnvPQm2e/iVW/JFrQu/poPxL1k3talDdKFWTRql +ZvQE05YjdTutlN2hGvqjSTZ1AwKBgQDBOO7GmG4FRQ4jXvUULXKMRUw+UzUy9NAV +io1b3CiwWynsdW2OPp6Jy6GB6+e7Di2M0i35hkpQd5NoeDnVqkm9ERYLnHr9FAs0 +5cKT7DDRC9ddJesJrqdhqGfhZCHMoqEiDRf3kNMBfFMV1TCefdQ0kIFYUuhHgboJ +aK+GqmtGLwKBgEEqmpdaA7e5mVn39TVIO1E4GHahGcRr4RfWxg8G+UNA8QR1qZfK +/Cn8JAucm4RcQHxpDeZINVFT0F676OhOzMKWZa1mw1r8pypnFZ+ewd81221yL2p+ +/Dx+U6I0eccV8JA7qdrzC695lw2g39A+tGFqXHvmFPFWoZgcXGBNnwdfAoGBAJ8y +9mEAhF2pKN3xxgGq9F8oVYpgakuis7Ob5Z5TBd9QLXmawvpZE6y670YphVN0egk1 +vxWBFMe5zeVccWJfHMQ/SKemdRsBob4itC/Gge4rUHV54W6nzVdENtrY8pQ1RofU +u/OJCqGFursZXSaoy+fHTBrmrGUGOK655y0QSrSXAoGBANbSu8DfjJwDHcWTstcn +XJ/bHB6aZmKe4ibOSFBMsOuy0AP1vRxQTgvQhgeRWm5ngv7YhPes2UHqRktadfGz +VUzx9/ILpL5skhIFEzgEP32cO1tQNE1vxODs3zg+U/Wy9gxJt0dLCB/sPQJcGLri +mkzev7AyLLr137K+ssxhczqg +-----END PRIVATE KEY----- + diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/server.crt b/tests/dcaegen2/prh-testcases/resources/simulator/certs/server.crt deleted file mode 100644 index e154aee0..00000000 --- a/tests/dcaegen2/prh-testcases/resources/simulator/certs/server.crt +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC/jCCAeagAwIBAgIJALu8otyWP3z1MA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV -BAMMCWxvY2FsaG9zdDAeFw0xODEwMTgwNzU1MzNaFw0zODEwMTMwNzU1MzNaMBQx -EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAMILA9ZYh8vo1ui3mNYtF185/qauRgJ5EP1ROqD445hX5T014BrlWzpsRD6B -/uGCxSwNnIE+tGChk4zQBnOSC2Pah2QjMGWUPjgWXgnL4vp1Mb4rKrVNQsaqMi7I -8aCdbO66rZirK04RD2hp09Vy7KGsK6TKjAnQn6UJJD2agHZtcMfQ5Kf/B0yZvlb6 -T3Yet+gefXH/iCZ+bzz4P1Ij6zetetw5S++SzsgxWJECfkk3ISkqu9DBLjfzacKz -ixq+twq5f+kzg3zhUBtpJ4BvC9HKiJ5ZTi/NjapmgJG1WEyhI4cVcpVwoBylJwpV -TyuVaSjVOoqprnvYre6ch9vz2JUCAwEAAaNTMFEwHQYDVR0OBBYEFGG+MZfFt5OH -Kxr4GyBu7mYArZ5aMB8GA1UdIwQYMBaAFGG+MZfFt5OHKxr4GyBu7mYArZ5aMA8G -A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBACoxYrR17mEPOhOxxyRp -ulAxTIbkhiskAI1YF4XRK3FtuWhiuivSyTWmNYfbuhl01U75tyQjd9TCKYKZsaM7 -MaaYWFaSlynFx9SZdKWMPv84re7xdUIzhH9dH+YsGij/ocdedfg/kyhdto88zB5C -+BGEopkOnXEZGZnuhgWVlwT9Aw4MCt9P/+3baJMU0MOSjLX+CnJZ7TsXpnupH3ej -kTPJaooiVig7V84e2jmLx4iuxDgtDSnxYN9fZeDW0SJq+7b7VlyJ9QIpQYt3kUIn -FMAtnxv6FEeMi6k5hUXmRg/XKt/K0WQ2dopwq9XQKMiyHlA4rIJ1Ar3jX3trDyCh -qBU= ------END CERTIFICATE----- diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/server.key b/tests/dcaegen2/prh-testcases/resources/simulator/certs/server.key deleted file mode 100644 index e86fdc42..00000000 --- a/tests/dcaegen2/prh-testcases/resources/simulator/certs/server.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEAwgsD1liHy+jW6LeY1i0XXzn+pq5GAnkQ/VE6oPjjmFflPTXg -GuVbOmxEPoH+4YLFLA2cgT60YKGTjNAGc5ILY9qHZCMwZZQ+OBZeCcvi+nUxvisq -tU1CxqoyLsjxoJ1s7rqtmKsrThEPaGnT1XLsoawrpMqMCdCfpQkkPZqAdm1wx9Dk -p/8HTJm+VvpPdh636B59cf+IJn5vPPg/UiPrN6163DlL75LOyDFYkQJ+STchKSq7 -0MEuN/NpwrOLGr63Crl/6TODfOFQG2kngG8L0cqInllOL82NqmaAkbVYTKEjhxVy -lXCgHKUnClVPK5VpKNU6iqmue9it7pyH2/PYlQIDAQABAoIBAAlOS+3QqxqNXRkm -DO9glDld56eIvhTKR5VOevhTV17sADNyTQAdNcXUgWVaCKY6Bki5kmLkZfQoa5Ia -O+T5ARDV3x5fTafhdyZrdDEWFRmb2znaih7NyMEMUoHJ40SnqBy+2Sp0Mwx4ZvvD -74PSEiUiw6kQiazC05UvngxSR4zmV1pimJAKmKxQynWAeAAFZNl7CDG+aeoaI483 -ipaPaxNc/2i1bi+dva9Hsc1q5C4+hQZIbCdHpbZfZj5bA36vyBo/NcRcicomfuVh -IBFRM8J7jaet68KWqNE3db+ji3xwHwJoypwF/yKtmFueWByv/HrZnaHS2gnKQQ4K -lYbW24ECgYEA5UiqxCeZGiWW+QU3X99hUkE3FlRRp6CWlw58ffn2Ztc5uZsXf0is -EsNHT47jIKFUqkHxBHCX4vSuAcphT/FGeXo6QkRhcSfrlQrifFGfTMbNGbrGnOZU -FVjknQUig3GLfm99Ed4jpyf7ps+iqIXQXlt2F2FRWygnqOVmK2AA2KECgYEA2Kcl -PDlxBuXk0LLbVIxIMymkZS3re1Gw+WJw21GpRUUpAGcZ6EKPUC0zlB4A75rLoucb -i0DmgUNX7T5ZFczrRCjduP7MhUjM64m5Ib0/Pwci46umnLhLf6i3+Z0/QLK3iGDV -8/6FUtKOX/UU5xKUe96MysBlnPzXUG92arQed3UCgYBHB+cXU6kjp4eI5+vKwLo2 -sEtvmHmfc6mTbIJ2yIxkOcMBVCHIZewg9+xMoliM0E4ZXMpc9MCpJ+IMXfUdvgJ2 -Ob54rxR86MAb8T5PAz5Vm7UIhotnKhfccSiJ2IBjtjZf2gwmD+p9q25TtDmQ+bue -r7j670Qz+FGpCkBHqbs5YQKBgEj9Lqc2duSrCMZiq0+1nxFVgyPvL3kxUV0DFCBf -R5alsSWIlorP+bY6NDk/TnNqhBZSo83rRHzh8jpkGeElU1F4LxKHDOIOX7Muh+dc -+XTDc7ad+pir4guVDL4Ugt3KF9jjPtFfuwznEL41NCCQ+uMsW+RmoxUbfXKEyrEy -E12NAoGAGBeR3ghlmhyasnbe7TyJbCAPU/Yut1NI4Rgb4sZcN8gwI5/wkRk0QryQ -eo9th+0e98Y8Rxa0t9k0dkmGOM9WwVdBHZCyzgs6ihLzgy7nZAGi86+pe4BiqDmb -NyfiL8LW+EADax5koWLQpPqrVQ66Gy2BAx4/ODBNzr3ox64jQpE= ------END RSA PRIVATE KEY----- diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/certs/truststore.password b/tests/dcaegen2/prh-testcases/resources/simulator/certs/truststore.password new file mode 100644 index 00000000..168e64bd --- /dev/null +++ b/tests/dcaegen2/prh-testcases/resources/simulator/certs/truststore.password @@ -0,0 +1 @@ +*TQH?Lnszprs4LmlAj38yds( \ No newline at end of file diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/httpServerLib.py b/tests/dcaegen2/prh-testcases/resources/simulator/httpServerLib.py index dcfdb7ca..7b54539a 100644 --- a/tests/dcaegen2/prh-testcases/resources/simulator/httpServerLib.py +++ b/tests/dcaegen2/prh-testcases/resources/simulator/httpServerLib.py @@ -13,8 +13,7 @@ def start_http_endpoint(port, handler_class): _thread.start_new_thread(init_http_endpoints, (port, handler_class)) -def start_https_endpoint(port, handler_class, keyfile="certs/server.key", - certfile="certs/server.crt", ca_certs="certs/client.crt"): +def start_https_endpoint(port, handler_class, keyfile, certfile, ca_certs): _thread.start_new_thread(init_https_endpoints, (port, handler_class, keyfile, certfile, ca_certs)) -- 2.16.6 From 30f028b6772c73290b0b2759a8190709b6c0509a Mon Sep 17 00:00:00 2001 From: Conor Ward Date: Tue, 20 Nov 2018 08:44:31 +0000 Subject: [PATCH 08/16] Update to pull casablanca branch Change-Id: Iddc68fa1499c66b6b13b48d1dfd1a045c5480859 Signed-off-by: Conor Ward Issue-ID: DMAAP-886 --- plans/dmaap-datarouter/dr-suite/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/dmaap-datarouter/dr-suite/setup.sh b/plans/dmaap-datarouter/dr-suite/setup.sh index dedf15b0..15e0daeb 100755 --- a/plans/dmaap-datarouter/dr-suite/setup.sh +++ b/plans/dmaap-datarouter/dr-suite/setup.sh @@ -6,7 +6,7 @@ source ${SCRIPTS}/common_functions.sh mkdir -p $WORKSPACE/archives/dmaapdr cd $WORKSPACE/archives/dmaapdr -git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master +git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b casablanca cd datarouter git pull cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources -- 2.16.6 From 253eb4c2e4154d89941821e468b29433566ae7d8 Mon Sep 17 00:00:00 2001 From: Filip Krzywka Date: Tue, 20 Nov 2018 13:52:27 +0100 Subject: [PATCH 09/16] Use real example of vesEventListenerVersion This change follows related changes in DCAEGEN2-976. As vesEventListenerVersion is now being validated against regex, we need to have correct version send from xNF simulators. Change-Id: Ie699d17420b2153d89d7fa1fa02e96fbcedbf209 Issue-ID: DCAEGEN2-976 Signed-off-by: Filip Krzywka --- .../scenarios/authorization/xnf-valid-messages-request.json | 2 +- .../scenarios/fixed-payload/dcae-fixed-payload-request.json | 2 +- .../scenarios/fixed-payload/xnf-fixed-payload-request.json | 2 +- .../scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json | 2 +- .../scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json | 6 +++--- .../invalid-wire-frame/dcae-invalid-wire-frame-request.json | 2 +- .../invalid-wire-frame/xnf-invalid-wire-frame-request.json | 6 +++--- .../multiple-simulators-payload/dcae-smaller-valid-request.json | 2 +- .../xnf-simulator-smaller-valid-request.json | 2 +- .../scenarios/too-big-payload/xnf-too-big-payload-request.json | 6 +++--- .../unsupported-domain/dcae-unsupported-domain-request.json | 2 +- .../unsupported-domain/xnf-unsupported-domain-request.json | 6 +++--- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json index 25e7272c..947407e2 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json @@ -16,7 +16,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 5000 diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json index 92b0deca..3c2c0b48 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json @@ -16,7 +16,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "FIXED_PAYLOAD", "messagesAmount": 25000 diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json index 92b0deca..3c2c0b48 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json @@ -16,7 +16,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "FIXED_PAYLOAD", "messagesAmount": 25000 diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json index 3b57160f..66d3655a 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json @@ -16,7 +16,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 50000 diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json index 612bfedf..0b8556cf 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json @@ -16,7 +16,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 25000 @@ -38,7 +38,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "INVALID_GPB_DATA", "messagesAmount": 100 @@ -60,7 +60,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 25000 diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json index 3b57160f..66d3655a 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json @@ -16,7 +16,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 50000 diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json index 6d63acc8..766c8fba 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json @@ -16,7 +16,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 25000 @@ -38,7 +38,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "INVALID_WIRE_FRAME", "messagesAmount": 100 @@ -60,7 +60,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 25000 diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json index dc160e51..f35bd04b 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json @@ -16,7 +16,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "FIXED_PAYLOAD", "messagesAmount": 15000 diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json index 49d9bd93..4773b467 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json @@ -16,7 +16,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "FIXED_PAYLOAD", "messagesAmount": 5000 diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json index 4296d485..0f60a01d 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json @@ -16,7 +16,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 25000 @@ -38,7 +38,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "TOO_BIG_PAYLOAD", "messagesAmount": 100 @@ -60,7 +60,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 25000 diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json index 3b57160f..66d3655a 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json @@ -16,7 +16,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 50000 diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json index 43e90874..7301863c 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json @@ -16,7 +16,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 25000 @@ -38,7 +38,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 100 @@ -60,7 +60,7 @@ "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", "sourceName": "sample-source-name", - "vesEventListenerVersion": "another-version" + "vesEventListenerVersion": "7.2.0" }, "messageType": "VALID", "messagesAmount": 25000 -- 2.16.6 From 1a38d516d798ad009263b6f4fab461362c558841 Mon Sep 17 00:00:00 2001 From: Filip Krzywka Date: Wed, 21 Nov 2018 08:41:23 +0100 Subject: [PATCH 10/16] Use casablanca latest image This follows up changes to image tagging made in hv-ves repository and allows CI pipeline to use latest maintenance images for testing. Change-Id: Icc2d37b5b5de08e6f16efcfd9a149b9c6e942c4c Issue-ID: DCAEGEN2-983 Signed-off-by: Filip Krzywka --- plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml | 6 +++--- .../testcases/libraries/XnfSimulatorLibrary.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml index 2a928217..966e7dbe 100644 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml @@ -42,7 +42,7 @@ services: command: ["-server", "-bootstrap"] ves-hv-collector: - image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest + image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.0-SNAPSHOT ports: - "6060:6060" - "6061:6061/tcp" @@ -64,7 +64,7 @@ services: - ves-hv-default unencrypted-ves-hv-collector: - image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest + image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.0-SNAPSHOT ports: - "7060:6060" - "7061:6061/tcp" @@ -83,7 +83,7 @@ services: - ves-hv-default dcae-app-simulator: - image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator:latest + image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator:1.0-SNAPSHOT ports: - "6063:6063/tcp" command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "ves_hvRanMeas"] diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py index f091de1b..568fb451 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py +++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py @@ -6,7 +6,7 @@ from time import sleep XNF_SIMULATOR_NAME = "xNF Simulator" SIMULATOR_IMAGE_NAME = "onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator" -SIMULATOR_IMAGE_FULL_NAME = os.getenv("DOCKER_REGISTRY_PREFIX") + SIMULATOR_IMAGE_NAME + ":latest" +SIMULATOR_IMAGE_FULL_NAME = os.getenv("DOCKER_REGISTRY_PREFIX") + SIMULATOR_IMAGE_NAME + ":1.0-SNAPSHOT" WORKSPACE_ENV = os.getenv("WORKSPACE") certificates_dir_path = WORKSPACE_ENV + "/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/" collector_certs_lookup_dir = "/etc/ves-hv/" -- 2.16.6 From 7e66fd6105aa091add3536dd1158584a28d1676c Mon Sep 17 00:00:00 2001 From: LiamBurke Date: Thu, 13 Dec 2018 17:29:14 +0000 Subject: [PATCH 11/16] Updates to use specific casablanca docker versions Change-Id: I461ba1a7c41ceed7952c16898bea860b26fd957b Issue-ID: INT-649 Signed-off-by: LiamBurke --- plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml | 4 ++-- plans/usecases/5G-bulkpm/setup.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml index c5567d81..a206e6f4 100644 --- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml +++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml @@ -70,12 +70,12 @@ services: dfc: container_name: dfc - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.0.5 ports: - "8433:8433" ves: container_name: vescollector - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.3.1 environment: DMAAPHOST: diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index 64ffac17..0a2b028b 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -5,7 +5,7 @@ source ${SCRIPTS}/common_functions.sh # Clone DMaaP Message Router repo mkdir -p $WORKSPACE/archives/dmaapmr cd $WORKSPACE/archives/dmaapmr -git clone --depth 1 http://gerrit.onap.org/r/dmaap/messagerouter/messageservice -b master +git clone --depth 1 http://gerrit.onap.org/r/dmaap/messagerouter/messageservice -b casablanca sed -i 's/enableCadi: false/enableCadi: "false"/g' /$WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose/docker-compose.yml cd $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose cp $WORKSPACE/archives/dmaapmr/messageservice/bundleconfig-local/etc/appprops/MsgRtrApi.properties /var/tmp/ @@ -53,7 +53,7 @@ sleep 5 # Clone DMaaP Data Router repo mkdir -p $WORKSPACE/archives/dmaapdr cd $WORKSPACE/archives/dmaapdr -git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master +git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b casablanca cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources mkdir docker-compose cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose -- 2.16.6 From 7d9c302a15a8b8e5c3357422ddbb503a212641de Mon Sep 17 00:00:00 2001 From: jh7358 Date: Wed, 12 Dec 2018 17:10:03 -0500 Subject: [PATCH 12/16] Restart docker if mariadb fails to start Also modified script to use a different mechanism to get the host IP (copied from CSIT setup.sh), one that should work in developer VMs as well as in the Jenkins environment. Change-Id: Ide454ff827ebd90f55b699f16e5f7f6eb40bd1d1 Issue-ID: POLICY-885 Signed-off-by: Jim Hahn (cherry picked from commit 582f11f6dc7b7237f18798ee646d762b29eb0f35) --- scripts/policy/script1.sh | 64 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 15 deletions(-) diff --git a/scripts/policy/script1.sh b/scripts/policy/script1.sh index 70706921..c47c4bf8 100755 --- a/scripts/policy/script1.sh +++ b/scripts/policy/script1.sh @@ -46,23 +46,15 @@ cd .. ifconfig -if ! ifconfig eth0; then - if ! ifconfig ens3; then - echo "Could not determine IP address" - exit 1 - fi - export IP=`ifconfig ens3 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'` -else - export IP=`ifconfig eth0 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'` +export IP=`ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}'` +if [ -z "$IP" ]; then + echo "Could not determine IP address" + exit 1 fi echo $IP if ! ifconfig docker0; then - if ! ifconfig ens3; then - echo "Could not determine IP address" - exit 1 - fi - export DOCKER_IP_IP=`ifconfig ens3 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'` + export DOCKER_IP="$IP" else export DOCKER_IP=`ifconfig docker0 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'` fi @@ -121,7 +113,49 @@ echo ${NEXUS_IP} MARIADB_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' mariadb` echo ${MARIADB_IP} -sleep 5m +sleep 3m + +docker logs mariadb 2>&1 | grep -q "mysqld: ready for connections" +if [ $? -eq 0 ]; then + # mariadb is ok - sleep a little longer for others + sleep 2m + +else + echo mariadb is not ready + echo Restarting... + + docker kill drools pdp pap brmsgw nexus mariadb + docker rm -f drools pdp pap brmsgw nexus mariadb + + docker-compose -f docker-compose-integration.yml up -d + + if [ ! $? -eq 0 ]; then + echo "Docker compose failed" + exit 1 + fi + + docker ps + + POLICY_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' drools` + echo ${POLICY_IP} + + PDP_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' pdp` + echo ${PDP_IP} + + PAP_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' pap` + echo ${PAP_IP} + + BRMS_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' brmsgw` + echo ${BRMS_IP} + + NEXUS_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' nexus` + echo ${NEXUS_IP} + + MARIADB_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' mariadb` + echo ${MARIADB_IP} + + sleep 5m +fi netstat -tnl @@ -160,7 +194,7 @@ INTERVAL=20 TIME=0 while [ "$TIME" -lt "$TIME_OUT" ]; do - curl -k -i -v -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'ClientAuth: cHl0aG9uOnRlc3Q=' -H 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' -H 'Environment: TEST' -X POST -d '{"policyName": ".*"}' https://${PDP_IP}:8081/pdp/api/getConfig && break + curl -k -i -v -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'ClientAuth: cHl0aG9uOnRlc3Q=' -H 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' -H 'Environment: TEST' -d '{"policyName": ".*"}' https://${PDP_IP}:8081/pdp/api/getConfig && break echo Sleep: $INTERVAL seconds before testing if Policy is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds sleep $INTERVAL -- 2.16.6 From 9350b8385f2f08e2d2f2053830766ded9ee80ed4 Mon Sep 17 00:00:00 2001 From: Ruoyu Date: Wed, 28 Nov 2018 05:30:34 +0000 Subject: [PATCH 13/16] Update OOF version for HAS Update version to 1.2.5-SNAPSHOT-latest Change-Id: Ieb19ae819b94c95f13cb30b873fb84b3907e7a10 Issue-ID: OPTFRA-401 Signed-off-by: Ruoyu (cherry picked from commit 27400840cf6b0f8cf749b50e249835a4949ad80d) --- scripts/optf-has/has/has_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/optf-has/has/has_script.sh b/scripts/optf-has/has/has_script.sh index e6558cb8..475f9301 100755 --- a/scripts/optf-has/has/has_script.sh +++ b/scripts/optf-has/has/has_script.sh @@ -31,7 +31,7 @@ cd ${DIR} COND_CONF=/tmp/conductor/properties/conductor.conf LOG_CONF=/tmp/conductor/properties/log.conf IMAGE_NAME=nexus3.onap.org:10001/onap/optf-has -IMAGE_VER=1.2.4-SNAPSHOT-latest +IMAGE_VER=1.2.5-SNAPSHOT-latest BUNDLE=/tmp/conductor/properties/AAF_RootCA.cer mkdir -p /tmp/conductor/properties -- 2.16.6 From 401e33c787c02e090b98148726132da7ecd196b4 Mon Sep 17 00:00:00 2001 From: Marcin Migdal Date: Wed, 16 Jan 2019 13:27:10 +0100 Subject: [PATCH 14/16] Fix PRH CSIT in Casa release Change-Id: I983de9a4a4dc59ca17310bc7eb793834dfd55a89 Signed-off-by: Marcin Migdal Issue-ID: INT-807 --- tests/dcaegen2/prh-testcases/prh_tests.robot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/dcaegen2/prh-testcases/prh_tests.robot b/tests/dcaegen2/prh-testcases/prh_tests.robot index 634f37f8..4ecc9c89 100644 --- a/tests/dcaegen2/prh-testcases/prh_tests.robot +++ b/tests/dcaegen2/prh-testcases/prh_tests.robot @@ -49,7 +49,8 @@ Get valid event from DMaaP and record in AAI does not exist ${data}= Get Data From File ${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS} Set PNF name in AAI wrong_aai_record Set event in DMaaP ${data} - Wait Until Keyword Succeeds 100x 300ms Check PRH log java.io.IOException: Connection closed prematurely + Wait Until Keyword Succeeds 100x 300ms Check PRH log |AAIProducerTask exception has been registered + Wait Until Keyword Succeeds 100x 300ms Check PRH log |Chain of tasks have been aborted due to errors in PRH workflow Event in DMaaP is not JSON format [Documentation] PRH get not JSON format event from DMaaP - PRH does not produce PNF_READY notification -- 2.16.6 From 640765507cecabe3b51353ff51e3c23c24488cb7 Mon Sep 17 00:00:00 2001 From: Marcin Migdal Date: Fri, 18 Jan 2019 11:09:54 +0100 Subject: [PATCH 15/16] PRH CSIT set PRH version 1.2.0 Change-Id: I41181505d638e83e1d70ef8ea709e4dc8383e6b5 Signed-off-by: Marcin Migdal Issue-ID: INT-820 --- tests/dcaegen2/prh-testcases/resources/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index bc42a942..a0aaa9ad 100644 --- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: prh: - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.0 command: > --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-bc --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222 @@ -25,7 +25,7 @@ services: - aai ssl_prh: - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.0 command: > --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-bc --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2223 -- 2.16.6 From c2950ecb64d1fafb60504395dfaf61a6cdc5f19f Mon Sep 17 00:00:00 2001 From: LiamBurke Date: Thu, 7 Feb 2019 13:32:09 +0000 Subject: [PATCH 16/16] Put labels on the DataRouter images Change-Id: I34c1eb0e70b1622c6cd871368c343cba03acc15d Issue-ID: INT-649 Signed-off-by: LiamBurke --- plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml index a206e6f4..a9297284 100644 --- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml +++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml @@ -1,7 +1,7 @@ version: '2.1' services: datarouter-prov: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov + image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:1.0.3 container_name: datarouter-prov hostname: dmaap-dr-prov ports: @@ -22,7 +22,7 @@ services: retries: 5 datarouter-node: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-node + image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:1.0.3 container_name: datarouter-node hostname: dmaap-dr-node ports: @@ -35,7 +35,7 @@ services: condition: service_healthy datarouter-subscriber: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber + image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber:1.0.3 container_name: fileconsumer-node hostname: subscriber.com ports: -- 2.16.6