From 4526832bbc18aedfe78d4359c6b058f72c458b81 Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Tue, 20 Feb 2024 14:28:48 +0000 Subject: [PATCH] Update chart repo url from installation script String based replacement added to add the proper chartmuseum urls in the configuration. Issue-ID: NONRTRIC-985 Change-Id: I0b533b0a99cb329fabe6821fa4c3d8187f673da3 Signed-off-by: aravind.est --- .../src/test/resources/valid-rapp-package.csar | Bin 15994 -> 16136 bytes .../src/test/resources/valid-rapp-package.csar | Bin 23673 -> 23557 bytes .../valid-rapp-package-new-info-type.csar | Bin 21425 -> 21309 bytes .../src/test/resources/valid-rapp-package.csar | Bin 21008 -> 20892 bytes .../models/csar/RappCsarConfigurationHandler.java | 2 +- .../invalid-rapp-package-empty-asd-yaml.csar | Bin 23233 -> 23117 bytes .../invalid-rapp-package-missing-artifact.csar | Bin 19840 -> 19724 bytes .../invalid-rapp-package-no-acm-composition.csar | Bin 22001 -> 21885 bytes .../invalid-rapp-package-no-asd-yaml.csar | Bin 23081 -> 22965 bytes .../resources/invalid-rapp-package-no-tosca.csar | Bin 23283 -> 23167 bytes .../src/test/resources/valid-rapp-package.csar | Bin 23673 -> 23557 bytes .../src/test/resources/valid-rapp-package.csar | Bin 13056 -> 13160 bytes .../rapp-all/Definitions/asd.yaml | 6 +-- .../Files/Acm/instances/a1pms-instance.json | 2 +- .../rapp-all/Files/Acm/instances/all-instance.json | 4 +- .../rapp-all/Files/Acm/instances/k8s-instance.json | 4 +- .../Files/Acm/instances/kserve-instance.json | 2 +- .../rapp-all/TOSCA-Metadata/TOSCA.meta | 2 +- .../rapp-hello-world/Definitions/asd.yaml | 4 +- .../rapp-hello-world/Definitions/asd_types.yaml | 11 +++++ .../Files/Acm/instances/k8s-instance.json | 4 +- .../rapp-kserve/Definitions/asd_types.yaml | 11 +++++ .../Files/Acm/instances/kserve-instance.json | 2 +- scripts/install/install-all.sh | 3 ++ scripts/install/patch-sample-rapps.sh | 48 +++++++++++++++++++++ 25 files changed, 90 insertions(+), 15 deletions(-) create mode 100755 scripts/install/patch-sample-rapps.sh diff --git a/rapp-manager-acm/src/test/resources/valid-rapp-package.csar b/rapp-manager-acm/src/test/resources/valid-rapp-package.csar index a0aa3b2d6f8e23482a874902ecfe5b4b4306ce0e..4856dab049eca7056d3c05b6103315153e3bbf1b 100755 GIT binary patch delta 2468 zcmai$XHe728pi)5AOw)!dr2Sy3W11vXadp_I!NcxLNB3-6d{5Xr9(pV(n$cN9x1{> zL_};LAXR!72}%*9sc?gL?s&ZC&Ya!Z54#_J^UglczRw=sxE)phfSD5j=m3T|b1RnP zqMb!505GEl064yciyJ?~%!xC7>o+0C5xHS$6(s>F8G%Pu!EMVtF>F4vJsi9%Pi5F9 zAE+SBw>BDF@I+D#A7p7NqHn8Ja&MJhv{w(j&op1hH%uj8dwQPZdFawzTI0Kr^+QkP zR5J%sX@-V^i<0$nICEHQ@7VIUt*8T6lUm`1tC#vaBKs}Jf9uI{-Nns?aeCa(4StkO zlX7{fj`ef^44JMavwyjhZg>E=F!4Fx+cq!NeP;+0BskqSIQcroTJx_ZC8uw;+ z_X9>?;B29Fg)kl6<(^D|W6 z7G-j7Dk$Un-g`aTNZdB#GFV@#lIOfe+@7|%@#OZwzBT;o^z0yGV76h%rY2%`YPAhI zj_pFSerr&&y=7>lUO?^VT($?RaxR+Jxp-}5)^a8B_&KM1*<^WENKua-#oelvP zO))|#7yzhXKb(-K%!*4f>q(7~gcSfN;{%ngdq(DOI)YJDy-py*rhO#j=S zX9;LQn@y-SZ5wo?O&7*!IaibZFfLJ2-?NvFdgfhol)BXGyif5_a|s4nn<#&+rd6m` zd*1tmom}khTGz@swRODAEOA!NGg|<^lP)>wRtIQ7IYTx&6L6bXx9KO@$em*3U=c}b zROL-i*WGG2vpX@cgWQ7m_)y;Gc&$(yL;uFx65TSfW|(jc*PpB5g?uEeU&>m6&1T*M z8)N2sIXv!G`!P9$sT-yXsQui1!~4ga?qTJB42z7_yfRn`80&5F>1uI5nhL6kP}t@x z>CzFTA|pg}qH%q8Vv$rB_KhjXD;iw`b(J=8ZZH|u-%a%Bk+s(CB|t#+rk0)#1u(C) zG3*(S-lkKu=_p6jMfpBrHeqL;k)IF`VZvra#BgH`QI%bbpWo**g)`@7vfD8UE|jJh z6FxaKa#gJ&k;nRu4$ES8-2sjHqlo*GYh~-J0oYpM-ABjZpF)8sLRCEDX|DtUzMU_5KCjm3^^(gffiz~QSkdI zlG0wYUxHQhRD0|EUf{78wi70O6g%$DOdGk6YbxRjdK7Y6;&w9Ju# ztkDtILItOf(j~zcUNwguUu$k?8LsfEO`9phwW=P9yonU>P%3O++Hv{Q;Fio@1bCU<11QjxHo5RKxE^ z1?^+Ol&p_V2`z9ad<3qfmp-1~sQQ{A_>usV_8q~paNCv1J+g9SPTx@4V5@u^QxO`s z;B6c9JVzwDD7<~0=KI*%HJyr4?Jt=+=B6Y5Lb7jahjniaCbZCFbDvm1>%wkJA9iJB z@}q@D0|;u}sUqcKVd@M6Jj+h9%wq&@rZN3ahn-P-KF8?uwW9HDwJ%He$bDVD{Z>*U zLKb>(I6`{mIHweFo4H=+5Qkhjx?rejiwDY%EbE`?EHl#15@5qAjga5uV&qxNSXFPtRf{hM z=5E4`8q-4pFaz;;lAf--di?R@@>dgvd-WRV)|LE-ewC>@NdS~8#n!7{fAgzvw!bgS z3k(ONOo%ATtn(~mmkFIcXA+9uz#s)m>bCHFjAlLvYa**g(-qc%x`XzG z)%mqhK53j(O|3}=3fS?y66XWinE;U^0c@5Ylx3v@5GU1wcj@ol< zVd7*BgmsXn%5n_}Fv7y<)`hQ(5kG#3)J;JOTt`oDk2N*Lo=Z$k;jK|>1uL77QXaBQ zZL_%0JQc1>v?h=9Tv8Ltt6Xz0F~Gg7`HsUK-fO9g#LlMkHJI`=h{M%@{{+F`egpuN z5)datgtDrc@ms9i_*rIlH2seQN>Ttk0PR3=6hCHyqT#Q@7)=HGFZh2G2KEz-k5ZN~ z{wr^4*CXtocz3e_*_+iWHS1K2pVu3WR^FqC@41=T%h~NksyHQxN8yubVNN=G4ihaZ{!&9RPGG Hp6vb&?CKfS delta 2202 zcmY+Fc{J2*8^>piU4zNaNE-Vx_OVlwObpX764|pRM#>WMOeEO`j~^pD*;7(8QH|xH zNp>MALK;at*+tfu{&;)e`}*g;&-FdubD#6Q&gV+_YwKp+Q$Ao5A_!IhmSCd5B%dHD zqnpS)E*QTN!Obve55A~l9bW1xQ#0pP))S&t$kr;am;~j#S7kFDE~UTkHoaj>VFnZyy^%c)& zND`%H@#|@Ke|4+t-lbdMi;1&t%1(2n(+Y|)H~vk$MDQzS^B@lud}>Hm@xg{^O*(rw zbbmq7k*MwzWUYv!v6?&esy?a+N@GTt4wI@Ye668Q$Q$_^&Wg(z?gt4OP+v@&_^1+E zEU`4heWJmmWxG2v4J;-e9TJMGy=oQOsgBrqPx0pwcM&fxgCwcGwfFa$1d$@BYRQVK zLVn$?DI#NUcqU`nzwMRQ8KGM^IAvqi&b--!rL;2iW^+zxeAbfKVTyyt?@4v#L__S7 zQ?3w~RsP6w_a08x*%ll_>LKR6Z@is~#)paAmPY@-bDNR#Bi8@-<60I!? zIrk3~`LOBMsUo7J0|9IN#nXQ~@zSu@0(UsC4z~j%Gd@>KIdq5U4J8{ErJb{-N9{lG zQTa9uog~C~#M|??23w!9By9cC67sELVBv8 z9ZdF0UtioX%_dG$^P#25>iA-xZQ!YvNvqn0W2Rfpd83{*#T+Ks|2Eki#=A3%yv4$% zeYW`ayN+YvUyQ|tObR!R^wqt6;lse+sg@&`!l@qm9cY4wGyh4l{$)~V%oE@18i~Q6 z29F@jWkGMr$LVON-j4~qSF$yA>LM)Q%8pGRs!Mpz&8<=iX)c%jJNp}Yg@;^)u1NleF938@XkVq=92$4JpM42?^ z&s67+UcA6*IwDf;4Xiz)xo~3D(gWSzci-;-%o&upG79wdezT`z@DJ@f_%1XA95vIE zlib&#hKV!FIL}}3_iUqz@1TL4zSlr7GlJdoP6io}b3{8SU&ykz*IVmJY7Y;NiVim{ z+RY!I=s`MJfhiItE(y(Xmaw1GB)iw*0^e=;Vb|(o@MyL{$CSv{a9RpgaUXRtp8+Tq zFe*bd$R9UD;35d_WQ{F7$xuHAkK52Gn>S!Z2(uj_bl$E!+I^1-Ty)@6z2QIpjduvTIJw2ABk|j-KE6Z8C z;x?)PZRe_c)jVoH<6g*iSNXfyt)02!WgHvQDHBaxqnoQzEKvkVT1nH-4QR>0FbL1L z3{zv%d}iy!?dhT*J^K2|Q)l(&W?gTHi+*MQN~4{ho8tVI#oWTL4V%fMwo=7~u-$|i z^EE(w!&7r#AanUy=9>$ovo8_3@1J9^<0?l0VGeN5sQi$N@S?Jk1UyV?Uh$F7r&UW? zvQ{kL?1|e1A7LV|Wh&hco}m5tZe`C*U?n*S%ao;$Nh@4kp5~Uk+H- zUiYMJhq{vNzJ0tKQW#C?Q(Z8)shapWx>xH3D`e&Ee5l*o{TC$HhLAAw16@sF^A9e| zP)dcWPMG^R5=XVJz9-U&J*J_0Y}ED|ZQ4dae%f>Js0_NiKLngQU}Vr&`YioS@_Yq9 zGIFt&-$DJ2IOjE8A-4Cf;}LdP=dD7v)PS)bAvRObN3fCb) z!14z>Ljo;wi0rbmV#mCha(15SG(qN9kp~h&rqBNU?Wa!=9U*cD4>^ zPFf1z7f`wI0cUlYY0g=w-xh(J9ie}LMxxA-X&7X{jtXu0%-r6t{tBYE;n?tRSkz*E zWw{)%LgJ7WRJGk5uw*O_)&qD<2w+yg t%>={Zs}97d3j@t2O2^Z+K_HLoUdTWnJeH09&_v{*ia0=^*QmqSe*p1P-pT*~ diff --git a/rapp-manager-application/src/test/resources/valid-rapp-package.csar b/rapp-manager-application/src/test/resources/valid-rapp-package.csar index 667317e84c68818fd455a06ea937845d297d03f9..526d5d9b878410fac90ae4277116126e92c950f7 100755 GIT binary patch delta 2738 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 CX^4pc delta 2598 zcmZuzc|4SB8-8a-_G4c%wz2PGOp$#MGM2$G#zd(mag1bbHBIGMvcDOMGVsFO>5$F39w+g(yh#Q7??1Ojfmc_qplT>|wtNq8miR|FqS@UnK|y zf_q$+M4q3acpWYWIp@$pj{X$e+;y?h&tcgztw8+@{A`8L37M1AC2j^U(MJKhHV6Etxaa;(HV1?&iV^BOqp|*gPy}l0<6k9WVfRsy@{@e@8$sHom<` z8)+$nK1Jc9b5`CaLMg=B!k)m5r&c4fboGZY=X~tXW_;|`-Y+5A zJ6VVtSG$AtG9-sx(FUdPacPV*UbU zg%&LE_t)U?h^23XtA4NNi(Foa31ekLP>Esh9gHConshW&zQlfo>$yg3L|GksVVHOts1G>h5F`;LQH^&jU`&SC#6Q5? zfPcH-B&S2LcvDdz;5PfR$TKYk_2772ON?Ws)0Hnll;2P~(9P9oeFWEy=}_BJD@Z zPkF0qAtV?A%&wBz02hYe6S0HoRqiT1V;HA8=UseQMZw^h6VcJnvt^WUHrJN(dstFk ze3&44$5a7R;VyBw&UL|!%X&VBxJSVcYM-pR65>anPQI+~dbsW%+Coc%mD;~d>CvxM ztnuRdZt|L9qnTlMIl%;MFBm#-swl06S_3~LELU|x zh;crpKP*&YIqhRfA-!YiNXcSW5_f(&&puv*f<@07Tb=_4rX(%+3BpXnI5Hw^ZiK-z z_#R<>tSLH7!b^Ni@-Op&;E$rEzYJbBBaO#Y28XP#g|8PUx2~?Dit@^yLMXcpQNk;h ztTZ;$eso!PQfbo-aSE#9rTz%Zm7 zIIqlq-xXOT3nJVF<$lf`&e#Y3eI8QjTHqx&sULR$O)#CvEBo_&a}M^uwZKDaIGEw8 zxuqgbo!qw4c7*o7b+P(epwd6wU@qgvbYJjFpVGuvhYq&ubmKPZOW-U?*oS>qB(CFKF6VnHk?q4 za2%2drV=QS+n|u|G1!tF09xBCf|YjaoURwXa9ElBcJ9FTe}fK0At=!i#1o0Iaz_9} UJDP$EL_z*uF#yOsxV@+U0AEUdhyVZp diff --git a/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar b/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar index 1ab8ff9a107b21e922154a30a6cb8803f4ec750e..f51cfb2076435ef6f27f4af928b9e567d8526ed9 100755 GIT binary patch delta 2485 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 delta 2259 zcmZ9Nc{CJk8^&jlZNy+uV;h;VMz$jR7BXnEOSWpVWRPW)$}}RfGYmztON=5hS+l)~ zn8763L&g?`$UEdiU#IVU&-2%F&V8NxIp_M_*PUGeOfCezfCv+knZazr%m9Ei07j4( zmLVV@FkC{ao`0(nxFb|ID*d6OM((Po(VJv^L>ksdOQTn!T(c5gZ}zk+)IU3OlFIFp zKR3Rzy_~arD-vbf$Cob$O~#~E2Mo`? z&=ad#N9bsmj3mmwQR+$mG3G3T$ak|R($Z1ia4b{f{5NgDC_}X60G-uWZtY#F4q{8q z_4vDEIVrb~4s7{~331?Wk9)<#b;iCmJYH~fnRY%0ly<$YxAL_JCgyZLDjkyTqRd}y zo2jy7+JV6?hBx-ysdq75*GUDQ;T284IGXRd)paQo)1Y=IPv$K{ObSJy-G#dtFoCGXLh%2{b zWz=2Px{fIqmk67A3O9RzjnY3vEnME!Gx6xSvv_`o8HHqHuQ1(8 zcL4$b!psB%)+2004gdhL=fIeV)PVyZ>_&WqmBDu?4(vLfCjt#IbOpFd{%l-s+mXewrcIltda@$AihJr}Wz!GLKhd%#4E#xAH*}V7k zP2lAs`vgLV_xlTFRCEz3c<$ksgq4L~8=u2<8M^h&SuVAiBIQa|ffD~h%`I_1Uk)Jr zEecHyu5^B4H3TALJe8lxaw|*+%QeLddiGuElIlC{Y$2(uD{i_K({d?Zx5Y#h`n~^S zuq|!=lvH$)t%_|udLh9?-nAoLv2dt8e-bSa#2alrjob*(YF>I&Kl}qbaI8+7At~D7 zsYYIKRk+vJBdX5L^$7uM`USdeJMen%nmT!w}#1f)2aRP2>2 zPk$D7TwZP1VYn_lwN7hSbKco-L6W9=X{B#8=1%f#ljUslJr&)IRa`sg*-hgCD34cZ zR@CRNDcD_ShHu^5e6~>=TTSwk?x4+ZEQnH8tB2sD{>w4`GmF{W*IY&0JNxrdCPEGxD<7f8|~Uy?7v9eKy82 zVEwF_!!-SAv-oz!xrOF^fF~-fEFLle07Q-hfD`v3WFO#8@!tR^*mV2tMM%S%0FlxT z2cG1pFMbfwyBY<>7R z<_C>-JG*qU^N{$4=);KM!rWLHry#6Ed2zzAv=k4!)tnXF2GIxf?+>5AptYZan=T)g z3oPI9@t}l#)gA;)nyLdKGPwp!qD3YfES=KfK_%6;xi|$j)sVMViNV&;xG{8FU~*J( zD;ahd8Z`JT7++}`r2ODIpw`3R)Eg24scYm4(~K6FE90Vcu5U{-JQV4(=2PaBBR?cuU82nj^)DO&Kb zB)PQmolP!3FG-z1npayK;y{UW`Gj7@VmmXAO4u64t>;iFf;}8aZ&9;EkS0$LKU6-A zYbQd%QQ7vj&#S7|Ei0$!@wVCS+Mb$iSHC7=5_7RhcLG(hO1#pJ<(I|>oS{sLaYT#; zp*?TNJ+9x00^+`de&x8v(>-R1tyNsE8o5;4>mE|ywSdOgr>}hfa>@8s!<@^G(6#W- zG_sJjakEenTpVGbN`kgf;?=1>tl4MEeA!o~$rEiMjU_-8?y$!Tsbkck1wK{6dJT8H zkx>P+nF_w0_sVmw>&+>+$QRG!ybIKz(o`!Ut$#oh1qM%k5rU6JgeSsM!Q+U>3{#~; zQY{`yvZ;XaSPAV4j@+y%)6=(n!SU}Sd5KNSN( zqSf?R)|_OvQ|wB4t2UKJY-i5U1#~!_c*x387+Ap42#IZQ5~hE-0UH3Zup3N7>T-QEh^E{t#9+*B*bE@=bejwq|~Z0J&w7-Y-)xScEvb+$3LM^b&W zkAD3k9XF2%p5FR+oD{k1H~4#}tQ9;t+`s3$9?SknzO0aJlq0~5xuAb{&B2-n{5dsv zLW-6AJ`<^Dz#@MK`e2g(6ai}RlOhCVD?u&~Uta}pzo1|bzsqO>41(Af?X&h9wf`3_ ziSLUDW8%Dj8vOm<0gwOFfF^NJ3r0cyTT5_6L77D0gkDP_LLAB&$RN;B9?Tkw079RF XmLLjwh;?5rvv<$&0sv+D`>+21z5Mxq diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java index 41c0eaf..1babdd2 100755 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java +++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java @@ -67,7 +67,7 @@ public class RappCsarConfigurationHandler { public String getInstantiationPayload(Rapp rapp, RappACMInstance rappACMInstance, UUID compositionId) { return getPayload(rapp, getResourceUri(RappCsarPathProvider.ACM_INSTANCES_LOCATION, rappACMInstance.getInstance())).replaceAll( - "COMPOSITIONID", String.valueOf(compositionId)); + "DO_NOT_CHANGE_THIS_COMPOSITION_ID", String.valueOf(compositionId)); } public ByteArrayResource getArtifactPayload(Rapp rapp, String location) { diff --git a/rapp-manager-models/src/test/resources/invalid-rapp-package-empty-asd-yaml.csar b/rapp-manager-models/src/test/resources/invalid-rapp-package-empty-asd-yaml.csar index e614a19309447c1269c81d4de58d464a5dc3c6eb..e146e5914571d947ef118bf0d78c518b09ecc2e9 100755 GIT binary patch delta 2711 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 L5Xg}Ix+VStHhg=~ diff --git a/rapp-manager-models/src/test/resources/invalid-rapp-package-missing-artifact.csar b/rapp-manager-models/src/test/resources/invalid-rapp-package-missing-artifact.csar index d56f4ef9937e6aa7f75c525ba6255d9149f39848..c82fce6a3125dfc6b69ffd388ade415768496eaa 100755 GIT binary patch delta 2748 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 E0G}O_cK`qY delta 2548 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 D*rtIY delta 2595 zcmZ8jc|6qH8=e`mjmy|lV;jrZX)tA{p$x`oFt#+7YO-7->u5Di`F@_~JnwhyF7#_D^nRLhnjwN;h6e&s zgP;HgF9n*FC4dbP#YjxEJoyNNXpgpt&A9Gi#Gd!Jewf0%m`)EeHR@C>GpVFD*xq>_ zeKIHOZI=ioe{y7QbvAeQ>}3+UTRdOtYXAE>PS10X!+KcD&}v#G~S%{p^SSSf~t9kSI6g@?q~AM@0?WG zTjjrBcZTb2PoV7>497ffs(01zlJ4|%_nb|wmB&FxYDnR$uOexCdF-=a0#R)iYKCu8q8BaFbN0 zm+4VQ1Z}4R$4^6#6}csX_Q02iOS`B=<&l%uKP1jg|5$n#W5Km(XvwD3X33Ues=^ij zM%oh@-+%8#pL8h1#19P(?=UyeaI-=(i7ttv{!b@9S6J<7)FrVD_=EnWjH5mlC6L(5e=!!#mAFIbh+Mdld z@|J|__9x#CU~5g>y{4^&9dsY8k4dXHT{oHXvYJ-zGdMceJsf{Ne|fnKC&KuLD&yXRx53trsd`X~AP!!Bf#x=$AUE`wL$oYHFjPFp>80blV;ong5Q z*=P+*@xX_ohq60{9A!pXe-h{|*0~dWWuMb;st6mZ(JJP1C=ROQfn!esL}waf?sfJ? zPnoT$-}D-e`hG;*hkL_6NRY3uk~5RXV6QJUhD?1zx}GGfBvvm%ZhPIR>3hnI;?`X~ zDb&$q>uvB{Yo$O3ZB4MrHY&*-W1(0kr~TleIn+gL!LKFrJO3gonk|k{lrR%XhKTne znnGnw^#+HP``l2lGW`?+Q%gD~(6T3qk5)K3T!%p*EWs@iCv8~Cwursde~LKK zj-GKNk3YVs?WkGx4ryj3^W3(1k=UhM zrBLb0`@`rJ!%98%z{PkY(3Usgd#%Tl0~a|@ec-Vm`r-|dUaLD>HFUJL(>JQ&`81W; zkTLi5!_fn08z(7i(!a*M>#LJ?KF}gvq@sYv8I&ViISGbcL3}v}OM?aG#_L8OM>Q2g z^+nFyoKAbwH83r102XUR60EH&cx?5VZDPmo35T_$GA`f0cP+30i&X1!ls5enK3agg z^#epIU5rUWr6ESpH@SGs4%Jq_WQ{b)$W=wN3PE=E7~c47Fe2gQWieJWvl4kqRJQDd zNcq{s-p~-q#pL%z`Rw)u-=g`9t9-dB{QCqjdGjun*8B$#PDq&xd5YHQ#nMorpN7i$ z``@DWA8VwCO1esnN_{r#3wkeh`7DoQpcedI-WP8*wK{8%zLlYR;|6cXhbKcH?)G)o#AQdkS4-VD|42g*J z3pqvwIO1NJO`-kN+5c|{0vBx6w~GFEpDhvoPf=%0z_gVHD9z1(4|PDY;RSc?5CEgi z3*XLK$K3#7cJ8n-ZSc@u9!%QVL(M>oy#mN~+yjIOG5}#O06se+Vb;1E30I(Y;Qj{4 z)l~v)JHD-81_24ZwSk_4y~Th^0utCd_(D-2l_&$K1PoYoKtkzTD^21F*jWRBAR>W| zfhl0y$bx!15uO+<1cYJb02aGlQ;BC_3-d{HMQonUGrIR@%8HIIXu?WtZWR-PptipO zvX1+(4+3KL>3|CkNHBaz1g2vMT1Zl0aNl-K0iZ`h!eTaI6rhnv&>GN83WLr8jFTS> zX9Dz`c7i!$lg$$soRF|6(=7z;d>j^Kwl!5Y+X~J&Zv@S^5IL6s*fk44A@2gWTp6(*OVf diff --git a/rapp-manager-models/src/test/resources/invalid-rapp-package-no-asd-yaml.csar b/rapp-manager-models/src/test/resources/invalid-rapp-package-no-asd-yaml.csar index a2168ff5341ac8a1a1af1404c029884f6a2f082d..dade078ee9e53003e75be7d4e72b78a1016b085e 100755 GIT binary patch delta 2705 zcmZWr2{@E%8~$d7GH5JW2V)ydNCqvkj|>K5EZP0YP7IMOhlwnO5k6}_5i=-R&auQ1 zlGG_e*6dp~;S?fE3;)o${?ob6_g&xjJ@5U!_w!!wb>G+Xym#v%4Rw&(hjM}dzy>JA zTiZ=&w5SC@0N?}+0OSAwjFsaD-^(4PP%U5iJyzz6p0SPB_Q#&L`D|wGC0>u48Wfc= zlTM@?8>#3e?zNRYA17|r;!K(u1yOxklQnVxG)nsDw^J9F&{2|rIu)(bviM!Ffs$4=7C`?-9}zWloyr~jjVJ7870o-v496*sbRg* z{T62snxP>D&sJ5gWl6G!!gMKQ=&JN1V~lGr%j^3stu)?DjQ)+?)?7y!=_MT2K15&Z zZ516bC(E#X6hAjg`}1?O5mim}ipkXaXhTE1QgRwqxJsiLrfET^KH#2Q=XPg(EMAjr zzcePKu7k?2SoXeSM){-aJB9M)Zc|M(d4^;HW8nk#MNwgjQvT$KP-_Jg0Pev7K;|!1 zem}-T89wjqKfzRGrA9d>O(!cyX3^27WjIwfp*||#ko4xi_;Wd_w48*@J#Bl-i*k#2 zj3-I|QS;Vhh)!trw@3jN$!9Y0xq4^36c-5YM2RC&4GdOVN!%!ruN-^HM(PCtbB`*g z;5YL*R6Ae0rzY?jNIt!uG;#4%`>p9IbMG;V{;9&AI)6dit5TUZmkX$ImMq)$DZHa) z#rh&7mn06BLoz{Crq<52zj6-n>A` zOCwJ`&1s=c<_x+mrJ4jeb!EF|UA*u($i6G@N!w6(>cn#GHf zDANs>^A=vcRLenn^vklH6^0f`*|7`1=V$p$n`o0iCZB#QZhWP?K?SyhgHHyTX}$4= z!8ISkJKpbNd_aD&>C(HgU1ww(`Wzknfe#o5HMb#U^_}B)t;ch@QS-{~9Ht{TGl%=L zM}|FbtGfNEa3}Qi^Tvq1%Z+tSL*;(eH!0Jl&DviiUPg=ezWa}Gkx7Jyr%|i#O!$3z zm;i4`S5JmJ{WiT_ahF~Zx>BpvNVn#f&B^6ZYM{|fynlnJ=DS|9yi{k>b;AfA7LE)2 zrTlQ47&ZG(x1=Tv8Z(U1FisyUsMmhM5vneVz~2xnjdWy8Y%OU<=k^ZX9B5W)K~RcJ z=KUQ*p5{u#7DcvxWc@z6eA%#k1phhH(Asi12zBCR^^noEfutsOa^52wbWOx{g)g1i znIa~rk>D(yt~7}jdZyQ zuNuGr%^$YXkwjTNzs^3vyVN1I6e=OdLa4av>$!Q~%j!m)%uZh6J1|`MDQFPxKn$wC zF59ITZ{-o`A@KWR_*7x)jRz-5ez!^XX|gbU2;hYPq1&OUudHnBx@5N`xcG z8BuY9WFn!WbK%pw0z@QNUgl9JgxGvZdU4hVmwJK9MK!fOQ&*R_QchjL^#vo?dveRA z9~Xnk)smYJ_h5gkq{&o?d#`9?fvJ)e3jkmaR1yGdln&ZK;P`&wv9*hlh2I&*L|0-Q zOMN|fFP`Y;6J|VC)e&F=@rviV+{50>4L5~ozsosH! z_p(zxQYx+a_+fOy%c0Hp9-{rnZ`+rPdr%#S{^8x>{yxQOf0zbIxgYbx-^5lKOS|J1 zTu*MsPG4Dn`E^YIHQ>CVvS|DZRe$*nHg~a#!fA1cZ|Q{YH4#!1G#~-@j!Qx?OefD8 z7pKCxvEH%i25&5WRMtM5$l70nh=DQ*=@&ERn{F;t%ih z3V$2y%&uTq+}|j|asRp`;zC1VslfN1E3xL%jv2ZzQ~3&^lemN}yftZJeP`Pq^L1)w zfb&ugF>F;IJ2Sc1f*vDxs_}fQ({Q{-bkHkg3A|9cB~y8!XwLA=WyXvxBYE#i`yd76 z#3Jjal?_FX=>R{v(Z7!fXl9q%za*GXqul=w47}_I2mn9;A>g_~OcK%q)%clerFc+7{y~QHW5B=2|2Ff_WI?5U@`1Jgk-(o? zmd8vWPe6gYW+<4hG62pg9|vnmhrm?=3lrl8y@&|tb!Bjthyw9gDdsN(c*F_`o!^I& zA&cM)Q5;M*_lK>h0ARYR#=!(V5)x*hx<3{M_f$`Vy5`(q8xu=Z`+@16JO!o`L_vl* z0{ZkMsBMV^gDeP8(NhQEh=mtK64bK13PFQymcEb}=35-pRL3#%$U_s8^vT~izsK2L%rHttXn-Gh*5%MA4n=0CUffnY%uJ9k(D4gkl`iGvU9NDy_9 t%|00R!2kf$@G1xUerS(`oy7y-1pcf5$%OULzHj82cN8xGpbhs&{{s}9gVF#1 delta 2596 zcmZ8ic|4Ts7k_6)_RH8awvl~p3`J`QW)3MBLgkWx>YO8tEf#*rLUsS zdN@`-b-7fz{i6*kU{v9&Nn$GblELOHrtTQ zeZZWmicx!ZX5&eV^Rx;T)k_~s;RmRB509BG2eFT}w28bM=;<5c6wPm1Irw#6{d{x- zM!*RORywX_P#^%H00SpbyLT~#06>F>!Cf5*9tLmSM*#S;zO>s_#yg2g@^ZoxnUMu`0I^S|L&Y$W)jvf*$TQh^Ifu;p&osc z9&udAX*OW$BIIPTMpSb?ezRs9Qr z#nZn(?$cu;LTZo3XztIC7F@vda-PQzI|K3xtGZw-RE}_T_HV@VChR zJ&l%JHKk5}lZH8OgB!hFN~U6>?=+AtqU!V_B#sv61qsk>`CN`}gifgs`T5ZF!cco% zpCpE&t)nC1eK)x9ZsjpP+WLk#qos`T{E;^|_GivaAW#~6L09;eGkbv9=P8F}am~D? zMGOa%@1J4mO+UD;uV*q$8g7hEYqZ!jpY^hxQyVZovCumjcQxfxEB;g44KyZmk=`ME zc-6iiA%3PTJLbcyN#r#zZcyX%0)bICqIts?%%IzFyhu-Z4Z7ROh*ij6^2T6PDMK+z z$4WBbiTIK1t`Qf7apteM$Tqv&Y5s~o((kE@nrhK17jr1ino|Lj&(DZ|ZjOG~-5)h; zxuJc}Yc%5faY-NUUH?EK{(-8V&-rxL=2CO;>=%UlIih-E%`$M`>u%k^3q}ODA^x0j zSBsOk@hiQxLIVvuoI|!*S?(kg$uz&{ClZoFT{bB^Tec|s8(!6Nd5p3LHJxM%{}`+* zT+z~Kd`xY?0|~7_r{EZRa?zRQvCy88DH83^vCU5T8B~r{dtoYj>E+}iTR$^DTkr?# zw8*1dS~Z8`@FB~Gok&yDrEMzfl}F~Ee6`3II%@Z3+t{ZOMoRfCP>3vLMG9 zz9S@VuYH^ZyX5I`G4*4w?g43u zE)O!XSV$2aTV?V~WK;AQ?c2b>m7KDP7rRtel09 z-9dc6f>qQbAADDqFLGq=b)j2wqDk$kn${?%a_o(-0h3^DV2h{v{AS#S4(X+N&*Kxl zoo6%${a1Z9Myy82T=8vmo~St3@<(hbOcGCF1g!V~K${1T&JHxLHo+rX&~Rn=dSs~w zY?P)w)OC>3Y>|ep;yFJ&oAOlha7x8dHO@E=TjRV-h@c`G7XpyZS!VlLh#h0seE-MDVxX+-=bu(tZ?nhQC0?AfQ+^<8!A-odTRWY~R&*NGg% zYLzN?z8_|9>9*Rb_SfUgz>fSO-`joU9ucvt)LPFa@z?M1k@bf2)gveByL}^?Ud>S% zO&JSce?MV=xp{`NA$KrETW|Z zf)=}UZ!YaUXJ}5+7+kIsOR%%6ggK!Z9TKM=ik@#vrQdw?@OD6<2||nGB4_cd$atYm z-VZQ*&-LgeWEy--;~v)$wM(if6tQ2BpPdXmB90X5zb5nxZ%BVtI5Lc`? zEyli_*dG!sy`229xPaBUOMkeAb zn4V;A1O8|FMmCM}sfE?0X1dxteg60~eO4oUYV9|D_RY=U!JWynRG9Zu-xluMfIqfI z`6+-L7g42u=groz2av!&Umc@P3ji5fGJg+$ZP1!5sPOO8=Dq2El7Tu#9BAXLy+t5i zp5ivib~yI`dFlEf3NQD!5bPBFZ)00b{7=y<;9k7mR#AO09^g#g zz2y1w;ALY|UOtw9fC=y0&XEVN5qx3T{Q!tDl?T@eSQzVX`^3@Huwv8gbt1@eQ`|lu zT51N`xG96)W_x(02`&f-6ts3z0Tqq*f{AVl+dpo*8K{u?R^lzFxCQve%>zcV06-fH zY489M3oGT>hj?v_5D~Bm%k7v7m}RNSJBI8o29?KvRwP-F?v90?-7)1c=DZzx9tdcj z6)#HhI0enK=9zfwov0cK0m%a~Bs!!PY$ct93fX~eq}?FRUJ$hNBtTp2c`n=26L#JK h0EHdUyjwVt5wO-RpX6W;=8;8(&q@M7spB>@{{v*Ra902T diff --git a/rapp-manager-models/src/test/resources/invalid-rapp-package-no-tosca.csar b/rapp-manager-models/src/test/resources/invalid-rapp-package-no-tosca.csar index 7ba7c33467fd0e36c116831482e414902f0742d7..e03ad3a4ac3a15ab4f3578860918e01cab5d282a 100755 GIT binary patch delta 2699 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 delta 2549 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 AApigX diff --git a/rapp-manager-models/src/test/resources/valid-rapp-package.csar b/rapp-manager-models/src/test/resources/valid-rapp-package.csar index 667317e84c68818fd455a06ea937845d297d03f9..a045a6a0de9a35eb30970d6181e733d8e5a38081 100755 GIT binary patch delta 2738 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 UJDP$EL_z*uF#yOsxV@+U0AEUdhyVZp diff --git a/rapp-manager-sme/src/test/resources/valid-rapp-package.csar b/rapp-manager-sme/src/test/resources/valid-rapp-package.csar index 2bbc2ef65524fba63c1092309c989412f7599721..e1c17c684823226e6af902949696bb2501f96725 100755 GIT binary patch delta 1650 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 + Specify target server for artifact. + required: true + type: string + constraints: + - valid_values: [ "chartmuseum" ] + target_server_uri: + description: "URI of the target server" + required: true + type: string \ No newline at end of file diff --git a/sample-rapp-generator/rapp-hello-world/Files/Acm/instances/k8s-instance.json b/sample-rapp-generator/rapp-hello-world/Files/Acm/instances/k8s-instance.json index 734f0d1..c019541 100644 --- a/sample-rapp-generator/rapp-hello-world/Files/Acm/instances/k8s-instance.json +++ b/sample-rapp-generator/rapp-hello-world/Files/Acm/instances/k8s-instance.json @@ -1,7 +1,7 @@ { "name": "K8DemoInstance0", "version": "1.0.1", - "compositionId": "COMPOSITIONID", + "compositionId": "DO_NOT_CHANGE_THIS_COMPOSITION_ID", "description": "Demo automation composition instance 0", "elements": { "d7be552e-bcc5-4478-b64d-797dbaec8f55": { @@ -22,7 +22,7 @@ "podName": "hello-world-chart", "repository": { "repoName": "local", - "address": "http://10.101.1.90:8879/charts" + "address": "UPDATE_THIS_CHART_MUSEUM_GET_CHARTS_URI" } } } diff --git a/sample-rapp-generator/rapp-kserve/Definitions/asd_types.yaml b/sample-rapp-generator/rapp-kserve/Definitions/asd_types.yaml index 237ccfd..c4de6ad 100644 --- a/sample-rapp-generator/rapp-kserve/Definitions/asd_types.yaml +++ b/sample-rapp-generator/rapp-kserve/Definitions/asd_types.yaml @@ -77,3 +77,14 @@ tosca.artifacts.asd.deploymentItem: type: string constraints: - valid_values: ["helm_chart"] + target_server: + description: > + Specify target server for artifact. + required: true + type: string + constraints: + - valid_values: [ "chartmuseum" ] + target_server_uri: + description: "URI of the target server" + required: true + type: string \ No newline at end of file diff --git a/sample-rapp-generator/rapp-kserve/Files/Acm/instances/kserve-instance.json b/sample-rapp-generator/rapp-kserve/Files/Acm/instances/kserve-instance.json index 09a5759..9086d8c 100644 --- a/sample-rapp-generator/rapp-kserve/Files/Acm/instances/kserve-instance.json +++ b/sample-rapp-generator/rapp-kserve/Files/Acm/instances/kserve-instance.json @@ -1,7 +1,7 @@ { "name": "DemoKserveInstance0", "version": "1.0.1", - "compositionId": "COMPOSITIONID", + "compositionId": "DO_NOT_CHANGE_THIS_COMPOSITION_ID", "description": "Demo automation composition instance 0", "elements": { "709c62b3-8918-41b9-a747-d21eb79c6c20": { diff --git a/scripts/install/install-all.sh b/scripts/install/install-all.sh index a8c518a..fa59b3d 100755 --- a/scripts/install/install-all.sh +++ b/scripts/install/install-all.sh @@ -34,4 +34,7 @@ echo "Installing ACM components..." echo "Patching Kserve..." ./patch-kserve.sh +echo "Patching Sample rApps..." +./patch-sample-rapps.sh + echo "Rapp Manager installation completed." \ No newline at end of file diff --git a/scripts/install/patch-sample-rapps.sh b/scripts/install/patch-sample-rapps.sh new file mode 100755 index 0000000..0dfa922 --- /dev/null +++ b/scripts/install/patch-sample-rapps.sh @@ -0,0 +1,48 @@ +#!/bin/bash +# ============LICENSE_START=============================================== +# Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved. +# ======================================================================== +# 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. +# ============LICENSE_END================================================= +# + +echo "######### Patching Sample rApps #########" + +CWD=$(pwd) +export WORKSPACE="$CWD/../../sample-rapp-generator" + +IP_ADDRESS=$(hostname -I | sort -n -t . -k 1,1 -k 2,2 -k 3,3 -k 4,4 | awk '{print $1}') +echo "IP Address : $IP_ADDRESS" + +CHART_REPO_GET_URI=${CHART_REPO_GET_URI:-'http://'$IP_ADDRESS':8879/charts'} +CHART_REPO_POST_URI=${CHART_REPO_POST_URI:-'http://'$IP_ADDRESS':8879/charts/api/charts'} + +echo "Replacing charts repo post url in yaml files....." +echo "Chart repository post URI : $CHART_REPO_POST_URI" +for file in $(find $WORKSPACE -type f -name "*.yaml"); do + sed -i "s|UPDATE_THIS_CHART_MUSEUM_POST_CHARTS_URI|${CHART_REPO_POST_URI}|g" "$file" + if grep -q "$CHART_REPO_POST_URI" "$file"; then + echo "$file is updated." + fi +done + +echo "Replacing charts repo get url in json files....." +echo "Chart repository get URI : $CHART_REPO_GET_URI" +for file in $(find $WORKSPACE -type f -name "*.json"); do + sed -i "s|UPDATE_THIS_CHART_MUSEUM_GET_CHARTS_URI|${CHART_REPO_GET_URI}|g" "$file" + if grep -q "$CHART_REPO_GET_URI" "$file"; then + echo "$file is updated." + fi +done + +echo "Patching Sample rApps completed." -- 2.16.6