From 5a13c2376e309387492a14722911e3c7b29c1f4b Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Tue, 24 Jul 2018 11:47:25 +0300 Subject: [PATCH] Update sdc-parser version and allign normatives Change-Id: Ib654abf209c3c46a93416516e7eb31409ed621f6 Issue-ID: SDC-1544 Signed-off-by: Tal Gitelman --- .../import/tosca/artifact-types/artifactTypes.zip | Bin 1015 -> 969 bytes .../import/tosca/capability-types/capabilityTypes.yml | 2 +- .../import/tosca/capability-types/capabilityTypes.zip | Bin 1822 -> 1797 bytes .../import/tosca/categories/categoryTypes.zip | Bin 1139 -> 1119 bytes .../resources/import/tosca/data-types/dataTypes.zip | Bin 7388 -> 7401 bytes .../resources/import/tosca/group-types/groupTypes.zip | Bin 1319 -> 1305 bytes .../import/tosca/heat-types/Generic_CR/Generic_CR.yml | 2 +- .../import/tosca/heat-types/Generic_CR/Generic_CR.zip | Bin 278 -> 314 bytes .../heat-types/Generic_Service/Generic_Service.zip | Bin 289 -> 252 bytes .../VLANNetworkReceptor/VLANNetworkReceptor.yml | 14 ++++++++++++++ .../VLANNetworkReceptor/VLANNetworkReceptor.zip | Bin 0 -> 390 bytes .../abstractSubstitute/abstractSubstitute.zip | Bin 469 -> 362 bytes .../tosca/heat-types/cinderVolume/cinderVolume.zip | Bin 1229 -> 1186 bytes .../tosca/heat-types/configuration/configuration.yml | 18 ++++++++++++++++++ .../tosca/heat-types/configuration/configuration.zip | Bin 0 -> 384 bytes .../contrailAbstractSubstitute.zip | Bin 1017 -> 897 bytes .../heat-types/contrailCompute/contrailCompute.zip | Bin 786 -> 663 bytes .../contrailNetworkRules/contrailNetworkRules.zip | Bin 675 -> 552 bytes .../contrailV2VirtualMachineInterface.zip | Bin 740 -> 745 bytes .../contrailV2VirtualNetwork.zip | Bin 1014 -> 627 bytes .../tosca/heat-types/extNeutronCP/extNeutronCP.zip | Bin 1193 -> 1201 bytes .../import/tosca/heat-types/globalPort/globalPort.zip | Bin 1183 -> 1258 bytes .../import/tosca/heat-types/neutronNet/neutronNet.zip | Bin 979 -> 843 bytes .../tosca/heat-types/neutronPort/neutronPort.zip | Bin 1320 -> 1172 bytes .../import/tosca/heat-types/novaServer/novaServer.zip | Bin 1848 -> 1383 bytes .../tosca/heat-types/securityRules/securityRules.zip | Bin 690 -> 566 bytes .../tosca/heat-types/subInterface/subInterface.zip | Bin 384 -> 254 bytes .../interfaceLifecycleTypes.zip | Bin 619 -> 579 bytes .../main/resources/import/tosca/nfv-types/VDU/VDU.yml | 10 ---------- .../main/resources/import/tosca/nfv-types/VDU/VDU.zip | Bin 457 -> 318 bytes .../nfv-types/allottedResource/allottedResource.yml | 1 + .../nfv-types/allottedResource/allottedResource.zip | Bin 593 -> 608 bytes .../resources/import/tosca/nfv-types/vduCp/vduCp.yml | 6 ------ .../resources/import/tosca/nfv-types/vduCp/vduCp.zip | Bin 695 -> 576 bytes .../normative-types/loadBalancer/loadBalancer.zip | Bin 428 -> 458 bytes .../import/tosca/policy-types/policyTypes.zip | Bin 905 -> 885 bytes .../tosca/relationship-types/relationshipTypes.zip | Bin 1460 -> 1484 bytes onboarding/pom.xml | 2 +- .../vendor-license-rest-services/pom.xml | 13 ++++++------- test-apis-ci/pom.xml | 4 ++-- .../openecomp/sdc/ci/tests/utils/CsarToscaTester.java | 16 ++++++++-------- .../ci/tests/utils/general/AtomicOperationUtils.java | 4 ++-- .../ci/tests/execute/sanity/ToscaValidationTest.java | 10 +++++----- .../sdc/ci/tests/verificator/ToscaValidation.java | 10 +++++----- 44 files changed, 64 insertions(+), 48 deletions(-) create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.yml create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.zip create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip diff --git a/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip b/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip index ac2d7c8df2f71f422fbd52ec663455498ae18b8f..3f623fc97216ed1f328e9c28016c901bcabe52fa 100644 GIT binary patch delta 943 zcmey)ev-XDz?+#xgn@y9gP|$ptWQ*Ip@Azi1H*An1_nW(Xkt-GW?Eu$Nl0ZuYO!8r zZqC}UgLzNPc=kTm?uapC-g2)x@3t80w+XoyeT#KPX37aqR1Ke$e(mosJFhY|c6%ex%}5gO#I`bg&hVndx}K_q{ZL6PyS({qNsMNZ)JC4#=3Q%I9J72 zlqAaCc>e5j!nPQ}ESKNY+wNR?EtuXNDXXdd;6(BhmUxK_6T$ea7g{}zoiEXy^>x;_ zy*J`!8q7PC@o%2QJCScEbB^X~mUOHWt>e_KzpyAwpk(u8eMaqiLB_c`%RA=hEqVBi zeOH_Jv%I3~v#)w*XCCCWU37wThOL6#&kgSBK6i@rDtjyX(j)%c^z@1D4SY6hzRxRt z;d+@bai2`tL;q*#GDSHo%i5MG5fC4hlfk;`aemJ7o}}&ZP_5F?nuY}LFTX8R5GH}kExYBKz zDNo3{EC%P~HosMN?WWS^(HUxmcM4tN^6y>|6YZC|XjQY+GF6UiM)RMb7oXxxvtk;~ z#}&n^rA$qJS+z>^%DFYWK9{ntVOX}rlIQCKm3JzQQ>|i8C!DZfktW%~`b?|-%e^CE zhB*$!T)|uB=&k<#-SYd3%SZYC+yA|$bEVUI>bs=EWBKZD4S6(=pL`ZxvgXV*JH5uH zzXB6A=gVGg*3%DPq5ZG6bg$aO;wqL4yI5xbT2ZRDbkW}Q{=-$)kKP6D>HK`siIw^B ziwAM%I6titIimOG(O=E0yxTp#EIxYZ%$j-iqOzO^R9ol2X8Eye_S}-3^w&RlX768A zd%yR%s4`!J{?|3v#M3VszqaF^VAi)lLspYj+ihyVktr;@=4eiT6}9$6NVDH8{wZ#4 zyALz(D^+-({PRHsf7g%L3ac0{%`=G#@%xSkJrm}5n!&;sB4@fwWcyBw^83BV%ujq| z`CjSyYF)ie#FRPdtZN^>=DXs`cJj*PxM%#1f6jzxPt0`-z7`wxVR^5R+P^DN;wizi zrk(rvYLIZnd28QFD3=Dz{G7O1DC7Ef7$t59`1*ye) zmAN^gA)E}%mIppZfpBRBHv=OJP%{IV*c;}XFJsQL_jkC!zAM~IChyMw>Chl^N38dC zwnDarb&KhxkV|jUe!c#zakgUbY||L#Oh);7Ht(RCni`e4&YPAQ8hWSa_??}v_~bSB zqG^+RjnX*(&C09xY}tRum}l#FTXF2A)A6aTnqVTZxYo?;OJ zY4P{flYdyKD5{<6TiKnMp{MtWb5+01E(88I#h)t;qStYlF8aGl@%opVBR7-6+)r^? ze3Gy{C~n9m<$EODv_x^zN8{M8w7pAe^|ytq^(;4-wO_q$cdbG6$7n9uMcJ+UTc_1u zTofiyvURc$qjtS0MdH9Ss_K<3^`Oed4UoG9bXqwPyRK%)1I$N_vftURrOoN7Z0UtkBmr+ro79 zqxrUAw~ekPKJ}G9x9z#Mx%j_R@Y%a(&riNOd6CFj{#l1y?u0U4=&j#qE9DSgZZ555 zrG2+Lr-zM4Ej!o$OG!h^nG+$(m!;UW!c7|%8ak_o&Obb>cebv{WQ%teO6#}hWp#JC z_hrcLyEMm$pY@Dmon}epdMQ)A1L^uZ^@TT`+E`+Hl`AVf?C#H9OkoVcmt@+i3WUlh z9q^jFF4f?Pe8^^=Lrle@Rr&Qvt0l}9Shi|L`RT9z-f#K+#pU`n_h+?Q6)wLNt8?zh z+azVlplwCyYl#J>i};?COKwYc})V8jTjh#cu6CO ig(c^)LUJB3*C`=qy8v%iHjoZRAPfi6UBLXyzyJXMU#I~9 diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml index 56da214e88..38d4c06ec7 100644 --- a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml @@ -269,4 +269,4 @@ tosca.capabilities.nfv.ext.Compute.Container.Architecture: type: string mem_size: type: string - required: false \ No newline at end of file + required: false diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip index dce4bf75655a0be1ca6eb9c4fc1af0428a77f7ed..de4aa48a1d3562210a1d0534c8f2b2c007024631 100644 GIT binary patch literal 1797 zcmV+g2m1I>O9KQ7000080MLc^Okv1}i+u(F0R0~T022TJ0ApcrVPa`)X>@s1d2nTO zE_rQi%~@NI;x-h1=T}&omsVn<~+ z2!SlLS{@KM=jL<$>=>yd8bmasYsQ&jpo689W@NN)$dP zvy$VTyu4>XDCb0)EvSNMO*OQMG)h!#2V|pUIx>fvr^e7|n}RSCr`{6Bp{1UX4svT~ zmzXCR!$ksSQW(kvsPm-|k|~*ivMZL05Rs>0l;zsF(tZrOU_zKMkbo-I6#SDj1@VMz zDA!P|Mp9^_&;nD)vY!tmQ9uo-P^u8wD4&pz?kQ?P>u?D~^gd~5Lt{BrA9BG=P?20m z_iw>R^7)VNjwWXMHPq}ov^HB;Zy#StGkLsq1SzEdvsS5+0K+UGl4;gVgN0P)ktrn= z6UilsgBGEDTXkV3(XMKD<^GyR#MDr`-m+j;Nm*DS^L;IMW&E9py{-%F#{Wh}lD9I@ zSZj)<7&bKLxFZu~o(D~C(%VhUVbc>c4NUqy*CG8z7miJ$$FL!R4VL~%%q&mmLTIMP`k>oqdSsdbbjxi*E z7Cd8Os7k<$Ne0-@|Em0;n|f24{YYh{OoSXnVq@{KSjUd9-a{R2A*FlTeL}1rRh!r0yJx#g3*y`CbzD6;80o*PKPe+~4Vi7JNPyrdEo0e8 zC6q^U?VoR$(uQPCaY;lrG8ge-29m{>+lTv^d$8e>nxaYhoT<(E-}l{yiI_#$1vP4; z#;Gin6<#NLD{~%`wVVIa(#CGM6N(8V5fN-EW#oQQ$e{|!wU!Zc^xv4-I@yK2!LY){ zet`YYj#+p^S2BwpDECuI=tlV+;2G(DQ%*|HDoB{dw(pIaKdsI$db`wTP+#s$V=RiH zsZ*s&xmGmBGHg=W9T}B-yhWJNRYuvk6dr76V9{M2W3SO=DGjolbcuXM16+=*-qHE# zB{PVsXv+-Fy@LsHy6ZZ+VND)!kMBq}rG~NYKa6(yxO?a`+mIQy zYAPaVHPR+nt*Xzr?UcU#5MS~46mQ1{$_{ahDSq~@?P*{%>V^5iTt=^FqWy}g!;_sc z<(MPAbFwk~8Y$qqt=@*%TnECPBVeYG*D=g%RyOUajo)KpvCl~j*Ot1IJWt!naa3S$ zz4fHh0~4>q3aIA@FvTHgaHcK6BdLoHp<=TO9s##C5LEQoH$dE8`=~WIr$k^yxp??_ z&P2rX*r5akfav{nDU(ya^0ReP0H6!dY9VmuhxjE&QZ5s$Vjha(P0l|4UdH~; z+v69LE~&g^EVNZ?7Slze@`1 z`#W}F+I`>Iv&ChpX<8}Tzg+7(MEQ_}DWnH*txHc4!beAbyoZ%yqbxsL<}Ay*1@>pt zptJrN**W~ccSPRZo4K~geXl2%ih?&2e6}g`tgj>NKE)>SiE+4&xCe<9TYKMo6`@7v zsa@<$>-T}@>u7W&e>-^Ob?(V~z73~4`x5aDu|}vfh}sfPy+&!?b5zaZK>e|op*;rv z3s6e|0u%rW000080MLc^Okv1}i+u(F0R0~T022TJ000000000WAOHXW0001EVQ^t$ nX>4h9c~p6DWpgfhZER3W1qJ{B000310RTY&006EA00000MR0GJ literal 1822 zcmZvdX*3&%8iu24YmL&_jjC9i(psan^oqSinhv#%HImr3T8fZZT2Z8GsZnB246%!) ziYV3Ew~VS~s4~Qe>PRd#lV@_wpGVuYmz9Q;74V!1bw&j^3~Z_ zR1J_mBA{l)32c}`IT*=%b@8H+BKNc3fR%Hwm}F~ znKHk_o8(uG4t_Se-|?&X&I8bX+xRQuDKSGa#H_T*mt7_~qqF(~1f<}EOzKA#%tt*J zX+F~BFlhXYwY8AF&e)a;I*o8ecL7snKh-Kl1DHZ{k|hlwcM}e;y{jp~vh5kJy~k@O z3#b@oiWIL-g$32luohiet^lQ1klx7Sd|nWKn}{1vm83#EEfjfbnfPb8$;eItTf8#u zqOyq)()(aVS#BV$VaZfBNWKg^7jLZgLuzQgwCg5V+q}O?ha6UG%yP(VdAKc@^QNs5 zy5r7&paj>La3Gn#-j!XS)O{XYJqze{aM?nu=OW~WTJUs?wM@4D>qo-QBd~sgh}F7B zh}`zi+r0%g{%p{icO`>~|KKR2j1>10oAxD2`)KLqVT(5EMx$X4^`|yhWjfd4s=OIy z7LC`4Sw}JT1hD9P7mLv$ybp#I!HiD!dQ98{uu6hxf27o-@{ADMo!OJEy9UeJjIWg> z(c*iJUeY6UK3%K}sdzW4>H@-J3xj$ zsl=GbNFWv}QLV$T=Vy1A0dUPwTbeo?x@nY3^&Ju1?@ks9>)O=s@G`#?li6SeA*a|b zCNlVF?A|AS>cLJ9zYmy4x@y#>G{_@Mzx}_8+S3X9OkX8;Wz;9hF zH`4Ig{sKjuMVb!vt1}p)k)^&bI)~-dspMYDkCx3dHnL0*fIyRtKJggl=(B{uGo8yK zq0Zd5%`ecoHuq;5q>14sXEC`87d}ipPmLBg$OH6G$W!VMl+!(V<<8kiU3?tpuma&x zuSQ)6>DFma+PFGApNILRvP55P;hS2HEs#@--CbeDog6oJ6}suZEB5WW-$?b|7(0yO zSn4B+dYn$%)nXqCB1CpIx~3G@zTgX#qy|o2zW$)SobqH)qCh^Z6r}7~?)jo*3l~iG zcZWnI6|J))Ul9;NgP?A?j`NT1_VQa+IfLg3U-Cl=Rrr`xyQv;j-(}(gU!Z!I(AXZT z)FWDh=dIF7Fzcoz=b-0~m7$l@+e^<>7qoT;0uz4^CJcQ~_oPzex&`k#~;Uyk*#MVi646UR9uMo_XR1F2F@M zNS{6Ib^Ftq`q}=C>2^7`B_5k^XxoC3(cH@GZrbQu$nPvZ7E#iEFzjvsuL=IBQfL4{G%A&5D$In}j!f;x zcj9mbqq1if&EL^A(OSb2bUR|Wei-k;h!{NH#*mpXu*MsnL;&HhHy>2KZ|Z@zMagxw z7(wO~aF#XQQ97@@&vOV6a>O{S(f4|Yk9%#bSM=gy$0AFBxI5>*sfpJHI=p`$`E?eD zou&2v)W;y}wBYZ(d!V@U<3;7C-#;yZ7#xb<(%;!mLsStNTd1O6bOIb_-lo}cZELjQs@H#@wADI*XU^@tI_#kndx-Zv6?$; zRMZdMUIvR6b>PFJwkHx~%aHLI()LzBhu+pw8C>4q|HeMD92brd&*0{`HAr9qC+871 zeEbB{pCkQw0f0Ml006><>x>xp|K;`f8xSD)UzHh?6aPK_qssXIr!s^M&$qV#0M|Ec Kzjfz-w!Z-QZ(aQW diff --git a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip index 897cb36b18380e8297f88e6111a1152061ae60c6..2fc617983c2449fcd9b010c4713ebea774c86ec2 100644 GIT binary patch delta 1111 zcmV-d1gQJ-2;T^QP)h>@6aWAK2mpdq%}g3(iiO()0037J000pH003iQbY*96a(PsF zaAk8Yd2MX1mrYaLI1q;K`4uWIbJ*k%!in4Pu~e#t6b0ENl`Tr8(TG`XWXUDV1oqc& zTWZN4v>lSbiShgT>2|B#k{jjkwN%aVD+Yg;ZmW$BkLeeGV^&n^m>uNH2Y6XaXPaa8 z_o_l+bsLorDtveT8{fR;?ZrpfFT^>M?0re%9v_y=q+RaXInkjd)c4 z5Z7Z`!^6CP8cn;EBB;Id8t!Ho=-RbG`JB`Mkc5MQP;&B7TD@M~Clfv>V;8{xE*=RQ zDkN^7v_kp3{?IL@RWdl=5HK*X-as<3Y>=bOM)<#WK9n$Q&&~a^4ycx!)}^?)L3Dt(_$j z9jHG__Qd&}^8DPWO4&f9m<$XJWMbQBK}T7XK@#!3B;SBxrpZJ`5WOwA`bJjUc{+%{ zMx{pGfJ;rf5t*8HurH{c7MLy74N=F0=@yvJc;m#5p9mwYBumlhEbAoOfFm0U_Dlq^ z6%F-&PGyON?NBVBKedMeWTHsI2n=si!JPRYsk?SuP^20I|EGe zM#ZQ9P7c)JfKTdQBkko!+-T&WX`Oj+BL`8!!rDk_~}+l22X9n9!LN3bwl1 z*|NvvUOQc%vmz~IbQ3p5qAE$Cdlka+w4?Tu9R_lI6UYTaZJs8xr2zj5qqF`1hsr#E ztOY~p&t#Wcde_W0{7{}}Rs&Z*s;n@NK})KuiZ;&_+4B3-qr*KJAy*DIHL8M1m?zay z?+Ym8KiaB|65eXNr)roSEL#@pIA+BdA5~Qw=*&?E=Zg!ydjb!8>8ysf0o0f>O0P4r z-pR)7Nt#vh@qoU*63>bDyMflmxDeETE}vRQWyxYW(=OD9290u^!A&w1=;HYct`y{B z3$xgK!I4Y^NCuW2BtAqBf8e;Cu5QZ-qrPk(&Q#StP^XJ41}cj($<;LniSIf?&%}*w zy{oh(s3^0jlUSSrTyzfL_TMLPE*09u4@-LAihBBPojVOh3y+_vrOG$Bm4AgdX-=k` zWY+03DJKX24;-u8{{c`-0Rj{N6aWAK2mpdq%}g3(iiO()0037J000pH000000004# d9|Rf}P)h{{000000RRC2KL7v#3IqTE008GU3~c}a delta 1131 zcmV-x1eE*V2=fSkP)h>@6aWAK2msOvuuK|ciiOJq0037J000pH003iQbY*96a(PsF zaAk8Yd2MX9mrHNdFc8P@dBpFAI7EPiJ=sE4copm}xeZ-XA$1;fqsi)6Q`DL2910E<0mERgBO+)qGM6VjxdR$KYcqMkqKa1-z zp2KH(HJWyREk#gU=QVuIFwli-gYxOqL1IZrpC07oqqKOuxJjmNpz(PP{2yXR&`=?9 z+obiBkIT2+Qd%X0^9=z511pBY98VkMD6lG1Z zXduJ1vQ_{bE;#O*@t&DkZWvEhIm>fRUi8&8&MR4eSq5k8>_o&QmvwD4#MaIdiSDU) zC41!jMtOc}RHbYnQcMPh1~RdAv?NDfltGGdUzQy(k!doK5k#>iS1Dw*o~DENXVgKf z8*|53Bi6B~XcjIffNicV))C)oxZXeihd5yVNdl=&Ei5PE|R~@}8tB1uc13-qAQ&pZ$MW*o)SXt*v`Mo0snl(8(JmTMxIN z`2XP~3=Z`B9O{!D6a9GD=o^SgHurtQsHpmXk@hxc&z+_hsaRO@(1lg^WB#ChXoXp6 z`<>#U%sQQB-K1>-fv@$p^|4P3202h>Mz_aE2z+Ky<9zB$#)M9!P{&Z^&f*zUYVCM= z%6e%gqsw?O60;J8iCTrQJe{bevqM9UJApv;+B8jOOAmY>(p`UyLuDG)f+6h6@t~!D zcgG()1*4;Wdeo#s;ycn z;jOk?0*DTlEi>~tWW^ZoR8tKP>$ z@|79ASG2zkv^2(rpf-4G9ZpLY^PP5odVWYyeD1~_UXRely*k+T?^@`^<`cGLB0w^* z>>%+WdiX8J<8*P=-!SU4_Vz?o?Ja?ZpT?lFD3e@WbCCF^GxW@Suq`*0wgeSr7IhMf zU4VuHk{;(v-Sx>)P=|c-G+`Ijo%OxJ=pPi+^S!SJ1r;HB%6C8^tt6xw{ z0Rle&6aWAK2msOvuuK|ciiOJq0037J000pHBme*a0001!F9aGo3IHGg000000RR{P xt0_Pmn(Wg7fsXEEDJt8DvnV<3`=W+CkeAqJb z;oZ%}IZ5GXatTk95AZmlVMyY9%To38EzMZq;bO1oU=@f5ntr7 zABXBAA^12=jwlFk|A|JpRlgPd?l|GGJ?3g!wCy&@8)))1VsLJ?t~P z&tBDj1gYpjg%F@ZdhccamhGq>X#rehQhgkk`6x~|3m{j-{CJlbv|Pn$e#O%?#=#eH z1P`F1uVPTqOGEJ|Fh!set-Xlu0Ji7H0qev#TKjI#u^dSM*-JsiyQ!Wendj4l`aHky znNqU6kK=~n3s{mepXMwm5uP}_CHx;i$Ch9b)BQy87ZYYVO>c(h~m!TTK>C?*70<~QJe;;=;5?}iU-}#&>%=zma&E+qA7RRxz4qs0*QrA zvRle<0gQo#ibwiZ=|YJe^*u$6ha}e}TernRxdiaNA4dR%!WSCLr|_$n(r5z{{7#;q zlCxia`S};}sehWAg!uXNZjBJ~>}T@aGvIuV+L&!dy}pNQR= zzURB>Hl}F+Y$IrAHz`G)O(ZPy%HVV!lRZ!Kf`*`~u(-%)Hp`f^h(^LM8lfD^ zOA@aIh2?N^w~a}B7iHo*MVU$Lrne#Ug00`sRh5viiXM;+){4#p;cIgF>&1%jOo0l7 z3W$l#9|N9=Uwcuke2~g7=`!~FGi~m@U0?9kvibY7lEpZ1l4Y@M_6@(tZ~>6E`?IGA zi>-^Wq|~pLn$q#Be1A@U6dO-U&VxNlV8(VJ=uf_nbqj!A2L5noGNNvc zz5r(6j-(Khz?y|R^2iU10C!HICL+&MMg#*g_&@(QKn%yEM`aN`w1^dnS|Q58drC=2 z`_ejB(y z4B6yc>H15BGmH!RRR`)}2T3<6NCr#2IQ0M+rV^it-+UhQrHWg`yI5YnpMaGTACHfU zR1Q|80Y5k1(;H!BYWWDU!L4e}jOID@w+E9B z?9LqswRZ1ChRJc?4g!wEDXW!&8p6RQ%?7)csR^2p>4qOy3yzp!AL zOx)|F!}3#=7`Ci9D|1LL3ziut6tBB2mzGX>NlXZwVQ^%KHr)yylFr8OaUQJ)%5ysu zB?)GPe0(Kx^$XM+9DUlW1sb+$ZzkLI;{IKWue^cF}Zk~ z#UVsRPZZJ2l$)xX0wz+tW z0}`x&l{Ek(xVutgCa){Va<5f|F-+4-Lto0_-x6^@$`hUI+6fCyk`QJAUyfH51x~sv zhlrgJVH`y6k>Y#VFiqbSnVT|<>N!E2l!|^ok|ZM{BkSoRMVETeSG2`%RT1$tdyE`I z|G}`!U7MnO#7m2?rCHs4zfgFWIjz$2eBFhU210cQROvjmC&UQ&i^Kk)Z38sua zKPWI34j5UyZU*ouU|*#Cjgp`xj+4hcMwvrJj!ehK3O|sO2ru)L#gy(k_H4QobrmGw z0KjJq?JsbEJJQbwk;dDIc-yRT>TW+*Zd0FQ<~ReBCN~64Zw1vT;dIB@NnmymbkICb z??)kgrAN(%ja&Hj@x?*~J&g#Ct?_oojl3&*Ky0ByR2>Vmbw+RuFhqjxun79Hln#(# zoQLB)Jr2CQf5z!3oz&-rs}h$wD!>H*IoVb_pv?#4Ljox&fzI)p`l9`df%O;xDZ%_9y&3=WBp@-Q{?^r5QuY(1lP z&t;R*XdzI;mWYpP4)~xW765**GLKo!(N^*;$kJgc(LQ-1Z*`{g5TTmY0$A2RnT-sh2>z?fA(H>#y~Zkg)8)-QPk&6|m?djJQvKbTS%Y?y`g7;? z2lDt0cL6B{zk0@Di&r~x^A1S-HxJ>CeiG0{=F2Rfi_BxrOdM!kJ1swi*4Fd$ha~t6 zqu+Ja z*`V(-VJG=+Ys32d3U@j@NFC%@NBeuNZ5s?}M#$^eu7MlHsqeN(xX)vow3SWGCv|uf z9s8d27HR}OwwLo&>l=q@{#}mn~wMg;AI*ANob?J8TC z)8M)Q#$P_O`@g>Wi`e7;YG-#RKh8ySN~FPi$z1%erGr8rKP{x?nO6$SBMZ6yw?y+X z8q&vDCaMY!1zBi`78V+6P&M{6`{JmoK2tI+*1A@fS+A&)70PIC%gH;Yu2-Bjv;x0U zzjRVv+e~>hT=8HA!Y6tMtTvsH_VxDdYII_TFl-G@LnLpazFw}*uTIIwx98XBzDk`d zccu{AqF$E$2P7%WatQ5H=m1n&$*rHbw1#p(^ba9Tf7HdPY0O*M8GUmV zdAl`~bL(;b^7QOew**=$ zQ&SV$gsnQ{VGRCW&?pxjyVjLJptA1@aC3wSa%xf9)S@Nh6XEAsehi8WrD5&n_5j0?x=_@~0ilZEyevMo(3J{%@; zC3SZ&Dy#20c+*Zyg~Zzdzc`-rz5~etM;5zyi=Nq;MvHv`Z#Zg)mdBL}1Mf0#t1+on z>Yz!|m9%Q6P7$7DP2JTT4H}>TkxFh;a)s^LjM%pA;23Pr`mh}|Nf5T}Iana0TI^7t zIZ+^I)`6CV!JCMnkgC0(nzU@&RP)Y~?R^G=OX>Fp8r9mpG&jfT@d_q`d0sw$d`ij> zFU$`=n;%{pA6}SaUc7kxsb9~Q;$3WOt~|u+->%M)5I#7uV8E@04PINyYtcZuSc}WU!Uq5G z_}O#d=YLA@&racs=f)S$pNRP(lA*`qkenDvEoU5}^XhteQPBafI;$(7c8b@>ExYNL zfl^^}ijf2a`XRLh^yjdMXD{&MWAXWgq+Wu3G&RO;2H|R|m-^~)F*N+#c zL|;Q&+w_pE54W)q?Bj;MtA_19xd`JTXx^r(MJ4LWb}M%MQN1BbmiMb$Ojk6bAR$i{ zk2QrwM^!J6y?qirIDG*J-7i+s7{2gy1KHyc_~YuD{7udv^JtjhI{%OJrJc%mTNV)? zZ`I-eJHc`ElgGo#@-d{*tXZu+08|&^os%kEn{#UBRHy*0uEithYC1EA>pGF6E%%@1 zbc3cm6aTSVa$aYvKvVb$!k(TI0pm%9?qK3zm@G``;o1GNpiP_0~fTS+Vs_cV!=P+JBZ(`;OKm`fn zHK^lE6BVg;7td6I;3dKj66@x3@IL#)g*^D^!*GKYFCQxk_J)Q;(g zvWC=_H^e@JejFlZxU>?bYI=>en$=h-Gf~hlz9?^wDr{AfaVw-^mWV>1iAlZD-BCie zXQ7&=7EQ=AYe9)3lc<-JH1Ic;C+*pwz>URw+0VZLwYsJ=s+Ey?FTqaJq%LFQm~F>2 zffgpa*0l5Oi;;RGCYg{@Z>UC}M&cAo(AA6P=N5DcwokA{{8kbb^Ncm}Ic=4*I_CDh za^fE7OvBb@d7M4a#A(>0E|Hq(PacBZNDpsv%@#xrW%ZI-iMC9pRUI{}wr+}Bqddwi z8YW9&6D)yYy>iwfLCvx^`I5Coua0)U2c+E?#(sWpo07a`(b#F{VHJAFRf*u-e8NIt z1>VM^&X<67y*bK&2bzFonp2oH!%Ko($$RLF;QGlcYJuuijFva&7=?*4vqk%Ij?KP= z&FMbS&BI7)&uO^S_>Q(j}NVP3(QX;#H8T%T^7?N(_Dt}vG?S%3i#E<#7qM^lEZ z+Gwjwce8wz)e}YN$1#0#6Sa(TX@=faavo@Ubry8w8x{txsT)@{w&fbWR z&X&z`>$TW}HQqU$stchv2a(97Q?&xOR z%MdM`h}ZcY1rcwYj#_ykUN%^_oLx_CX}0Zss$q1&&+tEI#qK9eHwdL`LUXw-HP};n z7yR<*wb&4}>DRX^UHyW#8894F6IzT6EN)Bt({fu!SeJcJ zAWT@lPTQ7=aXbATyLk1_iZ!IJZw_!V3W|{zNwMNlWR1BT4FULtULs-ioNoZHtGQ%x zUb#uT6i2Cx@uwuX$3Vg-?HgScxlELR4`0Q~Rs=nWk~D?TIcLJ>8)fSn)E#dEbkTJmxXrF5x2RLW67aMGs{qVqQ1 zV43taIP1Ds#U%L&B^-G+-Ag9W#wf=Az?yrED!?|Gq!Xt z!*KId@c!SaxL5Z{Z_Bs%Myj>fZoA@IDIn@u&GFreQGqp%3}!Xu-6Bj(>60`j7TW3W zTBI|i|J2~tr!Gc?FG_}rb|IvfeLc3yR7(l@=b0dzI%K8hMI1%g3Udz;;Rhv^6L-Oo z-h-f(eN&w_w9&T|#M{SU4>~2gBm_3aLGeO}yAt|Sl4Pt1V($(n_@tHh4vi;XmL0pz zHYBIzw=CbBKYI>-%ZtU!#dDE%w|Fv^WxNFdr{qJ*;O{GzZ9mz)mQdvCis`w}wH&{+ z*Sy>2WMA^ufn>XgWh@=>7f`uW^=(mTO%rG+xCpc5T>e68l@ufaX&8b6p-! zm17=>p%_>*&IjQ5XU-P?z}KE$#v7|-i_D7`FtD+sIj&mW&m_{}`Ff3=S?=GZ=TXk} zC*97yRp{f#$!OYA1=Pb1G5W)y3-}lmt29QoO}3_(3pV^Ib%g5ZPE{FY`egZi@`3NzyCOdZ3SDv#Co-XL51n}Q`ENXb4^hgY84fXVs=D-z5Kjn& z)+2`4R`K_EI>y)>AZq6L6b9r(rv1U;&w3hjCDi{cx{`p+1;;JrG;f{3OoAB3;MS)I ztqx2CnH8vKWU+YOm1eekiwD~`uuQicU-F&zrFBM#T#psx(N~-6U$FyJ5Vt*i0%$Nz?Z|OI z>{#;uA*E54&{QO3k3gw@EIML@w|Hf9@(y~KUvER{2ITp$sw+G@W#zICMdciigWP*I zw+J-4=)^oE8#Rz-S?qIBek}?r?R5cVqniG!a$h__MlbB7BRN^c8OJvzEXNX7Ucy!W z#bE+CnObA+d6stenx zHFu7$GRAlwqU}MM2W1CYk*~$qhTd)mI@VbqN7_C|Bw%!5d6deX4oSub<-iwWZ3mS!82*QOQ8jM2GX#<@^{``yF=_+Kx}L)6zmT)ByU?o}K>yn}Gga}eNLeAU{T4+&yEQ3Y38Ltk_U10jNEQ0xqW$aF()ZJ zCYSIwxrNt>8-^s#H#8NG@7#=*k28Rh20KbtX}mo;3Zk5@X$sKAec!$aTHta?odocsSe(-fb z%(O?`Liz$g_Kd9DFr#=E;J>AjgD-ctM4DD^5$4ZG;%3=>ocd+k?q+Z4WA?1}5VWF; z6!rsBNFSZd+t96xEjs`g8JLegn@4fFo`JX`>c!inBFkl*=2tCRIB5D!3i)7$}r*;gaH1rN8)j?dGA9`RoHEm}4h5n`HM^S_H|72Efm5P9S>vIaUP z@Vnn}eLtmHM)xcMeW||Eck#+J7#X$dI3lzLV01I8UI8x0Nn-1Ij*!Ot6xStPHPu3l z$#CC`BY@(<4N2uE@YG4&XblK{A*Uzg{EII>`+~gbM{|=H#dnR8zg z7pX^|856|YbrNJn&(U%7C!+V&;O}L07rUvCUV4FQmby5o9C!Y7k5?P&=8Cg9x0IzD z=!TMe(d^ay;?u=aS{z9LP*zvPhS_$hViU3i+dJH6Kwbf=ck|e$94ydyak@zoOtl$j^g~mXNNuxL*1H!+Ftqm11Xk};Gv?{4=lq>jJw_H0#T1X@*( z=D;fp9!Rhvm)~D3NstLpKAHeSTzlvT8GG78Vi|)V=pkpnJD2X>*~UKAmE~f&J6Bx{ z4Q+he{$SsXi)tYN$QG#m1Yyxt5q3NYfuPExEOcG3WHoioxqLMzAF+WaC3Am=8ko^7 zDEi0$4ZaybCxdvnnGI<5Mh`$4gd-_TNq}c&jzQ#wg^wdAnh9eT#uPmr{PXWFVd&2& z;JV@w9rTEjndTH_{FovI*<`JclO`*5UbK92eH29y!oeb4x@wCo0j2U9bwkon?R;`+XfvC`7 zv6&`EDB3lc+r9f}ANLN^siiCXfw2tVQLKAWtD0g@#FOfc&!_ZsAAbH}_3E5mp|)r{ zY^nKmoww*72xeBnLrC?dxMVE|G+E~x^eh5-)wy6?HPQ|{M7mBX^kC}5sRO_;mH3oB z^8!CL5#Gh(@|6WuLVcXTXr^MQbjERRymN1um#O6=*Z{Xw!K7W>dkwIK3zJbJp$`cT zF=d>JT7b#Bz3F9{)61w=q>wFkM9ilhI({3vYxJDF-KQcdWI%}oN@5(X*-aY@7?*fJ z;?^Kj_zOe?nJpErzlGEfi*TGmKePtz;!OiIl^h6R@X;@5lA|9({~l)$k%WQws4J)D z`20hBLpTf+n49OWw;3%u@H_X^SK&Qmn6$@j-w*IVH*8H)NzgzcTaf}XVGLbw#;Dr_ z<6$Kw$C}>-k&kP)yC`6*JVv7kHexS|0Oc+&B43)6m^s_?YBVf@CGK)JsRsUl$;&G@ zqBz~U;r}MyH}>nI>-83$T2`v|-Me^HnJU}|`3AZzh07#ndd0nM;I}(>lf=Z512WX4 zULmRE4w5qaHh7@^BC#Cnc);>$nHX+z%-_*Zy0N!Wz3w*w^K>#wqD@m4`m&GB>iazE-t0o^&fTj2t>OE0u4Exy1cvQi6V7woJ)^O~=QmD!$jdqo* z9SCS!eJniVfF=L|h(A=0G%Z5PLhGdrF*H@AE+Mf(hs&7Tq|9%|?^R!VXZleDoO=2@5q}@b|E@dMN_H2Fe3y`_JKgJ$| z_@U~TI|fDZii5A{_xpvQTSfv5gN1Ys*7+zxE7{kz#=ZyIV-#sAUA-X}v>ic{iI#H8 zRhL-w#*tR~M3n=G{2_`u8yP<^7-ZQRyGbs#G355vkU&acN@OA!2&hGK!kR-aO(bg| zClz}E#P>d%x3d|M%8T-s$7!}rXaMA@cDx<}h}ycjw*fNm9&t`EDUEuChj3p#5jBhD zb>Y{q18*yDP~2|;OdAc`&v~PA4g}P#R)IIjqsT6?75UE(!FdU{ym78PX)5X{ovr(z z+BKJinhbx4oeqtHZL#I^n5fv^(Nty>7*qpgn2`?$Wo0ZCSzB3`$kXZ-FSx9mEM!*r zDw&A}D4S(j3*Mf5gsV;;zbo72=&=sONOynQFqH=?#iI5jack~}B^?^f4U#EUyCK#= zMl964iKBeD?~2DnR?y95LzTGd(rVCs7RE!FfWEi@H;%Z6kP;P;%UcRt(<20tkw-wu zK%2=N!l1y6<)ZHn`r`^nb3%NS7s&VQrg8ykz?`D)*vA!BaD>C_%1_8QshnpzIo&3Z zCp5DD8wEzqJ#PgVY|zZ&4R-*nPSFRhe?}U#z;M^}q*lL4ODS{?XD zCTma{61I@&gjst7^+y}k@5~yso79^+uP^iXdf@^}3ZBYKB+98Rxj7>e|NDz@2VV*3 z67yx2PbFrPH4_b4!}9GkvaT%Z{yPLdK{<_44UML-*@Cz8-U@DvsQgz}=d`%63A&nl zuSt3t+}D4gmx0RvQZLV0B79t+%VFq*v^{cj84w2}3nvS<3Enc!?%%M6WNuqKVMT4V zR>+{DVUEps&em$?tQQk$)vcGx@or1>Gz9(ssX7~sUCe~?->wboi!1cyU{mZcx(-r< zuKz`C+u)Q&UmjK~wPR}Fv?=>f7YVoYkcAPILz#6xsV$=DlplYN0)BT<&O5Dd9G1Dh zvi%Fo9$%js7e0#j6$rlf>xLabg$D$T2r?R{ST*~@JWe+b8@F7>T@rMGOA$ z>a}r<CL?oszvLB}sRW)|y{#*c+?M=(uFN0@IUa z7mkV@>0%NS&LdDbp91%C2&%a}aY_w}4Bn9Y@&iuL0jHH_a^83M)0Li!P!xBU4zsRR z%hGl@fkA)0;GHDF)Q%_6qw;-pQ2l@czB}2*dKb%Sc+`&a*y;?OIGUP7M@?5hxzIf^o;d{-uo%7@0|w#Xlqq~YPRR>hZ1nU}J$JcIFTM8^tC zpI^MZT6TUNq2rSXt-JXlYsL<_1JNS#=1CIW*0E0=f&1!bPLdGBw~0faa!cI?Sq5^i z(7?-I@8cr$!Rd;_DEKb?Rgo7dB}{fKY6yuq?FuzS{V=`&#+Psg{@2gGWMll-hDS}z z+2NEZgIBzB@!ysc6l(2J|O`wIFw>>60S4^IAv8| zshLf0U6y4wNs<-H@v4G+A9b_htZ5Z^Yv4#(pfYl9J5bkIiVMU#W*kW2mhFeN@pX=!;lR|H0HIgm_QFS?5JfFW?p3f)b`P_=< zYyQ`Y;SN{HUUSy)ev13BO24UaSa97Kg_=Kc2~mA=|iV*$)=NZyO1=&?>8sI`A)|;=WF@V@R8wJ{iCnKY)s{K7MrL8AlD8PSI-hz% zYR^YedoHQ9a!D|4+Xdi(gkq2ON1$qn069X{N)CHG4DLiE*W!3TiBuljRFBS*&0_|Q zL#O(+BI9sUFK~LY1Z05c^V26ML|vR!FFvbYd|tUYJFQ-vJ$ch_XAAZ*v{fJ?#Ooig z<|qgcf>`ilUI-xx+Xbt(bOxCcMd?V?Jo%1>akMUHXAGd)ipEdW3waO3;#jN{f*wCu z2f2*-mIA!;l-KM4>0$+$Q{jVuee(1a`tvIe{^<$aIIY|`{TT7%OvXJ_4{^jOYL0P8 z&dck?g^~l?>KsHp60f&gbjvTJK(KEtK#(6ui$gy>fy*_k;3kDXl-y?6Nn4f4ELCS$zeh#LnI z@ayF@`G#ZQc{EIL%|DngTBVHJO(Wvru3Bi&E^yZR<0r$$@*0v6lV-Jc0Fdt**H5Z+ z4bEvbr{XfuVp}|dF3|ySz2O!R8TxYXliXdSE6?zsc26GEx|NZ{$l(6;gfJK%D{_Yu z2g8!7qb&1s966xN%FL1+4lb6=4B>w+zhUKAB$KL!UjE3sw`$9?pVzL=1%4rVBZ&ry z$lU3OREMq7Kd_Jf;`Z|(F;NNyK!oJ@JyJdWFI&1S)sFq@Y+>_y>}$0j(<2aIs1$Me z(VEfOO({B+OMgebYqnTmq6CT)y_uddLcmi^d)rJ_cInEr*`Tw5HNPn{SFj9tpkb)` zZG&<&l1NPq+1R^RP*WX+?G*ZRy#7Akf*3|in!N@qt0DCu*`}riP6Uf`4*T}#`%4mX z^w1JAZjWrK45=#D%q6k)%pv1tMB-3D?Lt48HFR6@hU}a{D5D0-7;BOw^@5_BW36#Y zDW_6hkp;E z=m54~vDy5s6l##w#HX{M2Seqgf%)E8Ic^NpmLXuZiN{UHK%IfOM%1Wyatw8b5uSC; z7R(w{^-{GGZIRej9qm_b!Foek9#tzEh6ROLi~gy@O>{q?uvm(Ztj!ERY*EAJn0(Yt zp(HP8WQum0t^)aTVOoB@rMI8(uI#Is$=Am_z8qDBM>AHYX)3jeJ`$uW-mxEo>lH7n z1*%ptwtqRNQkcjyTkcxdCR)(lx@%LJPb13FpTyU9DQ$wZ`HZoIc?E4ug~q*#-gMno zj*Fz-E7{NrxOBw=9bk%Kauqs=Jyvz7VU1mN>3W{8^m^FlK(23UA$ND%MDv-x8BKTf zYgzv~;k1PC*~q_XGSW4tYfj+0=X%WA-$Ip5-?{^;1SCY*CPUQ)2@o)|XB-oo)7e>C?vKoNkOeo{a^ z=?tHX$6LD9dwr147m(|TvhjSbC^*Md9!6difo~cGN{U{?0WooE^yRt=Ipxv21^7-R zDRtDW*x@t4-i;(XhMol_p)CuSDibwYt{F^&;Cvnf$^(#`?l9Dpxm-8m>hJIuOu^NR zN3;!@qS->^YFa`xT)kLq-L=`r5L8=08(ecac`I5EI$Wh~~tgGGZb+q!JrgIgnixk%dEhcA; zfKGkN*x3Pe$1A~C_lTKoaMH+iwXye#e@B=4<@c2@+{C>LLMZ;X=J2?x7suo+W%~#) z7=(3NAW(4wBOd#3fjmcCv#JS04Yds-l`J?F!Fq}bq0D+KZ>6Rr%%#H31Hm7Fs=ul! zWg*rG9Owv$L$@rjQJ+wrQkei@yDo`&&K2E4M;h(Dtm}_dn`<^8?Cq-5jte>h)F!kT zJFvJ@{zrtZR^Daj7XTCachbGY_@4YVck^mt#TruGF9+y21<{cgNwEwfv{!3K0CAy{ z0F3_i4e09<7cb5;DDEJ?h>h_l#DBzzgh$@A8(xDX=!XdnLr0*aBd`((&Lk#j4i5X?v@b9|`~1N=yS>!}{!&!NBeiTGi;Lba_qED_T^? zqh(J9s`DaVW0~}I?6b2fto0}4aM;>(znH)pqd3PfDTw$M=bM)=o<2P#yV?2d=~yB5 z$Vb!xsH{+Bk;y995?g!ONJ_Nz32*Hm2w>2BlCY-IKdt@}e|R^^+Fj~b%dpGr{h=&E zk;)42;~JV_gVYLDNw?j_@;QMk4?Zn!qbQ63tXO6-Q@+vi zK2ikiP-DYptwK2ySx{R$C;RJT)y-POOalc3EslDe*JqQk6eJUHR4s30XC`6V&=g2X ziGHoO`NkdGC3r&MH{Y5rR`s2D<&^mKMsS6jSG`u+cbQLPVZq)LfW|)_Gne(<&Zy{2y)eiTBQl;iHM>`!@Thp?phfd z;Y7QSG*zdo>J58_wbbiplv}ywlCb3jlCJZc_@suV}V;(;nM|ETdQ0XGmAP z{i3xpz7;2IJ+3cXwmVf*L4s|WH0h%3Tj7Wo%T~JfcW|4ath;EFmR-cYh&^_6vdpYD zUDXbjH)Yc1k2o?3HN}i#8^8@ich0xHo8ao=@cTH++1YGeEXt2I*aX6OD&;0N(zGr* z7cBB?9WqpE*f7*D8zMTBhFwJdk<-~v_=VKVc-=}S&(gqddhoQyo$h+3ebA@Y;d})? z5Y+Z%I)@rUc_oj2Z^p-7oES^j6;K^KPDWms0BQB9egSEC=s2sPP9=`Zuu87CYDQIM z`q_P$0LpPV&>KW!N`BlML-Zry0NQDDTU&jHYoIV9nGnXixd+!h8jc^Y0qQ)2D4&09 zn=R11IwOm#nbpXx7rX4X-+-e0nB2lwXp8_MfrDab&YdpAZ)w2BvI!uD zF+}$%LaPDebIlUeQ!<;KzAgkvM9aoM~6N-bJ`~hU@oO11hLn&ya); zjBCJBEsq_--bdxv7`f_5xkHdQh*-qm*DR)b9|W+EJuQ;=gB;35-WTdMSi`;h_`c9* zlx@f6(;ojIGz^Ej{P-TVCU6ic1|=aZ0CFnt$pUmUDp+I>r+oelf8MB#?9au5FtJQ| z=x%(+{Qy)GKBiY3*6snJ%Wyl>)S}W0ev18#?}<1%yI2V z|A6OxV$3U4lwbX@LM5hge-mLR;nqh((EL_WxB^`X!evX5z4@h zjyp>E%I={rLD;O9RCOPh^s#1l9XE>J_NuMeJyv9kUjxVpJZ5{|V~Lok27IBVgJ$Ha zgIa6d(xnwL^_}#puEs^RyGI8Pt#a}WY!-tor~{>Ki6hp*I}TInW%xE``gC}{t=M+c zy8wpe^igc{7xre!@b}bx2aMWr>bV7e%5KE6UBFiBotz_K zg+)1}cH*Kv`=N%06zi%X{Ds5)EueI;iX8s07{wc1%)aopiqUL5r^jr{Ub<~|rzFVM z&zIxWa5_P_q(Mks`XGgu>wyg0==9)qI}z4ecC8-21IBqI&wJ5@*J}aoi`t3& zUZ-vCh>RRP89LS%x7%VWqe++UGWI99j7{DQ*4nT|s9|aD)fqH{r_SJ~Eb(vO(4ZUp zbbz0DmjoQgiCg@bWm%ue#$lih*?>5%@7CzrsG;YQhNORVY}T6?=fWOwnC~E*c@7GE zhu;Nz{s8%M+>oH%pQaeDXzt?6hk~ySw`HWDl6%cw8J1#azp#;1h+-TvDbOxd{{T=+ z0Rle&6aWAK2mqUK@JtZR^u;_J004{1000dDBme*a00000AOHXW00000WMOn+RC#b^ zb1r#pYzhD%000000096P01HC=()1kE0mgJQ%Z?1^@s600962 O0ABzA0B0Nk0002HDJ^9H diff --git a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip index 3a26c09f43faced766164709b390e9a2dcc4cd95..d7dd67c205ec9f2a619f9b0c5ec83f9dcfb3c267 100644 GIT binary patch literal 1305 zcmV+!1?KutO9KQH000080G6(pOu1LfIGY3j0P_z301f~E0B3Sx}sb{IW#5XXs19w0qz}B1vAAo{sM5cXbLX!=z}w*3(TY_k#D)g ztX*}c%_`G1D&)GVTjFbEF8e_LQ5b(rB?J;h9$2*52UU)XjQp{Pb%kVL&}wgp2z*}) zz6NHHN&zYvEUPdD*?>l=YD0{S6I5d?D!j}~A#t}x>x@vV=Ftv(pblX{i)O9nf;lAS zgefdU?mzCJhJOaXd10`i5{<{^Aq6;3?Y{r*)2EN0AFi*?#(*c%ilD-?`w>rk0YsKQm||7WdTd1&|2y(hQCWq zB+>>+VfMM!6<9Ja-4seD?ekOIlzB>+OSVMW?5TsJJOVW+=UuxRU?yqjsi-)7a-KiID&sU+o={82 z;i`WOx=i5ni)IYKHF=D37RXPa_NLYrp)cSE%vKpp=7z#9u2nGsZD4Z699xo5;8Ie7 zXeMvsf=Z~ouS6&snc}Uq+B$-#tX#lNb!uwoidQ zokW3{I>BVlwO8)6%8%mqGYkxx%n&mN^br;8nPhRnhDp*~)kv_>U6;}@wL*H~z9Xt; zbmPWFQKY7hUu9jQn-Y|6z{pQFq6nL0k1%!0rBNQu){ibW?1l0tB~uU+ecJ&p0xwbI zksaya%Ov>Q7P+C2H1u(k9R=Fw=M^S{##>&Pf4Vcmq9QwUD}61qaB-6#o$ zKGI^*7#y8(>x%Yia32PXNOrJI;~_BcoyE-+1ZQWCwrf;?MTy)cnWWX}j?#`GCXO%- zMCWN;QlgnGJrNNVrm?XN6Xd=^3b)Pw)Cyl&{J(mp9OVu&pAE3!55lsb5QF0Ah#9*v z42>)uic`3LB9U+xR?q=Ei2iUrdmy*3YDr^x(+HC1QrJ-`6|0-y)CaT8Enj2Brajh9 z9dAPtQM{YJja})>dREsbwB@ECcu@*W8_Qxeg~e@5oVG4K7pC2Ric23F)gC~dZ5_Ok z+>tS8^LVLc&`on1z3^(1UV;4SLZxgrfH!{=tv2=9{zaq-%KMYt5eF~79&Mv|_DHQf_QCbc$n zh13Uchf&E5cyh|u8A_XEaHL))mK|(jmj`xvVE3=^sGk*~g**XrP)v@1u5m^cPS|0Rj{N6aWAK2mqF@m`u4> z%Q%|^008q3000gE0000000031AOHXW00000XL4_Ka8!A4WpgfhZER3W1qJ{B00031 P0RTJz0074X00000kgHKt literal 1319 zcmV+?1=#vfO9KQH000080LXr9Ou1LfIE4fN0P_z301f~E0B3S!rw6&Nj8r-dh{y_W%m?(y2NqYvypVM!0zM;dlYh*$OT;HGvhk% zRc326C~Z}5iLX(F>;?THGx?1owQ)U&HM({5<8ar&!yth(`fW(|Im50dv z(GZm%qWQg14hu@rHJBFJAT(6&4?2VaxKBEgFsg zqE*W?NMJiUrTjDDM{T;aR--Vx3i4@XLjeVA8`4_u1IsP7G_S&@Be#q#x8vL2;zm@E&-rQ>kYFM}-^ zoC&vW0BLE)nBalt3Dk|Ntw-n+xR2Q?gV~uQv!hc}%)mOBoroYV1sNV|N)X-bL3F5; z$@@%{p_WmN{Ea-~09>IvI1!q+99UIN1zku=WK{Y@KwR%600%MX)i$NTp%0=!OoI|S zm$otCu*@0v_dR3=+sF_j6Z)76_Dr(qa3yp@#9Ilry6ZwZVOB^V!Vg5#wr*6oC<@Me z$EU0dbY6n735@5-l`43XOb9E_i+g~w(JtVE-B$jjWHJ&emc4zBn3pPYX2&}CGUNF+ zdkC}B>slC3WuARa*j6_c=5f&OoPW0-SbJJIW4{>{r%;mS3s*&it&(6kM_MdyL!dKm zUC}<}=_6nn$@bec9Rh>7vphcmp6nu6mlWVpqhuUxy^~KTA`0BX#J65cT~PYmj`T!C zRhZf)u7slLtF#K6{HHZ|$Krq22ooqa%X~4wg3pBI!635Y=!h9lV;ByycqkH)(`yom z4CKKF?7;fP>EeQ>eN}5}%Y#;sGS|wFQmI7U{!evqo7~GaRw50VX&z5Fh$^1WpTw$g zS_kO*fU=wy1g}auyVKc@aVRWbap1Idd0n~f{xecHR4976IV^VHNM6%muyU^2%$kr(Djq~4KH+`yxHR)ofJ2y&P?AEk^Qh1&nn_+OIbA3kbj;-zy;$2XVV&%-+} z$uRhynmh#ZCKDxioTN26=4B008BoUf2Kt diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml index 85cff11c2a..39697c0b68 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml @@ -8,4 +8,4 @@ node_types: cr_role: type: string cr_type: - type: string + type: string \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip index c5dc361e070436bd0d71c345f91ec82cf48aa6e8..092393278d4da67e56567a61a42de6c2f035be68 100644 GIT binary patch literal 314 zcmWIWW@Zs#U|`^2=&s1{NvdFJodM*DGcqvn0crQtywsx1qB!v;Jo z?;HOd)Hir(di|e*yuiA(EY3NSo}5p(!4u4f_L|7m3xi{OrNcoxamNr&es`d z|4y25s;^+@mcz_yGma?+J6u@3;LPI$o{woO6Wsh)Mz}3(wvGBOl=}RtSDcav%I7!8-Q3=L_H~waT5xyLy?q|bWd8?W{pY%uF~FOV z$({k1FI0g3009LsiS8#Zs5m2o1ViSh^FQxyyUggi1VTGs$ho<1>Sdt$tZX37j6j$G Jq>q3&3;@KfaWwz{ literal 278 zcmWIWW@h1HU|`^2kZs8EY5uTXb_S3q$;iOK2c+Fo^HPg4ljEI(^eS_6TKf#S4jb^e zes_4cKzK&U*;~?2m=0~7n$V%Etl4;PU!j!O^dR3yuNQvrHLd6|Sw2apFz}A&mk75F zpO>ay)mmFf4 zsPa~%Q0(0FCr)Z<)yAQH?MW|y1<)fvpr8Pz(EJqO&B_K6X9PkUAbkX^2mogDVnF}^ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip index 060dec1aa1f7ea9c065a28c13a55cd4049fa72d7..e5bcd325d28e4fa913bbbd958542ccb6ed0db126 100644 GIT binary patch literal 252 zcmWIWW@h1HU|`^2XlncJBh)^FwFJnU0mQ;U?4FvJT9la_ADmiLmYJNYSDBlm+v~{1 ztSG?pzN!8L>!zK*dTJ63Zb`RXoj9{|!+w9WH)|KH)=bu&srAilmZ_W<_ab|bga0OP zv*W)o^S2}at&Gok1*|tM7oOZL5OHs!Ivdw_N!C;HnjJrvs_l%}Q_{;7xmKa|wUATm ymR7Ib1^a`y|41==zc0X>kx7IBw=;n*1p);HFon(00p6@^AW23bbOh2%!72feol-&o literal 289 zcmWIWW@Zs#U|`^2Fo>Jy#UN7JUJB&R2V!9$c2CVqEy_%e4^AyA%S=wytIW;O?G5BQ ztRUd>pLu7q`h+jnlfN)^U-cARq`f;@ar=73%6R6_ZHCuGG?Vq$Mm$_*qG07*P`-5O zH|COKRTsL=Ze3ei$aeGQ!o=7)$v>;!Wq8Ew7T5T%a`1TntRpG^E?w15nbPv$S;{2E zRE5iWG4ofu*BIX}$@>@J&B$cWfXkgKK$n7m0+__=YA&cGBZCA(GWW4{eFrZw!sv-r YVdC9Det%rKxj#BObn)wN-e^ec^Vk78e8d)3+qgpE(uS zWEzm@>oc*1`OAvLJtC2FRyeFJ=V;E9l}X_LE$iJXz}~;`gxi}-inpFTnt0Lc_2(rV zKTluYsAE{ywQv5#Mg5D8s`#x4Sb3Z)Yw9<#(&{p?&dq0}^5ahSUOl#@a@K-Nu8-K( z6!`isSKG?|sN>YJzt_~396Gw{`K8)3b9v;a)ot#6^bOqAdj36EW*nph- literal 0 HcmV?d00001 diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip index 2c38ab43a1fcd7426555b15f7afb1b4a3254e689..48d1908b8a170af6b4584fe3ecb6c4b3d14330df 100644 GIT binary patch delta 322 zcmcc0{EA5;z?+$ci-CcGgW+J)cOSVO3s2ku^6D8UO32j5PB`y(*nsEQ`>DV9Dw{H5 zs-2nE`AE-MJYmP-AnEjN!I}B~vqY^XPX1r>?R)VQl?w61BQ0H1j_4i;YCf2e&3Uep zsr>WjC-d$cl>Ma_$g+GpkI|R8hDXG`C52dKZB7-?k~#28Kk%F5TP^Y5dzL;AV!pEI zLR)X=fgKJd%9r=d%&S*cSK6Cx6wVxWN9MZv0q(X_j8o5R?+{dH{r6gWvk>3^7mLF0 zpLlCtvGo&oF#opa?N8R~9xl0gJ#^858C(CJU3~4%(cP0CMomz>mc8RZ-1JwmOZe*L z`rj|_zdn86Z^i&`MkWykY+h$z5CaAQ0|Og~P*9j$&nP1n;LQr=GBPkSxB!I(7(tQ% DhRB49 literal 469 zcmWIWW@Zs#U|`^2_*~`gC48vqsWKx2Ll_eSgBVaWF{!wuC^5MtxD?39EGaEX)vL_S zNu78;@2~>TvG)@{@!2qDt>5YUyFBJ(mygM%Oa^`T6;LoAB3b z7CU~uxVhXTjZMX}WYv-r?S%}*+Y=3{HyiKX#(CgcPbVzmy|8jQx8bdM z{*z^F{CVCx@4E4@M!s>|udV0f-f!7qwLtFg48<_%t-n?zEm<`=K{X{x;+Ke1*KEyc z>7A?PTV7Ur=3DqRY<~YRCa^?qU2alQLd2(~Ru6rb3o3Q|ULmOAd!u>VRG)Oqm&Yr! zv)Nyy7d-3Iyb^nDQnFW!iLw`SO1zbxBkS2e>pa~O4$N6Uk#l!_$xm~!qQ9)uOhaev z;i|nAb5G1zK7aMy`CIe1uIdO^J@oyF;2fW3;Wh77_Nq^MbpG(e#}#$8nX}~sycwD7 z8E^%x3NUCvKmknR3T7^-JR^eygX84O$*zr;7*kE>miPi`rpDOQUl}ej26(fwfec{; N!VDlC4vaho1^_^=x%>bC diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip index 8b9a455c54828fe27b8233b0f38d383236f96f9b..be5bf9d01f97a636087a973bbb67b706033867bb 100644 GIT binary patch literal 1186 zcmV;T1YP@3O9KQ7000080R4jZOj82Edmsb=0Dlqy01yBG0Ap!xWMy(zZ)|mKWiEMb zY|U3qkJ~m7y$8sD;4Lk%c9W}b-E2@Sg0w-Kwnu^@N7i5|QY9(7%CGMXW!bV_InJ&& zh)*&(!+A4&^TFh!R?j^;%xB(-};Oo_w&)H<% zUbP7%8WQd>@K0?NT2-LM)XC4@!G4D=MIEq7*|AR*90>~+7U;ybLS2bO+r25VMQcR? zLI-jI%;7xtekEcG=+=kTm{e-xO8oKX$B)1L{^{M_VJpBtEe0?vQ7Ri@*uYw?Cvo1F zA~vA0L@+lQmQw`E2XTKVe3@7B0d!S6h-2^^)%g+Ekd#qLO@V$7-A@~3TM&)H5E+_^ z(Q9OMTTJ8lo}#N&a}_jjDReUG3hFVADJLg9=`my?Uw;EE&9UFbn7nHv+%WQnY-Vo< z6)g&-AHY2WZN?xcp#MDnJFw;d!#)R|4eHCGyvril;{5i7&{VooQ0P(|Ay^2aA{vRh5EeKtCA0aX;T1=|2 zEL^JArm;9DiRpB<58S+1L;SGI3enOWA~1>%w?CdmPAjXzf+d!$^gKzi&Lj)c z2T7{RuEZPh%k3aRn?`zPyD1;vIZpD(U7AANf3wnpm4wn7ViYyaGlwp6>L=Zg1?8UN z9uErBogt4AnHxk_LYaseEyhc&d4{B-c5PZqk*!W*evB>@NY@fN@c`XoJW1@+O%z>5 zsx8taz&=!9o4oWkPnic>eaT?rtM6jwh+EajFQrIMh+Su4g&UqtKiocNIvB8!fQT)L z`ZYRrX|%X^26Z0iDjWC@TWfe`?vFGqf{vz-reluUGH}d z7qXM-X{lha#gX`I^W|4%88{ufhFCO(_O`zvN}o(vE(16Q%3RzZ!WG;3^!QsQ>Tjnn zE75zCjG&`-T<7!>s_<En!V1?cgmPWy&7|#fgX0WEsq95tz zpm4u&fkwIwftzkG`Q*#|4^T@10u%rW000080R4jZOj82Edmsb=0Dlqy01yBG00000 z0000WAOHXW0001EX>Md?a#n9_b!}xXd2MV^O9ci1000010096#0000^1ONa40Ar{g A*Z=?k literal 1229 zcmWIWW@Zs#U|`^2xSP}F#o7}!S)GM}VY?6mg8)!8IWsRMwJ0nXZGG!5M$PXY!>j8cQ#TT?|b=UvaMI zyv>}ND_&9&3l6v3bKTh_@bY}jmuSJ+*P7mhBtI4Y8DY1t`uRIq=0NtG;EC1GV!621 z{^(ImO+6~@ku9Hhl>4>zuRk}o3Phf+WH$PE{m(mD#hQq7HQan#@^3{pyePh45Uu;A zNA>Xy*RSVEw{Vw+^7wNmrK`UTZng3OvTMB7eW2Q9lv^dsfAO4YDZT_iek$Cjdw4lc}#da z>0pKRnkoM`ohm%Fu==_sU*X%o>i$`u)YljUbxG;vI=;B|n`2_+M8lP*HhpkPoqcRt zp<+#Qr`MUi|5Yq963Pz-y?j{kW}TaCVY%w@tn$RxMkcd0Q>UC*>rz~E>Z{iOO~<~@ zb)VF0e{g58(25sdkH<8;o%-Fg$oj7t=Q-5~rvwEzosM2RiG+k z-lOl%z1vqfsw}&F(=On%meiwv6GW9R|4}mNx_+I%u5(UUSgZE585=KY8Z4ij6zL(h zgnv@V)Vba2kB)wIYclKoa;_}c&aQmUlZi^_6!rdhUlP^kTxxnmLn_}bHs!qkK6&m_ zb05j^b4{MR@Xfb79`gd#lH86(#BXsg*ll(*C?&h^r^>DX#aQnbM|4ZV7kehn&Rg_~ zD=2rO8soQxY`3Q^O;0^_=hiE4HsScc;>PYVtHb{3xmMJ_&~bgJ_*C`jVb#kA8(LXh zay+l(U(j?jj*aDcWpwVUgT&z-zmDEY_cmuaJh81c<~`R|H=$*B>&V_k7SKy+cE zv1Y8l<%iS*Yu9{zefQSc6V<6r_kJ9>>vr+alP^CnPkF<#rs$Sgyx*~FtNi2)AKaZ& zyXW=ayoODm1#ERic{W*y*$X$=pD`-1D$(7T!S%MZ-kE9UhFZx3h5?TreG^!BCc6eA6WlV?`^sfD#u!X zHo;CON;^DtZX3dj6j$Kq(gy)76StSzIi!m diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml new file mode 100644 index 0000000000..43fceaf535 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml @@ -0,0 +1,18 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.nodes.Configuration: + derived_from: tosca.nodes.Root + properties: + type: + type: string + description: The type of the node, the configuration will be defined for it. Ex.”SBC” + required: false + role: + type: string + description: The role of the node, the configuration will be defined for it. Ex. “Active”, “Standby” + required: false + function: + type: string + description: The function of the node, the configuration will be defined for it. Ex. “NAT Traversal” + required: false + diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip new file mode 100644 index 0000000000000000000000000000000000000000..cb0d1912212b1a195b2ef395cac357c722c5cfcb GIT binary patch literal 384 zcmWIWW@h1HU|`^2Flhen6JMEf@DGr8nu&oy5J)HI=cQ$)mlh?KWaj7TRp#a_4Lay| z*nnqm_$&J#%*(Q3s-=a)`PO{b@SY>2+1ovt@0aXr_Q_M2w8b61p8T}=es!6UriP}8 z)a%?WPnvfqv`@JrkgjoKUAczaP0K>{Z%OfD^Gv!dzDc~=)F5&s*VVQvNC!JlhjZ3pdUBs&wD%noxP-4?uUwu1&K55mz3<^soz~5 l;LXS+!hk!lfZ+uM3JPEfGw1@mS=m5Rj6i4)q_r7AJOJIym4yHR literal 0 HcmV?d00001 diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip index 11d99be2e336c3ddd2f6aaf02d7c463d9f733762..4486fe44e4a808b4000e90ed5d446733034b90e9 100644 GIT binary patch delta 849 zcmV-X1Frn}2Z0A0P)h>@3IG5A2mqpk_e{)Ml?CGh008F>00177o&zC&#aGR4+b|5i z7w9|a1!{EH+zNC90_>+-vRwtnrek8V_OWA$+ZJlotx+4ssPjNL}2K#j4v;j3i`e}mFWo|{em*>W`?3Cb->QOwVrdOm;iMwx2N?!`;hFqawY6xh1!~wR zOy;B`*on70>EaA?=%msnvoS^?=(G6BCW%22J-c2VOPx>*p#~TrPGbsVPD82u2>iK= z6f?7t8P6F=4f#lttQr@hbs>U_IZZH@r-EmKv`3pl+~MQ@Xbdc4u4WZ8?fXA>K6d@X;9w2*FovxD~m}UAEka3KS)h|Cc8; z3aXStJb_ZDQqZ7w&uCAj%}sox!Jo>Nfn);;bbPdE(Ks-!#%1*7_L)_}q#fec&(AEB z-niZRtvUzmtH1_j&M0m%=WuDBB>lxQn>tZhFkKLW!*cW^H z*Pg7?r6K`#6nGS6{ESB${gbi3kDJP}P3oQx_TkTY|Cok)uzc_N=HuEGeB0~Z(2~B{ z*L_aj9dwsL{TdbH*OS^(Q1Ksj6Y$)YP1uVLCp{;jy`*GZ3)i)opd@gXhw{+V<$jVb zc@rNeOzfI}V}1Hw&uJUl^@jL;H=K35;YLRR^3ZF)7( z*D~Lr4Yjo>|N7$g-b89Fm(089l$z&X-hm1;c~Ft{B`BFgoRNNEr@V*)0g?ubY3*+m z<3iUq6Dt1$P)h*<6aWeU000O8qJ#HL%vzNN;{pH?0Ot+>03HAU000000000WAd{N| bBo@6aWAK2mtSTM@pdd5>z(>007Sqkr*U@wO8A2+b|4$FVKI` z57cO1^H!|e5MY;X$@VHRHk}ZYC0CMNq+dVEm)L1$)R)c=i6NTg;o+fVd*fn|38tjU zlhIC=XdU0IL~U}E^LU?35c$6A4T!{}xdkduQcaHyK zzbW{JeBtr4GCNRz+hdNd@7LwKi*6&1o}h~@m(QU{ z@4MAA#_xOXBDk{-L~Ie5aECT@OOWoIEj|@wFK9lkoIU( zh|$falhU?Aaf&9uVx8mvP?{iAj2(i^*5*Qy~}M-Ur~8MC;@jMKfgC`>QbEbR{$ zi^d=RMJX4j<2gcamDYqiJ7Wcvq`*6dm{&k2LycWB+t-D(e>1 z13&nGn*PirGg)WPC1lTAIezG1$|m856tZT%UeabK0ct4)gJ; z-|-En{UlgGggcn$Y02-E>NRsj3jQ*nl0T(rGB+*Jw<6o2<=Rdx|NiQlXd*S1OC~p~ z=H;6=OJS)FO0vEHB{PT*q;VoSn~sve#q9P6!_?H3&y33d0#Hi<0zUv0000080PlK7 zN}%)-R5t?v0M8Eq03HA&000000000W00000ksBd83IHGg000000RR{PE~y<~MS;=* pE~y<~MS;=*YzEseG6B*7P)h{{000000RRC2Z~y=Ra{~YX006-nyX61? diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip index c0cc411e5d202907cfc98295fc7a4df13bfcc5e3..06fb34db51fcf5411ff67cd36acad472d007e857 100644 GIT binary patch literal 663 zcmWIWW@h1HU|`^2U~KvBqZlIbnxBb*;XVfggD_AuIX|zYC^0j~IX}0cv?NupGB;;$ z=)t_(20VMkU)aB3Pb#^7r!BW#cAIGS_SFvFB~CumVmiwv)cswdv2t>0jtN{3y)S#wNIaOYRCT2=QsQ{`I>!1vx<&H|CRZ3M(&>c!O%AD z_orMI@`N6madp9oc;mTqT73e~?71h$RU}?@v}KCW$E9oR&c9sI+$wco;?+;LA8%CN zEv31U@wwmH2M2TK8_tXB_7Ru+apfJ;4JnxlW2Lx@OD{UVjq_i|cTn+1@uiQ`dJ3la z35hXjuAFq)Z-MVRyDxqE3xrb*J=n!x{A;~l+qF47Ae`nXb6qFQGrd{4xZ=)1kw{Ug zquC+$`+Y1bKbJ86uf8CXc0JL!__$TM$rMfNyBlgmzg}2Y*}CsrZm%K#>XZqUzMAF% zPvqw09b9wr@tH+Ii!UfwAD5}0|KIlLqZy$q6ZoQL1idy7@MdHZVZfb&fQbkQ6coS| Xw)7O>&B_LnWCTJ-AngE5ehdr%&buS% literal 786 zcmWIWW@Zs#U|`^2cwgo2HCf)GFO7+T;Xfw>gD_AuIX|zYC^0j~IX}0cv?NupGB;;w zsCV9N1A)8jCuA!cIZj^Nt)SbbcZ;R>wyvR=yJ29RNYRo5mbL9lxi<@$y|;9;1C?-#u>bosYQV5i8|T;5Z>5z6nMtlhJB-zJX*4GD#{sw|4v8w0F1 z>=59;7s!w+w*p=HgRFZ!F_*0;7G+iSl z=QMj)bG!1!#F_Kmq`#HK)E&F^3ib4 zVTbq5zar(fon-G8*-|YT{{48ML9*e4?B&c_>l!+DXd7?`h>Jh^`Tg?c$LpV7*S|e! z+lNWaM*csm4|TTuo^REf*JbhLPH05t;!NfHduP9VSjVp?H0OQm3g%BcT#rm>(%G_m ziFF~z#R)TJ-t+o%>6*9Il%n@ZUh_|jud*>;#J+gylk@9RGIUIJKC&H?S=Yq8x$=0y zj#$4EyW5?bz zz2KQ^cgGJ;k#!KKMzM>UtgR35W@NHwz?CpnfJqYs6u>0bWXc7VWMq(Fn0s3> k-nH=(BaHUZysK}-c!@E$}X`mvDk@z5BINs>b}NK%)_sGv&-26lSdI9YcHyX=~)zt zM93R{`ViRAqgv+sI`I3lkH7lwy*T?dbb-*;FS^1+(oD!Wwlai)hv9X#qHS0y*;_OtDXJR|@`JT*eO^|Bo zQu25!A!at?rozUxDuVZ|#W(6KFq*fSiGP-r-hb1wupd&bZHQSTou z<+31)Y2L*IFQ@f4uicoj=5oIHtoeH-6}nf^H-+9;fY%_6ktXnGTd#%hcX+wO@-bUYjH}c=l`*!>H rlS}FW-i%Bl3^<|=7@-iLpfK5+Nlq-lo0SbDzzBqHK>7?Yju{vLEiByC delta 634 zcmZ3%vY1sOz?+#xgn@y9gW-LZyO-E^m4$B^85mBpPLztov4TL``-z|U_8eIB zR zJj%`ad*<^)hRwc5Y%cw|K2L0=dFXv3`!aQtsErk~*Ek+uadqC=ES=RGS8VIBsF2&z zyep~KWS_y0113MZY-QfRfB&t0|Mr_EC+j^?c2Z88U_39)@zq z{`y%n=|a)l*n*i0>(0ss?a;b;da~K9W0eZ})>cdQs!m$ftJLj1=f?KSvs0f>)UQ5& z;$`}kSO5O*nYPVR;0Lqby%kp;$V8NCW}iw5u9GR>|Gsbc?TDq}0p5&E_6&%`AdN^3 z3=9$sD!^0%0tz5vqO`OX7lg^c2$Vchs2cCuc!?24Z;8LJZ^U?sF~FOZ4WynC2(y5+ IG82dg0E%84tpET3 diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip index 60950b65ccd71bb878b38b6891084f3c41233ba2..054af8b1907c811abec4819881e13f7d45a99c8c 100644 GIT binary patch delta 646 zcmV;10(t%91?dGBP)h>@6aWAK2mlv_d`#lKR6H31007mI7cYNq;~)^dSL#3T1BxFT z(8r&GbVpuQP6ONVO0(~5!X~#j#!6se=fD@YH-uPRQR~2fu$7|--qt993P&45PuIW$ z71jjgO26LGSA~C}=K41mYh~b<34kRR&~U|10;&y2R-&znliUWv*5W@pw-`FS!)T8| zb-}ft;Z@JxdGG?23$4f$3`x7zb`)?h9iWx zS|P}SlwAAFLr_te5prc z%ZfNV5RBM+8Q;icyjaZcpBA%+adI|XE6Lhvn@2PKfH*mpo66~<+8h0k)7kT=YA)v7 z+GC({8?O9ci1000010097Z000170ssI20KDxqbpQYW delta 641 zcmV-{0)GAJ1>^-6P)h>@6aWAK2mmEzo=S4Qo-h;w004iH7cYN~+aM6VueATb4-}<6 z`j*wUQl)J+?QZsp2#ga{4D5gtvc|I= zppQQV>5jaroCbE_m1dvWjLq)vjFrH`!GSOC?+CHDq1J%`VJk-wysc3H6^=HBo^F8$ zDy#{}m45p|-xPm_n(H52Y?XoUCIFUPK*JS338;1;S&6nP&T<E= z)dkmnhF3j%=fMk9F0>+3FeF7oayTvO2x{aO#0OMnlXv5qhuRn9Wwl&B|9buUcsxRQ zuN8tUNXfO&OddpyDje7bZS5FB>8C<_Qa%t{W(a8^o}PaOrK8u!vttG`G>!jOcy84XpJb*B2Pvs^w?nzELJB^i4xy;FUsbu4+{&Hl%?k;rKx zrLUYwK6h-i!o;!%k&5tOu>f;;cGn@ zTUNx`fndbwWqcyD;bOITcwQ|YhsoJ-tt4xwZ5}T5N5sTf_T!n~hc%l0PxHmgpltpC zP)h*^dTX b(g9FQ1qJ{B000310RVRZ0037400000P=F|9 diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip index 43f499bdbbfac2899e952b9b685a132f5222418f..ab6f90eb1f756f4e718e6df5c33620e1df30c0d7 100644 GIT binary patch delta 581 zcmeyy{+UHOz?+$ci-CcGgQ2SByN{~KdXbxq3=DxB3=A@p=Q7LJUk&vQzHK0|*Z6S# z1^E?h7QfuoZ3{9^I2;aLd?I_zN}bNTp)>ycJ{7<5vPi~hhFrhC^6xMAZa;6vZWJ{& zATs|Zn|~I!$InFqccz{&yV!W^<*}8;rOVFw`PXPTe$->9FX-5QNIvlX5=;I06>E3zo=`4knYsOqw(JxE)dhE*R%-G1epLF>VU_Sj zK=3oiCfOHT_b>Fnxk9=%V4{}k>)ObUFki(vs`K7GW#+kcVyeK6${F$1}9g-$K zUmn)do+5b4Ddd)*4{OrdPOie;ackG*@2idUQ9a@IMr5YcEX&CgPcQs3E$?~7`}${R zj^@69bdSr2?@8#jO6IF`o@6-koSSv`{>%-p(w>`5`M-tNKVpObL2afF%NBKB{PjEC z?E9*vdzDMQW}o>tBX99z;hc7L%i!W!3uOfD^pcYo*r*(P@HE$b1^dN0SM!9<-!r+| z{ApLC^3nEve^ja@e(~xy%kH;(JX7Gy8qY1oO7$U4+1|+;?&ZAgdiCK4`|fy#=k1pI zcYkRmEWW+lDc>oH@zxdQH}w-Q@pCM`7?{6iGrRo0ITzl#v@6aWAK2mtSTM@nhlx_&qV001Hs00115J^~+q%~-)w+b|Hl zGs8dV2daS{bEBlwVWvPP0j?UwUK6#pWF$E>f8UiQI}Q#wcAQdQ5?k7*_uj5oN~|&w zXE7u~3M-T}Yz^ArmkIGhMr3&kY{RpZU9t;yaekJ8a(+gL1svxVnB*Bu$hDGI zbCEuMeG=LhJiP<^s`T%FAE{dM^kI`jGibZmCB2{s9fOIq$Q_d{7J2$g0vZW$#N!bM zXwJ`&qte!tgjx%hkMT-GiUixk3(#v3!9(Cgom3YQsVq~n;mt14bvfLL5o(Y4o0rKd}Ekpi7VG7Y}t6@wOQh*_e4RTi?<0Gumj{k$Dd z10Km$DxwY1kQm~E{M1|{H*H1j8L0x84`42Um6{B^6d)sTGsERpo{S=K5x_n6TNQN` z%xV>-2x3}c8lMOa@q{EiHH`s-vZiz3EpT|cSjK-T-AbB} z7M?*5^qbr|(4nq>AIMwC6Yv&tIPasX1-X69J}|!Jb1IA-?($G?{RQaZhM8yunRjV_#7%6^yZsZT9-Y|zxF_oy z1i{B>9^;-6+9rHb4IN?tk7HdXgdvQ!<98aj0C5YDa)Dubq>AC)GpYuo3LODmrxYhv zX$tC_>DoQ<@2kpA=n6Gp^enzU4d!Ncb?Zz8?G6H_tovc^{fmy$XzBY;Ov6m5&P7`r z;{V!)V8MHTRnTjP*)4#hIzgxC?Q7o7TyNq&X`e&=y`4Pc`NvHRsktA;@feM_lkMd<%7j;Ms#l`vId9k6Vt zg?rP^%u2oX$o&*7zRZ|(ArqxD?w%69RD~tLqg8-rJsI5|OgpP|IJLpW81bAhMJnoz zFH|Txm*JXk)Kw?GW)!`uXKyE~C@QpX91Vys?~hJ sfzkms>?~hJfzkm~Ip{Ak0n!0bO9ci1000010097Q0001T0{{R30MZSu-T(jq diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip index 02b62a69dadddd4d822c40f14f1bee7fbe819c70..8a790a546fe723ed3af8b85651b148cb9ca3a318 100644 GIT binary patch delta 962 zcmV;z13mny39$)(P)h>@6aWAK2mnHbd`t*zZ+r^`005K`000mG003opbWUY;baHQQ zLr^YxZEU?*OK;mS489N8e-N$y$kb29Je+Ykv{C)oZ^(&=0HYLE6X5ZCfR;W;NH)n@>Z*hES$y<2P?L~^TO(Ka#H#ttEG&^ zQ`U>xX#Bh(OdA251Wm+m;0a{`vr9HWeWJkMY5NPG5m%CF>q&5@)oXAecfcwu{4NJY zR}y$Go9 zQc&rj-*BG#%1y}4GRv;NEiR|H)!5z&2Dx|u6Gg00>qk&dqZpY@i7pU|a1r23fZS@A z8!ZLfjYF~saiC?m!UoP)eM4$ZA&%60$~O2d!aPUFsFZ*D4rxd^N1`BVDy(||S_Ni$b>rJ@w7l)Z3vAo^oj%}c%4eB2EaawVT zig5iX1JW9AhHzUAE1@{v(qyXyi#b028iQy&8$4eDCQ7Av%k?Jd&JX~m6+)px`Tbja zOSV)Bp5uStswoxyR!P~`Q**e;(J=FeYf9Ua%62X4%AEoBkRN5E?qMh{?-3o|yhT=f ztf?UyLNQr!z-I_Xa2r7mi31jBT1h`4zxRRu85F1|n9|?pQ6bTH3hcP6pU3Pi_A44e zH7IZv#y2WQVycDu(uRDLTCKxnyabE|BPoLtL;HWMYL`WskP{ny7l?srXtd(7(gm~Z z*W1cq)&eQCt>L%bYyj?#E$MP`J;0r3CDXUd>?*yu%+sqM>Cc;ky#u>lBVA+pGovc( z6>cG=`i2=*#6IEbM&SlT<6Nmxh9! zzeWr(+WPPbMZ!CBC(;Zb(edv0hTiD72;qPe<{SC_WAgnfog=qq3a9b{r?_Y9+@6aWAK2ms}KBulRE%?bkq002D^000mG003opbWUY;baHQQ zLr^YxZEU?*&2AGh5WXYv4wg8x6ppzqO_3s%bfF1|)5@`D6AQ2H+TOGg;@ug0|B{q8 zyEGz)ZfbjGz8Qb>vw8i>YsYBLp%6-Vp_R+GU>$y$kb29Je+Ym3{35@2{Yq&Lx!)OZ zlh>~Z(RQ6^0}7ZfO=7|6$}&ipNwyync<^(myw&P53#akJ!HO;Lys)~QoRq%IYAIv! zl=Y%E8b5Cc(?$R%K@;&Cct%;k?2-*opD6J6+Wy36#Fb>)dJ^1e^%`8r9k9v@zso_< zl?2{dCGqTpth9fYKvlnt2ACDb$KZXEbd3=twe&kKTzE#+q*YC{il`evy(SBHm9S`& z6jVCsH=L)wauag9%(9!Wi>oPaHMX~cK`tJ_L=h|0`U#ZNC`M*eq6>r~Tm<+MAa~m3 zMoYnV3BON+^!EG}$V_Vvdi$#vmHc2G3W3iBc)va=l5qGX#KXg;1zae*f0q zk}Z{j=lFlOYDz`FRZ_O~)Eq8yG|c?rn$otUvR#Y1a%X@&=11A6dmM_Z2SkTAZ;{m= zYifvwP)t@F@EL*;+(wW?;(!I3R?<(%uYI7u2L_j*R_kyXF9Bo0NXnqZ(Efi@wacPR$cc@<55&MUG+Oak>4I7I z^KE4?Yk?Hn*6`bIHUM|WmUOwe8Q{)8CDYfd>^i-?%G2xb>5toky#u>lBVA+pGovc( zHEtoL`i2=*#6IEbM&SlT<6NmxhzD#JVw?+8Z~+vVWiDLhd7A7=;Llb6Zte*vl25^@ znQ4;(18@N$lXC+?7Ht#>xj5Fzll8H4xYskX+$}aIYsC|j%L64^{r*48`Nx~(eA>9! zzeWr(+WPPjMZ!CBC(;Zb(edv0hTiD72;qPe<{SC#L-Or9og=qq3a9b{r?}I;Ui{V9 zKTt~n0zUv0000080OflmORn$D3IhZH06mjZ1Tiika38OECDQ>=SoW${CDQ>=SoW${ cCDQ>=O9ci1000010097E0000n1ONa406js%&Hw-a diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip index efeafe824ec1802f9818f3e79fb09b1b3f7d9d7a..f54d7d2c1b46b090f31c110cd6806247e31f625c 100644 GIT binary patch delta 1231 zcmV;=1Tg!b3F--dP)h>@6aWAK2mnrjbWHEQ@j^%h005FQ000gE003ufZ(?C=P;YW{ zE_rQi?OM%p(=ZS|!wm1RN0e-FjOVE6k>a#bJ%2)w<0#ss- zfj?C;E(~qiobOE)DOX11*4$HU@|BEm0JK^>%yA`B z8;;gISu4!-@;rT%NK>FMXazENSbsm1*a7B($m4Xs=rM zn$Iw1&Rjc)pU8YGj3RA|@a?G7bx2@u(@j{L)dowFz;DBmpRkxpvxT*DCs6L!*@Voe zQbrN2-Nbiv)+PwCq&rO#c*wMk9A8>4Xms;> zSw0zw77IIRZPWb=k}OF*&YhjJsARldY`Bq{JkpPK{k5j5%=7?0UW`WXKa5|VuD+(y z#{K-R@>00%1f4=U%VjV0(5 zgx>Z ztD|-WcC;O}L)UlIJtJQ!Bd03|rtgLiK*o(zd)uivudMcDb+cGFZ;Ct0zkOSO+z9jk zk+AzxR{nbIo8s%|;TK)$hijE}WZkgC)}>DreJ>0Lq~V@{ua$ut=k$p9w*}^#MZI|o z+)2{y8{kHm|Brdy539ZbJ|O*er2%%8b)*e&=l(|5H^6YMH0&<-{$ucgIJiq6gI#4E z*T>)v{(D>B3pc{tmW2NTP)h+90zUv00000808W8)Oz*z&LP!Jv0FpA3Lj*1^_?O}_ tRlw5$!297bRlw5$C{P^wS%uR9P)h{{000000RRC2U;qFBbOZnZ000V~Ludd1 delta 1155 zcmV-}1bqAI37-jnP)h>@6aWAK2mrfcY)heh#?Ji%008PS000gE003ufZ(?C=P;YW{ zE_rQi?ONS((>N5qUS@cQa|ts+z+U=hr=+mU3@sTp<<_IfC$6TpWhA+fyL}K|h1qxE z1$YIH{1e-$!`9h01BrZP%Q`=w&e7*DYOOMYhY>DiCaqL|nF+5^8@dUgdSzsqCm61H znuO28XW_Gl4>A>DXjeI!;Nb%RrDLXY%uuK_XBv$vv_K|u<|Z1Jq5Y`z6`Lt-O9Oxi zwYWIM%5cI6IjF zk0NR`!dK0@{%WJo%40Vv$07#n{inu(%5#4 z=IT{w#3iP@6YjPU-&6Qe7-c>d;p-W6E%pTLb^c$lT(`lRB=FO87G^x9)*KP-yfkR$ zn_@wK;d7-D84Wn88vnO)q5$HB8fHTF)BJtm}}aNC5?# zqD&Osqux@h6L1t;`lHHlO9Ug5f~J&pIxD@jsjldCM1*M3)U%04sD~E_siJR%qQ!;6 zP~srgky#shfVSOLkZEsV8(rK;|AH(VvaBF~!!=L31PeFnzUgksi^K*{t@KmVe@$#_ z3lqTK7qi*hck`F0-PhDIxLe+BU7EC=Vd>EAk$N#1JeptDqwRWvG}RhE-T~zg8*Bvh zE}ETI;Iw_{7qD-$g^4y$osd4^F@gi(yfx_RqK>I)nf^|Q=B|PRy*PoT(m=ZeKXE62 zn4vFOx_>&iuKhGliqzkq~VM_-iaJo$#E4|vWe{1VL-kV5k*)oAh znyX3EeG>|xG`|Jl9~HfJc5BQ^h=L?fCVK4i1fF*vF3w-Py*NK@?Fi9F?ljpL_I=eD zZSuM*Y^>b2TdZs^4NvH0`gcj_FOGwM$@?w!%ToAxkuItqJ`Erk3+Pv+?$)R0?>p!3 z8{5PyYOkp8m4^>fQLjnaD{9ZkcgDzhcf)uxhI=RDqoLwnXWa(%PszdqqWF0D*UREP zkns8(u>7&*Me+TgN*s$G9_XyYJ6}GQBMPsD_esN^f#E(G_!#;303`6ClCBp^z(2*g zuou94qTi!C5I#Twd~|=K^8$EJ0@xo0cP@VzeE0w9c1TLt9|n68{$C{g9Z*XF0v`Yr z000080J~yrOQC$m&iw-b0O~Q5jsz|)pe?-+pj*=c+<&_epj*=c+<&_epj*=cP)h{{ V000000RRC2U;qFBDFgrj00352BlG|O diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip b/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip index c8368a59238a66e39cdefc6ee05aaff8ac2cfe84..c85c133155ca0fd5692f7f3a06588d5277251fd5 100644 GIT binary patch literal 843 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 J9RvUX006x*AKw4~ delta 1292 zcmV+n1@rop38)HxP)h>@6aWAK2mtSTM@q?c zbS`;qY^_+$ZWA#Oz9aDtegT%kF}I~DC{k$yO+lP2$DU0ry!O`irbLK$XYBRt1ED$3tTLbf%ZY<1#8QDkq3&gByRSK|j1A-RTlqmoM_OHhH=H8CWT)oub z-^z+IAuKr8+^H-=uwHidkaRPAOg}*`3h-9yRdc#0{VwtlsmbG7@->1YOew?Bc;eSU zW^*8wKl6q6dVePSm^Pm%P z2b9V3b0E}4z`;>O>6ir&u#5BH5pq}T>R(B{WD#f^XPa_+dO^GR9 z8rOz@@L(LRjFNmi4#@)j5E>vxFv0m^?nomkmW=l-7EgqE4wr=@d<2mS1yM6;_sc~| z=MO;6g@`>9TkGfi^6j8@qNr8@V#WhJ^=oVD)jEXy#cn2;Sl(`_<7+6JIkJQMe;u?h zr@X;CN4TworPKnWG}&m$W0j5%V_=PUgXK$qz(T3DXmdSP@EIJyjYcR;YCnwH8?s?a z3W~q$RMI`EWPIaUwR-pOD`}pnpzs)PFLikLQy{VjeZvaiPD7)mscZ8bLA0aF&dJ zPa;QRYMA=ghWV(BUWH)11dIh-UO1HK+GlmUdE^N-u{Mt(F|Z6Pqebj=K`sCJrmnDR zp`Wfd=ujbeJH+`IhJ}!%G>PwAm8Is>4??fFLmbgg}~!h0kRJYjBHDb_0gI>0FSeZEv1sfr(ud{nEOv)v|lz1xw5>w-Cs5w zXPE`fVRzEL8-BRI`EYxGGfhxb`nCKNrR{S60a?PEvtvoaJf=eT0`HX`eLL?w9dKa? z`-1xRKKpi^-(U{RG;X;CZbip!z4)iCe*sWS0Rle&6aWAK2mtSTM@q?cZ?1^@s6009620ATuB0000b C#9?*- diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip b/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip index 54274e78f5eb529e610224fb710d4606c04ba92c..1adb0ded4cf2aedbdb5ec32bba6d0034d90e7d0c 100644 GIT binary patch literal 1383 zcmV-t1(^C!O9KQ7000080MLf_OxqUFvgrf>0NfP-01f~E0B&z~VN+#tc4cxdd2MX9 zSj&#vHWb|l$UktG)wn58WZ|9a(agB;*sdQPAVEOT(v{5&C8{K4*D3n%y_b^Tc4B$# zEG9B3ULKzNI-=7y5WDw~zZy2z;FcCE7Nz|Y>ZDR();p1F1hG5XVU&UAqM$RGTiP35E=T=%c zUN|V%<_6z2PF4`;pNLbL@m$!=5MzY0$*eOnn{GzYTx4YK{4qx}DA!7SO*m~B*;r^3 zvjl%QoVFhJX1#&G3uz#3vP38gn+fZLD{PYu$Nhe9FbeP2;O0UqF_B8TCI7B7sE0Aw zTFz)WI)_CDd0m0COlEHZC{r=535tko-=pJLCQ@KJ@mzUB1aG3XV+-kKZ-&K-JjRpq zTq_wZ>w)b1HB4u0rWXWD$S|;AbqtoWi)0 zncI%bJ2n?e#vK0^usuOjm3iJDgu`&~SIEQuQ}`SXg3kVX{Z7ydk1k#frr-n~PaLrJ z&Fbt_w3&%S$Y#m@81}kr6U3gy{D3Miq`g97AU(v6;$%ujz$MZpGXD@CfX0|oAWq@# zVu`6BArgg7jXmblGFw^3hge3G>2-X5?tu#2juTzCh}wNa}B5!_Yhp8&4(h`^%j-vZKN^cd18Q=^OgP)R8iNhdIN zaH>RAnqc09_q8Rbx9@G8F#NKeG+)okPrz2PWT|lTTqVIx;&7pZk0~*pri=gFk}-e-4Mk;PJ3KabzeJ z7kXkNTPkNvyof}54lel2TJufkBL+sjUT1hKwuilk(MvE0d8^lbXg}^X^WbH7;3%Y6 z+Sis3s(SpjNF8fciXCK#>@d{bxxjBe3+ zTk3b_^1{F`d{bM)`V$ulgK)NYo}U)h^|ug;gFAm}Mj8RXeR7CoB1@@7{6|V+wWHcQ z1C^I@MqHsI)GDHwQASQs0d8H4L=jlq?$3X#uh&wM6+)51wpLCl+=OyqGOUbPO7miZ za-5NACgKl$?L-c(Ul^LJsJYpybA8x^ibP~vK5i9T@2r`x&Y)5R`Xe}dP~*WhKyh!zAx5^4R( zy_>)%cfMS@*E%3Jp+&uI?olwHvWoFUW#7V4CMLRYY;{$6#=cZiQCRZAsG66Q*sSfg zz}(+!X)-4gdfE00000001B$00000 p003@pc41Rxa&~2ME_rQiP)h{{000000RRC2JOBUy6$JnQ006?Rjy(VX literal 1848 zcmV-82gmqOO9KQH000080PlK7N*<1_yp{$40Jk0h01f~E0B&z~VN+#tc4cxdd2MX9 zSWRyeF%Z2Y@gIESL;wkK=xr$hf=Uwd0TKvV&f1$89DA|72?6onnXz{_+a!hEwC$m3 z?fCim&3I-!-nf)eE;6a5mqt6f5!S&U7bH$Oxz3fKJGNHz8GTBhK76nio^j^c#lr`L zcmeaw3#!>#T#%vJu&J;B@#+d0bB7dNLbLFB1}B zNQnbvjP)+;d}-Es;l+NRFbqGLRKVnT8gXSRW+jszo(Wf^X1zALA;JMrnEo#gDnflt z!`NldV% zcoSoM{NAyUE(%$0LB!9TX-@Kb1Ckj_K+qB(KirvwN$NyeSm}3EXtq#-<81kZ94^Sh z7$umF!$(wJE4BpMB(8qKrNhqvO)6+&H1VrAxQDUgM+1bUq%B zCbRylYHH0=$~d>exkHw)$V$Duf#mz-l9UUP>k<@)Pv9iotw}MymYU+UphezMz1d1c z015n=M_vJmn5+{!@NQNp4-RCDHl%+TM{}cOy6Yw+^2Ja#?6l~~7cdX4u#gGe1YlE`-qbSs2~)ErE7vC%ROF{!%^acTH2o_ry|OAF1bYpO-z ztB;l7(a2{iTqQ}R+kBK%~tvqnA^g?xe4wWQ-I|E&OVZNbKY?TZDEcRYHP#AjY%As zo5H4|x5?5Te6uNPFRFS)vFf#&x+k8JRMK^ z)BfaRpZ3RZ`|tacak3*jj{J4OoTp5mFeK~J&JbcQKamfXh3*5wBnhSnazN0V3Gi#dof2!K`+}FU?EywFUJK)qi=JGr6Q3YtW8) zCiZAb1QHOyZ|}%Wag5-bNlM>i2*uWFvoR<7%1U?IA*8NaGx)- zfMYVhWmeGAI1p^L!}m?M+w#_In@4pkQz#C{O9fa8XX=usJ~LjeYWvEvg~iL-rmC(5 z8jr57XsFpH^z!wvl|pA^m4j_=o_yO+W+!H6{r6)!pB$8vpOX*Cgud@jr^%b+>_jtc z6r5>^8l^M_W~zwi#Tn16T5mibDli+3uBP{;_H^`m_9>b4>E&qndhq5TnJ1sF4VYkEzhxpgOQ~c&8(klHpA6^w zXG{0Y92*9>uuV~S<7qJd@IrwTuHZafT3hv72#bTq;nZc%6Psi*lcCfK`lm_?9qO=^ zPRM&r(=&jFBVXa z6NIiC!X|4tV~f*Oy{}G2fs2raVgtAl-L{JcWmgMA|CRd|y~87uytqG;yg1t=)kFD= zN;>&8B`6D!S*XU78<5(#diM>nbnkpX2l2GqHm{&yfXa%)i9+7OQNp0z?@8IJY;!ye zsZdzb!m5rUqyk^0o9B? mUqyk^0dW`aiTfAQ0Z>Z?1^@s6009620AK(B0Kx_U0000DTW@0k diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip b/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip index 607fe0c930d2b695e12697b6256500d8358f2a7a..94bcddfa191507d60ece38a694354e75d5c72ded 100644 GIT binary patch literal 566 zcmWIWW@h1HU|`^2_}%v1r#jWnXcHp?!vYot20@@`acXjDQD#YHP-#wTv0i0v&eF-= z`L_*tj=yL9CHsRhOmX+KYl^#hb0?UkJ5PHVF++Ei%2b8>b(21CxSZI(Nc^_Y$^G>; znw^_No7eKk*|M(uc4CtKv;~Vj{|HpC=_`A&di~W!QFrdMW^K5X>=JqJKBK^U9#@_h z869nb8XKKA=g)n3W$}zh`pcYGt1Xc0sDD--v@9X+g6g-bJ0iyec^5c-tIk<9Ez=@+ zj;fhU)u+xm|4+PH@2Kh{^E+bFj(dzEXH+{j@$Y_F_Kth?ONJ{=WgJDvnq-5!f@K~@ zf9g3a6m^^1k1cSu=d=%-V%N_%Uw=PbJa_|h9nW*YCl*((RGYIod(WA*daHf8*Zq(2kGt7arh7&6O6-`K8XSK{biOXwV7!R? z@>>QoGw!Jm|MYhnKdltnGHZ5_`rM~Fva)toURkyCcRz5>yPa@+<|fmnmlj-(`(ymD zxUp@{7uKhYN*m7w%<0|st=8}HCWY&>_Xs@;yt-?hhL2)u^S$Y>cCFU?m+N``=kw2O z-;(1l{rs`}LCWrg1$!=u`07ocZ@6Rj&8mi@e>T+q`nIPwYHHUXrT}k7CJ_eQQ4EY_ cAW%>MQ zUQOkaSjoqBRn=U}B*bgq^z_DAQ{DFk{ZQVoyMLCI;f556H>{gg_(Q(geHW@$dbe+7 z(;SH#Wu9+m{kZ(*tGB_@4JQu%`n==!sncJ7Fil|==P2CpRc6JyV|yC(xAM-=RlKhE z$X0I(y_HC)#SJ6+~%JVPG?ft{|BcHRgk$=wIbKwpQ7m9bNUKEKaOa9vR@*$JiX7%6l zy9!rTmNm^*v4b>2A)STXL`}GkWE1>!rb~B!BJvQGal+<5CgZ1vTwy zE$SL>;Z|GyPD!vm*_XU@mFQ+O*Tn|QOoX@8yUwf z>-W}sis~Gtx21Oo+Z+&>EYE2+)4+J`mv2`eox0opUG9EF@`9F_sEvnwGn-$epE>8Z zWa&57E$zE5w5rWIwy==t=DmfVEi8_I`f}%@z|J!LfH>7d$KUN=^oy-}^PWGowK20D zi#jZvp9?L?@tD&3`uzv}T^nyO26!_vi7?=HE6}+>pr8PzFkBws&B_LnVFW@uAiWB# F3;><3T*LqX literal 384 zcmWIWW@Zs#U|`^2_*~`gOp_U=GTPM}Jvm6uE+K{2R?$h^!H-gp_I9cyD&fgwj78R+Zx9gEc z+SaDxzdcFQH*ueIwk`SaY7v|1msp33VdA#m<_fTeUT4*M)ez|O{dTy{16S#qs$H4( z_ClX_ex6z|v3X6M*v$>z(KW^bXC3v~lK#zGC!b_4)E>;Lq_=aaG*{!J&izwgN6%Sr za$Rk{h1!Q#JkOY2^RmCjs&I#{+UGC)-^;6G#XCZ$>7223#Sb0t^cfPymyd;lc%#VPueCIMK(N;@WtL5k_0` bluZvTy~G&c&B_MS&Ip7_K$-&>#taMqq?(9> diff --git a/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip b/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip index 574a4844d36e3ce7e4607df38d0dfbeedde9599a..e18013a719ed2b39e38c5202822fdb8019e0618c 100644 GIT binary patch delta 539 zcmaFOa+pOnz?+#xgn@y9gP|$ptk1;N7uT<5WMI(ZWMGhHV3;T?Q$Kg=>Ab@V0YrM}kIeRy`0gHkIPdXJ3%+w9P3c^+5hqzg zBu}Yj2c$)L3WzUMynQ1;Du8S5G) zPg?w1%9tYmTYdkpSm&q9PTi@m-}J8Uhwze(0?NjW35D#>FPYD|_;2>+LoIgiZ4F)< zcC654OJE9?I`ZVEh*w-u>%GcnioQCR>?FQPeF#W3*IE?iZNK&Yq?qf0QtNje>3l3$ zw6ZceYj#Mr^o4-mFT32QE|1H)tGV?`K-RsY1O4%?>xvTv94)SDl>hX9c-&89R(`$m z%}xJa*$SH{U;TJpSIF$uwEI&MgyUYmj=yqSbk^Q$bGxGUbh|4oJ?AmE;q{b_H;qgD zi)D6}20YK*Z0j_0%jw^roz!#nt+yP>xsb5XPwEh}%gj zaplu%acd=*k@n>08#Dc7ytkO literal 619 zcmWIWW@Zs#-~hss=U$q2@& z2CKGo6`U=LxGXO6CP>JLnduIb@=1$bOXX7Jf3J=HyU!u@_^CU!M&BBL2&+hPOzdRX zP|;BQQpzvm``O4ur}^LcW_)?!x>2_(f#tXf$4O&RuejpYbCu8R=6*=HvHE!J)Vm8f zvd;e9`1je9O?t~dF7lpZA*VQf*7XuY&#mTiU$<^Iw^?EH?btQh;9_5&v(_ zm<^VlbC}!kdI|e)p0}4}-11~Lem1+w*Ew^`+1;O=)N}Q%O^&1lPV7y`T*nM9cpDF9hcnt=zF9vqf5f|z*I0|z`k1bDNufs``>VJL{f1R?-2i}d*b diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml index 541126f7e3..68ecf90104 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml @@ -3,19 +3,9 @@ node_types: tosca.nodes.nfv.VDU: derived_from: tosca.nodes.SoftwareComponent capabilities: -#Not found in any spec -# high_availability: -# type: nfv.capabilities.HA Virtualbinding: type: tosca.capabilities.nfv.VirtualBindable -# monitoring_parameter: -# type: nfv.capabilities.Metric requirements: -#Not found in any spec -# - high_availability: -# capability: nfv.capabilities.HA -# relationship: nfv.relationships.HA -# occurrences: [ 0, 1 ] - host: capability: tosca.capabilities.Container node: tosca.nodes.Compute diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip index 9010bf05441851e64724dab296eae50f55b4f7c1..32487dc65c0d3b84cbb28ccd3911c3ea3e7949b9 100644 GIT binary patch literal 318 zcmWIWW@h1HU|`^2$e#Dz=b*~!-RFS3enticb|4+*5~^33o0A)`H}9~5z`egBdmPr5 ze4SD9;@ZNjuoAxK&r~d46qY^Ru79J*dx_D){`ca&KiRH5bn)?;xH&eUXeW=`_T@f` zm0Pq~^5?%jInSz(Z|yqH&lhISy&A6b-A4EC*QbjQ9kURLx^UAoNkT5;ec`2ifjvhi zC@H@_w%@U7Vol~o>FdR+7bX9Ayy>v#-_kPe%i+ye-}07S+}V-vWk)B={xl&T)i>Aw zoV=5K&HnPTL%-JlRNcg6=%u`}TkiVR(9KDQ1;1?g`*!Z7gSi{;?4PFe;@*zmi~-(^ iOd<@pJq`3X5GW{sDOeB$c(byB1Q>zP6i9yt%K`vNbA)67 literal 457 zcmWIWW@Zs#U|`^2=qe2Mu1(MWXv)aIaE^(AfgLCs<`Sw`nVZu($=Cm|0Z-fezoHY% zTC;Y4V|#pn)k2}nQR9?Q`Q|AWik{uS-h0k^w>T%s&h=aN?~RW$nnhw9yITZxS?@LT zzr46Xh$~|bn;pmEpI!PtHz}=dIDXJELn|z#^jqt!Tl?PL_FF>L&_wtT10y z#~9$v$YjreD{NJOp$h^EU=kkETu=c<1__3DKNl;U_PER_dcL)26A~TZ&B_MS#R!Cv LKspK-VGIla&_TQO diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml index cf7b5cc490..00d3bd243d 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml @@ -34,4 +34,5 @@ node_types: - service_dependency: capability: org.openecomp.capabilities.AllottedResource relationship: tosca.relationships.DependsOn + node: tosca.services.Root diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip index 1417651d5f825b456510bf129f4efea55e4409b8..fd3f7e9d79472c41908ab58d77d7f60ec335f25e 100644 GIT binary patch delta 549 zcmcb}@_7Ew*u z+pdv*W>?heSwd__<4#p9Z9BB*!;&?(Hebj}<2`#N*h2D{&17d|-z)iMzLW?3F}?7*<-uFQy+P59za~xW?mHE{ z_?Pm(=D58-oX;qmf0@`6CoCrY;6f_`Ry?{J*;sQm4NGey#V20Knq&%W6$ z_9l1k)^xAjKe5Mm{En#nshKnT6;Jlj?mf9N@5=2N1H2iT>>04c>g0Efrh1L$Z`vjV dUS|BMj7kT1v$6pb0s|uurUB_Ez;wXC004kA^mG6K delta 535 zcmaFBa*;(kz?+#xgn@y9gMq8$kRa z{piDurm(#G4L;m_c~5LiC*{?*PI+gTo~tS}qbp1@-p;n>FPpSjPQr%oO&d-z$SbGV zD&1Zcnrp?v^D9QJS2FC8SMZIN&6jR^bnBP|SXns6X)KtXF11Z3WR9H6O|NYW3T@9H zv6vw_Z)4kf9~;?=OxKo)%1BwPdEjueD&x``QG=gMX-{sot7bcKu}Nv}aoBRX{@3z4 zukQ3up7*bvQw44 zW{KCHvGHV{uW|FLz}J)aPH2}ti~HD6voQHf@fEpu+wcCnUjHWSJbTFWfcmt55A&|f zU*5&VyVWeEd}H~cCBCoP-!8cG^NV5YWqC&XgW~&_dsMxOKf6tLGhff@n`H}4e_46- zhiv;;COP?Caq86eEw}%&1$Z+u*)w2?$H{*gP4(&(SBCx&yux^BW|H5%IoV6jo-M0+{_C62i z`7%o)UDNi-G&Zir)a^N^T(@fr2zJ2g7@299-Ucz0D?JURhI(l{2?AJN{Q)buf zN6CilTcq~gy+3WKLh8qr8r|G>hOFCeXTRK`@b_d*++ybUPd`up`?C3;^!)9&gHN6~ zY07=pV$YqLvIg9ffCFeiy+&DkE?YP6&zfJDQ9)*;{VW%zruAX*Y=%1ag<>9GOCDChQ t9^ZDEd_TaOkx7IBcccU39S9T@z!V}01bDNufrJ==&>TpA2Bs4R1_0Y2^Vt9Z literal 695 zcmWIWW@Zs#-~ht6jN5$}kN_ux07F?ysdIr|Wo}Mr1P{ZyB`nc>K>U?agkf!nZ~rX= zfxVx#mp$SNj0m+YSiEBDgb0V-8Tz5AmLFSsu5Apy&H3nlxl@9rWw5q>eg@Mftes zJZjv?E)!q)`IAVPRrDh6l65!d zv@}g-Y&{$=YN>OfC0u=bDoe0}a6$XJWc$|DnkhlmH6O3E1tq2&^mJ~RxooZ@Yc-eU zn()oMHg^s#O2}dC%h}M+qqFb)qmwMJcE2b#Vayb&)-P5!~g{zpH(>uxRi-}bz=DrlO_`k9Hp-WAO@Zi~taYO>e9#`?$LnrKk}f(e5=@vF`3!YEV-64r+>7T_sj{)3M?jnPg-bK?|p7+=drk5&bs~iF@8^XI$SRcJeZ%m-r;jW ztX-17+UqAVk}8UeBfkE(Ivwu!|Avllt8{u`sL6KMleZ-PumyOtb7TbXULwxKz~IWp yz!2cg$Rx^)NMFcuoD4j$)aJ0H5yV7FZ5;5_7U0baG>CzL5eS`ubR5uV1_l7jBq<*N diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip b/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip index 3a847c6f564a87fa55395bf2bce4596ed4acb1fa..dc57864564a655bd53afa46f5c91930a66045064 100644 GIT binary patch literal 458 zcmWIWW@h1HU|`^2NND};b9f1Nrw1bg!vrP<1_7XGPJUvFQ({hHUUF)YUS)1hZQxly zCPRUJlRxlHuDIyJ8TZ}ez>y;gh6P5;H19I1m053{>$>x&)V_KCN#)${UNzn>+xPR? z@5qN4TeJ$D`&w?eZapq=*`4u{(?qTOK-rSit81lJe=K;g!$p<7e`CW#hEI=H%sh6H z`E}8vwPkG17aJH<*={ATG;3V_==>+)%?@#&8g1DYmKgIh=p|UroF{iH&vL>Wtsh4x z7kmnEnBtIk+n0IYRgn!k35#=&@O3O&>NoGBvS(nc-VxYOCsH!y7ZKSbR!V9zOqQy5`yB<5z2}X74NUUdb(d!h2n9dqH}n zHy7*l@7=2x_rE{Cp5sl_o$Xo=0`6JvQTxruW8LmHX=ly%8%~pr$^`Qqs^_n;$}SbF zl9f59_9mF=*0+E=6YVGd+Wd_FdQ;)a+G{tx>KFpN8JR>FaECiE=z%~%0Zd`ULV!0b R8%Tx`22R4mjY1x;;+x+goY>hjUZWnQ>sB4Pone>28U;DFXgB^CewBHK|vgJt7 z{5WyVy`>jc#Xos2z@nwOOrTzqbNbv;h62{vPyaq`%99s5y|7h&kHmByu1zZ6eizPq zvGuV_*g?M7Wr8P~E=@i2C2q|QRs9!QSq6`$$$tO0xUn$Cg6p5uHLhUa&ku5W-YktQ zk3OCjGG&%p;gnyC*qhwN1H9sP#I4OgCl)V1U$RO5gM|)*|0l6a-k#46vb;a(5%O_u z^?BCcOqD+6+!DzXlfFtR`@EX_kJo;xO3~p(H4iETebfIwFLkO6HmYR~@MdHZVZafZ Xz%T{@Mg|3j$@3W1*dlhc%7 zJ5ob7ES5SD;l%cO;U}}52lzh)Z9MxUkZY~a*QGUwm7WRa%#YDjs?)qV#aZrPX+vGg zUl)m=t}WhEqAFOn^YO^tpY&;`CDVmh2UXUr=X!l%!4~1|YCEzvF3MkYDQuhO;a4U( z%gfC3zpRN)IsSyn>Y=OOJJ*7+lNZA?eML@PNbFg2Aml|$%L|*2UnVjc3Nk3G?fAh4 zbgt8vD`{UZ^=;cTUwCN^r_DP_C8$Vu7b~TaWj(IKevEbwSH!GL!cP&wH z+7Kk@7g_%3XPA7P$!mSLoll?NU;W8DESFjT`}>wIyV~Hnh+ z8<=hdJN5=&$(^br?eOPjyy-3t*Gn6(UwJ(Lh4z!|Xx;p@pydme)jOVLyRx$C5t~T; zKY7>Ry}=b-bN+sPY2$gC-~VU1@TPAGNBvEetJ<%uj(sFodT)|~^M-wF=2sqYi={ic z8DxHPdfcZM>-uwpDQ8Y(T&0xCc169VU828aSwGwUbTl*H>=EbtqPg>paa6?qHP0QE zd4`yjXZaVMTh<~p!=m@D&-+cu2K%D_pEC9dZL?l=xiw+(^e-FAvdSfoU1pXuoh~bt zm!i1%gXpnyN99Dt-*3;|^j1>rg8xnL4f023Zf-mpd)BNXywFF`Fxq`v*H8IAO=Gu@ zp3DDrE=}~4{4wXRW9r{ONySH;5{@Y~oLW}u={D1qE3)DIi8*#pc5}Ddyn17^;%}4l yN;j{x1Mf6>>X`$)8JR>FaOV+VHeq07PykUtfResw6~$_d|Oah72rDbPa*&^v2lyEG>#c9jAfTfK>f`Y#?uBmvvoXqU~ z;o!v?PnU+~7T0La*;aXeVYiHluxf};<(n|hp4J!MJN8QVug_PTE}mI?@a?>yyt)5M zU9Fd#?c|*A&?LXv6h&nOyNHjn9Aj@AIo{KE1vE>d%3!+ed2uWUYGe=z5NsW3qQNdZ^znc(~H+Fn!ed~g{8w=NB=hq_bpzO zo*Dku@m$YlcHPf<|M{H0$*uXJ`dq_o)%D#+Okdf!E_2R1uuAG@!%@q}j3qg87nVAQ z2icyS^&=%x?sBfcTkXP?A!{zKwN<~r`dN|OiPeT%H%=&Z!bGd1B}{wV)BLCZ(a?5z(A9d*u(~@YY*PAxi|G>oSOdHn znd}*G#fR;u!u{5bADJSmN_YEn@ zaw54(HfRtaku)5>d7ODO4A$o|bEIWZ*7%L8e0FbbSj>bd$mdQ~{9z%M8|4Ll!-nvo zl(i1x%)#)qH2k0nm+NR-ZQGa!&5IJK$+ zdB!6|V6+daNKelYUW(eNA2kV8kO`_(*vOU~#R zACU-Y_6=lX-4;s#F#vDYz~KKE!UL;W_i!4yr9q^T%PuycD>daIam$NZ*u(gwPt3+} zqFut~$?X(E3yoox_K6PpuMI6h!H%%9wFPP3J-5!0udFE$61J{s;1Eo--iBjtoMwM0^L=vY*Hn=y{H+;`{OHsNXpr99T%`;@vTZrIvkppT z3USkrWRUOC(`#ezM<-XBhB>$lL2^k<4WGq(>Y2;vn+s|BvDn?$u%{^afx5qZN);!Z(d2_WfuZ0AQcrkexC|Z z+oV;4f-qlpA^ zi9gU^V-GHI79SYhhipEsa5>Hp%FD&wGWJPqm3h!))?u>{pJ$0hZZo4ItL+*sLN{iq z{Y1`UA}~!I6^+SR`W&mXNl$!S?W1wZf|M-%4s+geIKP0Ki%lUv&rhhgqaU?$R4ha( zwWrz3+2TZ4^L||Y2Hga}t?;R`KD8|V(DjpaT-`Zb3WxJn@X+MyK8+g)(W8Nf)C3Q0 zG`>&H&~py7bPf;w(z@ZZJ*lj}C`jd0X*sQ|FZ88rBhxjtF9biOsT|k1rv7G8%f+pk z7WQ;S6&pBak^2udeO*lGL!|(?I?%-@Qfw((0s`Ho>Km*vl|hwnRV+7z7YTl<{1~?tgg3oYHT>Q z`mk;qpW{PBZ2N8Hqb7C{*8nZ)!`Q8krT6#iR&bLotL*B~M}|}{z2bqt_6za#&%3+Z z`{kGG7lZ~^Coydm`=PEUA>rE=+Aol#?$txr;PUT)>v@y%8~Zp2?wX(xI^N~VbVubY z+6n_aoO)ZkoL&RxWQHB*)|C1@%Br8stLWf)3cVcl2F~uSv))^0ybj3#87{vMkojLO#F4c&ylD#+mQSFbYgg~*5(y?5#gNj*uV8obC~R>r`eQyZ@jv* z0naG()I2oSajW4WtK4PZlnb@gy*X=282w3Wtow{jK*yVo4?#V{-u?RjL)Tt={{>J> z0Rj{N6aWAK2mqyf&`g(sQFlNE004p%000#L0000000031AOHXW00000a%F5`bZKvH mb7*OBRC#b^b1r#pY*0%D1^@s60096207C!(0CNQZ0000z)X0SZ delta 1438 zcmV;P1!4Nk3$zOzP)h>@6aWYS2mp;tvP=K~0000000000000#L5R;$<7JpS(3;^|z z{#uEU{#x|`6ackX!EW0)5WVLsh+dokse)d8%O+jy0*fR_y}cT=L|H^>QY9&;-ml*` zq$tU$rNnVk6bLL1hi@Kd-V7P@#^pS-LUAvRc9pDM_GpZspE3L^gv+h0X=%9^@R=|dq;J^8J>yC-gZ*}Fhr<>tw}O?{Y_foX zdvE2c@xnz+EMi{DBK>}b^O`kU{%i!3h0tD>633Y`z_x-b`JX75)XsCA3tHgMV2DkP zpCTfTa9qH{xZbtEwXqv)0ZVg>da_KGpy z1INfv9iq}?!WGlPKNi`7YW@W-HN5> zb}jsp4r{6U+``Ry%~w)^Q*e?zjz!28W%UA(> zwuy}gW1)JwV0SHD8ubu7y@iEglzgSc7#r8#b1IzI6G4*y`aIylKb79$s3`|1P?xbk zQRw0qhbV|k+JD+ZJ3#J}X;c9(tZ}IK5?kX*lwTZmXDnZfmO>JP8?&iNGU>}3=)CU2 z2sV(GT3A|1C8|tRw-Nc6Ejr0SBS^+c$ZGB@W}*s~QbB2U4(fPu32Bpg)wyIz)1u;2 zL+yQ0m_-5V2fTxt5HO49a0qFGn~3$%d%cPXTmw~xI)Be*SBuf%m*IjE9_WU-G4oONL*`yqeIQpDMIJF_Yd(7`^KW{ z$DDoi>5iQ4o{@iDPn2dbe5yScScIF&Tt08L2*6f z=DShNMof<-Q~Ud!rw=J%tVl|M%Gm~NBP7Me@wX<4_usckvZFQW^s4Vk(;bAKAB~%{ zZ-4(jJlsDnzTO_7*xM#aa?<`~)4UQBy#vwUfhqRH0nQeodq;%7H$PXIrxBpH0t%zT zi?fXHX?jSm@Svc_qG@a{j)nF@9v(j!zhmaTZOA-j#(e8!d3r*macJr?@HBYh_L$M2 zlh|<`+&^$n58Lz5(a3acXeqbZcWHgY)lf-u%W;#${-IOD#K82Vx9(f9.0.6.v20130930 1.19.1 1.18.1 - RELEASE + 4.12 1.1.2 1.10.19 1.9.13 diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml index 6114876d2d..d9b3676b5d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml @@ -54,7 +54,12 @@ org.testng testng - + + junit + junit + ${junit.version} + test + javax.inject @@ -78,10 +83,4 @@ ${project.version} - - - - - - diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml index 999f112f87..5376a037fb 100644 --- a/test-apis-ci/pom.xml +++ b/test-apis-ci/pom.xml @@ -305,9 +305,9 @@ - org.openecomp.sdc.sdc-tosca + org.onap.sdc.sdc-tosca sdc-tosca - 1.2.1-SNAPSHOT + 1.4.1-SNAPSHOT compile diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java index a464eb1bdf..8270515643 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java @@ -6,14 +6,14 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException; -import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; -import org.openecomp.sdc.tosca.parser.impl.SdcTypes; -import org.openecomp.sdc.toscaparser.api.Group; -import org.openecomp.sdc.toscaparser.api.NodeTemplate; -import org.openecomp.sdc.toscaparser.api.elements.Metadata; -import org.openecomp.sdc.toscaparser.api.parameters.Input; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException; +import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory; +import org.onap.sdc.tosca.parser.impl.SdcTypes; +import org.onap.sdc.toscaparser.api.Group; +import org.onap.sdc.toscaparser.api.NodeTemplate; +import org.onap.sdc.toscaparser.api.elements.Metadata; +import org.onap.sdc.toscaparser.api.parameters.Input; public class CsarToscaTester { diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java index e81c63fa53..36fdf06a36 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java @@ -93,8 +93,8 @@ import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils; import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser; import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils; import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory; import org.testng.SkipException; import com.aventstack.extentreports.Status; diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ToscaValidationTest.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ToscaValidationTest.java index 14583607c7..324966c105 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ToscaValidationTest.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ToscaValidationTest.java @@ -25,11 +25,11 @@ import org.openecomp.sdc.ci.tests.utils.general.ElementFactory; import org.openecomp.sdc.ci.tests.utils.general.OnboardingUtillViaApis; import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils; import org.openecomp.sdc.ci.tests.verificator.ToscaValidation; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; -import org.openecomp.sdc.toscaparser.api.Group; -import org.openecomp.sdc.toscaparser.api.NodeTemplate; -import org.openecomp.sdc.toscaparser.api.elements.Metadata; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory; +import org.onap.sdc.toscaparser.api.Group; +import org.onap.sdc.toscaparser.api.NodeTemplate; +import org.onap.sdc.toscaparser.api.elements.Metadata; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ToscaValidation.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ToscaValidation.java index 203368d361..1c44f1ab4c 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ToscaValidation.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ToscaValidation.java @@ -5,11 +5,11 @@ import fj.data.Either; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.ci.tests.execute.setup.SetupCDTest; import org.openecomp.sdc.ci.tests.tosca.datatypes.*; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.toscaparser.api.Group; -import org.openecomp.sdc.toscaparser.api.Property; -import org.openecomp.sdc.toscaparser.api.elements.Metadata; -import org.openecomp.sdc.toscaparser.api.parameters.Input; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.toscaparser.api.Group; +import org.onap.sdc.toscaparser.api.Property; +import org.onap.sdc.toscaparser.api.elements.Metadata; +import org.onap.sdc.toscaparser.api.parameters.Input; import java.lang.reflect.Field; import java.util.HashMap; -- 2.16.6