From 6ddc310d6785bf45a8ccc6d8de8abbeedf490f8a Mon Sep 17 00:00:00 2001 From: Remigiusz Janeczek Date: Wed, 26 May 2021 17:58:44 +0200 Subject: [PATCH] PM-Mapper CSIT image pulls enhancements - Add nexus3.onap.org repository to external images to avoid dockerhub pull limits. - Remove repository from PM-Mapper image to force use of image built earlier with maven. .gitignore update. - Add DMaaP healthcheck to setup.sh scripts Issue-ID: DCAEGEN2-2796 Issue-ID: DCAEGEN2-2799 Change-Id: Ie98336b91b37d61767049d4857b016fb618e4e8e Signed-off-by: Remigiusz Janeczek --- csit/.gitignore | 1 + csit/plans/filesprocessingconfigpmmapper/setup.sh | 12 ++++++++++++ csit/plans/pmmapper/docker-compose.yml | 4 ++-- csit/plans/pmmapper/setup.sh | 11 +++++++++++ .../filesprocessingconfigpmmapper.robot | 3 ++- .../libraries/DockerContainerManager.pyc | Bin 1989 -> 0 bytes .../libraries/EnvsReader.pyc | Bin 824 -> 0 bytes .../libraries/LogReader.pyc | Bin 1953 -> 0 bytes 8 files changed, 28 insertions(+), 3 deletions(-) delete mode 100644 csit/tests/filesprocessingconfigpmmapper/libraries/DockerContainerManager.pyc delete mode 100644 csit/tests/filesprocessingconfigpmmapper/libraries/EnvsReader.pyc delete mode 100644 csit/tests/filesprocessingconfigpmmapper/libraries/LogReader.pyc diff --git a/csit/.gitignore b/csit/.gitignore index c8865c2..3a900d8 100644 --- a/csit/.gitignore +++ b/csit/.gitignore @@ -1,2 +1,3 @@ env.properties archives/ +*.pyc diff --git a/csit/plans/filesprocessingconfigpmmapper/setup.sh b/csit/plans/filesprocessingconfigpmmapper/setup.sh index 5f0b41b..0a86c0a 100644 --- a/csit/plans/filesprocessingconfigpmmapper/setup.sh +++ b/csit/plans/filesprocessingconfigpmmapper/setup.sh @@ -78,6 +78,18 @@ for i in {1..5}; do done [ "$containers_ok" = "false" ] && echo "Error: required container not running." && exit 1 +#Data Router healthcheck +for i in $(seq 10); do + curl -sf 'http://localhost:8080/internal/prov' -o /dev/null + curl_status=$? + if [ curl_status -eq 0 ]; then + break + else + sleep 2 + fi +done + + # Data Router Configuration. docker exec -i datarouter-prov sh -c \ "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$GATEWAY_IP" diff --git a/csit/plans/pmmapper/docker-compose.yml b/csit/plans/pmmapper/docker-compose.yml index d612de2..ad671d2 100644 --- a/csit/plans/pmmapper/docker-compose.yml +++ b/csit/plans/pmmapper/docker-compose.yml @@ -46,7 +46,7 @@ services: - "dcae-pm-mapper:$PMMAPPER_IP" node: - image: node:10-slim + image: nexus3.onap.org:10001/node:10-slim container_name: mr-simulator volumes: - /var/tmp/mrserver.js:/tmp/mrserver.js @@ -57,7 +57,7 @@ services: ipv4_address: $NODE_IP mariadb: - image: mariadb:10.2.14 + image: nexus3.onap.org:10001/mariadb:10.2.14 container_name: mariadb ports: - "3306:3306" diff --git a/csit/plans/pmmapper/setup.sh b/csit/plans/pmmapper/setup.sh index 918b7f6..258b99e 100644 --- a/csit/plans/pmmapper/setup.sh +++ b/csit/plans/pmmapper/setup.sh @@ -71,6 +71,17 @@ for i in {1..5}; do done [ "$containers_ok" = "false" ] && echo "Error: required container not running." && exit 1 +#Data Router healthcheck +for i in $(seq 10); do + curl -sf 'http://localhost:8080/internal/prov' -o /dev/null + curl_status=$? + if [ curl_status -eq 0 ]; then + break + else + sleep 2 + fi +done + # Data Router Configuration. docker exec -i datarouter-prov sh -c \ "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$GATEWAY_IP" diff --git a/csit/tests/filesprocessingconfigpmmapper/filesprocessingconfigpmmapper.robot b/csit/tests/filesprocessingconfigpmmapper/filesprocessingconfigpmmapper.robot index 9648ef8..5f026d1 100644 --- a/csit/tests/filesprocessingconfigpmmapper/filesprocessingconfigpmmapper.robot +++ b/csit/tests/filesprocessingconfigpmmapper/filesprocessingconfigpmmapper.robot @@ -15,7 +15,7 @@ ${NR_VALID_METADATA_PATH} ${ASSETS_PATH}/valid_metadata.json ${CLI_EXEC_CLI_PM_LOG_CLEAR} docker exec pmmapper /bin/sh -c "echo -n "" > /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" ${PUBLISH_NODE_URL} https://${DR_NODE_IP}:8443/publish/1 ${CLI_EXEC_LOGS_LIST} docker exec datarouter-node /bin/sh -c "ls /opt/app/datartr/logs" -${DOCKER_CLIENT_IMAGE} nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:latest +${DOCKER_CLIENT_IMAGE} onap/org.onap.dcaegen2.services.pm-mapper:latest ${CLIENT_CONTAINER_NAME} pmmapper ${FILE_PATH} ${ASSETS_PATH}/ABigFile.xml ${CONFIG_ENVS_1_1} ${ASSETS_PATH}/config_1_1.env @@ -122,6 +122,7 @@ GetLogsOutput ${exec}= Catenate docker exec datarouter-node /bin/sh -c ${file_path} ${single_file}= Run Process ${exec} shell=yes ${output}= Catenate SEPARATOR=\n ${output} ${single_file.stdout} + Log ${output} END [Return] ${output} diff --git a/csit/tests/filesprocessingconfigpmmapper/libraries/DockerContainerManager.pyc b/csit/tests/filesprocessingconfigpmmapper/libraries/DockerContainerManager.pyc deleted file mode 100644 index 2bf62c34a1d0f01bb5f841e7541f4c387a9af188..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1989 zcmc&!&2k$>5bn`h@=v7TI3eMu2)R(T9Hh0W!uUWah+~WomZ?>WDs&k(J7as5-JPwO zks(#eDZBu$z=3z*xp)Bhde)XWP{q+JO>fU^cTe}%Kha-2IT_$jCBC&K${EO!W^ z@E24POe8=7Z;5`KVlQYCuftC9H=c1U!1^ta zqx#CFI#b%VXI-3~ntAR0LvYVc{z}_JQ~Ru_wLQ)1>_Xe6hiv5;miqui!#BZx;?`-0 zZ)7H-bP{*)Iq!jNU_HX(h}@qbo@gf6$u~Xn9cE?`Eh2g==*>DU)@c@e$5vc#Ahg;9 zL9yu3tV=V5yhaPS(4__L@3FdCrvfJ%q&8_^ZIQY|s!v6S7O*>@{Y975U3__m)HbPm zOQFlq~0av{$&06ZUwk&&I~eVbK6jt~zsmP#DO7gxxOcfjcSs<5W6G}6Z+jj`SpzkLjxS?*x>U=IO8LHnPLeHFYvFG}qiYjW*e zQD5YyJ})kAE|NFQ@LHw4<`-`>d1;(?ZUA$t%Ccst?65XUySq54U<}?3t(kkc%a_mH zHDitOo{OR4GIN3TnMEw_Bb+9t@d=_#nrhfan`oaWIka68gq@jNc)Q8MSD8(G)g<8x z|GH@bd0Esdh$`)~{4!?Ib|2~)X(T$grjh_G1y7!f(xMIcM3#l~GJI!nf+E8Xo7^!# zsO<*lBi5SNY3L>n@`au2n5_qYoG#COpH<2NDUof)7@wsLxy)UY`Ag{yI}ol>Rx+Hj zXhJG0%N)bj8cR99F;+`l4KBGfl}^gcIi1WK=Mhl#FBo%I_{3{uEeS~}aO zcTyHFZDtGYlK&n7qvmxO5Qu(RBXSuP*O+_E&WXO*5rgpSi(dE*Kp$W|7CFxahK=80 zB(n;Ex21E1QBXlhH{cJ6p)ma zQS(wunLdGV`U%J?n!w#c)ufzju3g8__d1(9txtT^CJqdRu2G>`N8Hsev{=x+{SX4w TU$)?W#bxKXp!#B4Y5UrkB7crVd5Q5+>m$_^Patt8^Kk(*Z1;vHXjx#-L>wL6bttjlC)?ebm zKbSw@t6tH6kPKaKYUC zMDvvHf6y$U{XgGnKA_ovu0Vr`KBR0z-gQcThh`~VC6cjFq;7Ty>lCr2)}tV8y#-Ko zzh=@p$Q->hT@W!Gymes+uW*P}nFM1Bo2HJAE5c>`zm9ocH#+>BzOOxsAQ>g|~+D z_YME%9)g?^%2wKRcTtP3ecx)SC!_I40I5%Es5aEP`mDCpa_&`xweE`6XdTZ{>$b0M s8+?vGfP0_hUyd^twQ@CBV3-^&WysM*>i?(;tLXo8xjnx`815<23x6iV9{>OV diff --git a/csit/tests/filesprocessingconfigpmmapper/libraries/LogReader.pyc b/csit/tests/filesprocessingconfigpmmapper/libraries/LogReader.pyc deleted file mode 100644 index d8e936cbdc784820c9c1fb47f0baecb56d870e49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1953 zcmc&#OK;Oa5T4CDC6xdHEdp_XOD@F{;)2vx2#UB=IXDMI1u|~DF>d{;cO!x1oXRgj zh(E{=fbUzU4~|@dlbOtpXJ_Z}&8GcpbL0ElpPy#3dfNDX2{KQ>B7BvkB1aHf5_KeM z%Qum8k@rW6@22A}?2_MjCUyw%u!wyfM!LH6sGxlXavn8&VWZH?5j-j1GA%eGi0_QFBkmh+aJD_M5LLKazeFNB_aiKXty!N)+BeX$)m z=}L{AE!nF3+_xNv?MXeL1LSwwk!p`i$oK26oc7(iCntU31| zqBOSBVdjuDqE^tY@{c#+xUpHalfi%(O8{9`DSGe4fNRWwx?SljAC^5^cQ8 zZapo(+5t}4O~dRs3itbvEl3Ol{SYOT$F#6a#FS}b8KhZ-Yb;7Af}^dj&;pofi~fjI z+S1uP$)hk$-K$jR?l+90F?;NM7@f}TZLBg~#X1VoA~r#>u;s$K$e3FmX1X~LFP%2h zsk3xv