From 372c2470e613128f1e33cfc581ea2c5b1b732d2b Mon Sep 17 00:00:00 2001
From: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Date: Tue, 9 Feb 2021 08:39:23 +0100
Subject: [PATCH] Add validation of manifest for helm packages.

For ONAP native zip packages added validation of manifest file.
HELM package is only valid if:
 * isBase flag is set to 'true' for exactly one helm entry
 * isBase flag is present for all helm entries
Zip package is considered to be a helm package if it contains HELM entries but does not contain any HEAT entries (however it may contains entries of other types).

Refactored method OnboardingPackageProcessor.processPackage():
 * simplified logic
 * enhanced exception handling

Issue-ID: SDC-3185
Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Change-Id: Ica3b1f1504ce4fc3a671c4b8fa8de2bf0236bd77
---
 .../src/test/resources/Files/VNFs/vLB.zip          | Bin 6789 -> 7218 bytes
 .../src/test/resources/Files/VNFs/vLBMS.zip        | Bin 7218 -> 0 bytes
 .../OrchestrationTemplateCandidateImpl.java        |   3 +-
 .../impl/onboarding/ManifestAnalyzer.java          |  73 +++++++
 .../onboarding/OnboardingPackageProcessor.java     | 217 +++++++++++++--------
 .../onboarding/validation/CnfPackageValidator.java |  77 ++++++++
 .../impl/onboarding/ManifestAnalyzerTest.java      | 152 +++++++++++++++
 .../onboarding/OnboardingPackageProcessorTest.java |  40 +++-
 .../OnboardingPackageProcessorUnitTest.java        | 143 ++++++++++++++
 .../validation/CnfPackageValidatorTest.java        | 137 +++++++++++++
 .../helm-package-invalid-missing-flag-isbase.zip   | Bin 0 -> 1374 bytes
 .../vspmanager.csar/helm-package-valid.zip         | Bin 0 -> 1393 bytes
 .../org/openecomp/sdc/common/errors/Messages.java  |   4 +
 13 files changed, 760 insertions(+), 86 deletions(-)
 delete mode 100644 integration-tests/src/test/resources/Files/VNFs/vLBMS.zip
 create mode 100644 openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/ManifestAnalyzer.java
 create mode 100644 openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/validation/CnfPackageValidator.java
 create mode 100644 openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/ManifestAnalyzerTest.java
 create mode 100644 openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/OnboardingPackageProcessorUnitTest.java
 create mode 100644 openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/validation/CnfPackageValidatorTest.java
 create mode 100644 openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/helm-package-invalid-missing-flag-isbase.zip
 create mode 100644 openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/helm-package-valid.zip

diff --git a/integration-tests/src/test/resources/Files/VNFs/vLB.zip b/integration-tests/src/test/resources/Files/VNFs/vLB.zip
index b61ca1b83b85ec4cb2ef9adb37280abcabe1e8bc..c542870bad6c69a7bd6e3587fd11e445aaf8bcef 100644
GIT binary patch
delta 6213
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
W(a`@M=m{DK4YYy;0!cmp8~zV=X~`o1

delta 5774
zcmZ8l2Q-{b+g@D|o#=ufqODF4UWpbp+31@UJw#ukdm?%Z(OdKyu{w(oR_{cwu`5E9
z&1y^3KkxgW@BhB<pE+}`Gjry;?zzvLIp><YPCi_Q-cW~#m=Od5k%O$v#dM^Fx3g>M
zi3tf~-RfBgUlRa-FM^CtZC+D=K>X?;(9J(vt*zj8mam<y#r&*XocAnt5MNbkuf`#9
zS-#N}Fq^lN#J?V?6P8Q#N$a$!Ha2*-<@@^Gw(J&!+c!5fEPZ{uCTd-ni<SE}wmUX9
zrmIj!jdxtjv*_E@KEYnD;yPqFyh)2J8dc&Us)6o+9JvYV!`Pj`Yf=-j=N$weCV$d-
z1q~`EEO~Y*ZN=XHu7=2(*jF;#A}3BjntGO1yv#+)p73EiQ9ekJ!urIG%=qgbzFTV~
zx8Ad#x|jIf7^7daRq{Gm*0VJwq0FdfIt>X^?|F}ke}VDmIMvLKq=$0vzTol~J9MGu
zhAKP+bWz_P#h6H_gVU%csrGrUq!)S!lB42Oq=dR(S01CgBLyIfvP2Rter&9bn3DD=
zHetTJbFPGegA+=V{Hk@P8t@}|_M$AVb5ICKmWiX^R+R#vMR;BQB#C+(ebGs*$=n}b
z?A}k=0;`JicTFK6ei=a{sQ7S;+Tc&xHHyIJHyq+^MVjNe32Sx^;H@K#mGg(bvTxeP
z{ZCqpu=QM5N1*%dCOG6$n-2jpR*D?jZ<v2oT&%NGj;D^uabV0KHZQpQy-Cr-rC~Tv
zY(Ax1+SC(Wr0`}H?8CP>N<ITm?1gV4Y?E>`G-R3s{#-!2g<{~e@$#4RUB^7;SRjOP
z1PvEheSc3?Kf3;{Kdo+)pA;SE?$pZ>`Q)_k$U0rmR~7B;dJfy$y*hK^u$IM_@=A5#
z?2lz|<oh*!$zSA^j@~kf<PndwbSrtnC(T#8S00@cddf5^jQf8G=Brew8t97*-t{5<
zP<EnuLiP}>ahMgUTceO(?$Jh2a|HCIDfZuN4h)Pj!10;zxDmCKs2I^G$^L+`w}ug+
z-kW&;s;IpwETd*7_rvQGr{rHBY`ol*c;4TUS~nBqvLG$&YoKAA$Z-zyT|NrCHRdz~
zXQ#-2hGbbUXbcn+om+SSvHXjmfSYjNHMWHG*_eAki$Ot%TAxxP#~wb&l_3XU^q&l%
zW#^*siPksNDT)hF6)`jDBF=U~8Vd~_Y~vnx+?w=nPljNBmD=Sk{6Yo}T=G?BjD*^T
zjH5m@Oh2(53p|=sIN2cZDxRviP{h4YRHIi{Tip5lcGCKD`n$V69=DWle2GN(eQ9{E
zc@gKZy0^;Cm}8ogpn<XQSJcD+F>UwK<Oe&<Q|WuMTZ_~hZ~-6bDX8wqmXiAYUQTN%
z@OI4G+s20|yc=S$eZv~dFxk*&TiVQeFtjku6rYKjHc@!r(tnx=b??AQ#3wnz%0d$y
zr#Fb$N}70-&AtpEcPoU!`$GhJy2>ZF%+hZR==3MN-q#xP4ld!t1gdKQ8Kr$qyO<~$
zXN8z+^k?rCu^eojLWSVWNlPf!Sj_?$NBtDDFkV6xIYT7_R`%fCd-%`p;rD!>@>95(
zL0&;>V5;&AU9rL3WtKv-75PSjZOz--N1W~QuP(W$v7yixX&Ba_5*^2T$uZ~>=*zoj
zp*zFRXKpal52ucDs?h^t0wX^Zf0p?@wUTO|hyE2LQSMZJ;B1eQ)Xwlf#tG@0vMp`v
zg-w=FtDuhdEBhA#C4b*9CXuFm(Mx&HO2;w=wnyeiDligWjzi^Xh@wS>?G(D-Jy~R9
zsP$Bc2=@!YEu!wG4CcGp;?3#?Oh_m}zx{F@(M)}3405~pTN|*{LUSXqo20qL;d7~i
z75o59>sj_wJO4H#X6mcZw|%4dx@!r`zXqUtXgd<$SDcNjE`{DRZs>aR;|CbsD=*zf
z1`M8r4c&t-EwASBWih2ho7sr7xa9@BnHcCLG3z?)Vz3GJN5WL!t9sk!lDvOrlI+S9
z&SHRbjgj4SPy<?7yljuyQ}Xj5B(v?cdof<K?osI0pzmif@nc`mE7@ue-y}T<?l6r0
zEQ2rIoo##RnB_m@-ADzg;t<UkL5u%bM_I^7afw@teAcIwuA=s)fe8eu+^KJWfi_*X
zbT!!(>jGIJ$ODJ;sFZcdb2dgD4+&pbr2J_9_8b%fXadNP3uw`k)tAM2q$iQ%xina7
zqWdaouOzJpZZM;MYyscX=AFrZ+?sr&7m#~%$;BzQX^BYYf$koq_uMSMpK@sbWkpUS
znr(m7#H(o^$sXALVsO!giZh5qq~K`*8HW2!+Kk#Jej@nMCzTzTC~v<AhB>oF;$v2M
zPew3#<Q6av?nS&|a}#_|-C>{js7V81^0B@4F^;JrSo?%Nx^8+0ln&N(9-RAG9bu4h
zYhMF_iAy%ISvgfJ44nXMf7fk{O0{L;WOBiCr}sX%MRltvmuU2tqWNrGV$*KFFQV4(
z6(RmB@N3fjF;C{#Fu5}2*+M6L(5#UTwyuF+Ss9q}5PKr_)RoVkB_iA`+~@FZ^!a<m
zi~w~P-^<^{u(jkRA!+gs*qdZix4!7v!B6cP+0-4uLCJE*2L-w_aOTFoorQ`Go%?fb
zto|(n6T*>_4NYXT%f_Pz5XAtysWqM6TT_X!!t@oLZ5e16$F?7yZBo3IqQ?I=X*&05
z!!!UbN~#=!W*;?;Mux>x;;d_h?Z0&t1jYy&fCZ)aI^U_KpU|}?F`?#)My!$w5)n#p
z4fMkxuCI%eppu6aY!Hb4JrPV3Ze}Z|02Vqnd|}!KR;bWY5g9J$6BRB?4tY~;p)g&S
zAtE3!{xEsC^XUgt#)f;L)&<B1sopFI7JzD)@GzZ(v@A%ND3^Mp#Cr5GaXhS&hpWbq
zN=vYss!ZXXZk1z{gT_s>dVOhf-Kego&@EQoUT~<WMP_Q9omGjmJ*nm^sQBox<fNUc
zo_e{H*q-c+Gn+}a+t_Z(TWuj+oyGYJHZ5@wW;T6+Jyf_t;igLx9ls5;mZhX_8KB?L
zhxmqadO15l-TAyL^UAuX=Yv?-z4DpnjzTK;tFf-OQl_xFl7h@9uH%IAW-NR9s6D;f
zGy=z=ggR<gQ4@a7kjLck{qf>O4#e$fxt2IVb>|Xu=Bjbe;h5sC@f4l@p&pym$E-*0
zOwp_YdZmnz3W$I}mTo56Dd|pOCZH=&8io*w$V%x&(k}*rMaxDp_Z(vhOSPQ}KXR62
z84>L;Kpr9f(y2KscI=eN{8}ryFWr~*b&&SPCedd5TIesdFv)QhXDu#ywP3ZGYEh#<
zH1^jBRYAC=k4sXEo@Xhu%p=E2^NrQ7=H{!u%8POK?h=OgH}f1eeHaDKoq>o7aLzUP
z5^*-E3tzCs@%S-uik>}0_2z}m^N@>MLb7_7>%+Fw`vz6XPa2geHsXLw2K8z=W5>5U
zCbLmn{t>(HjOO{1d22FF2Hy@}9g^@QT~w1_H^$)HDqFv<+n0g|P0b@RFsV1%<q+B9
zmGvg0n&qu2*TV0BFBtj9RsinA4)66LqoSQ_UaI*U?}BtR`<aeSzb+P7ALfx98NvPh
zt&+C3+2P%0wZ)yc8absR(?(MkaOWiARadoECjiWviIb`HC}!qVbIV969kmfEvB*^B
z2m?m2>Mt8ET08yfm4>IScMfGwEd!r>u8rXDYERSApA|Kx&-GV`0GyYWtQ;+p6J*Q9
zljAx)NgzX{<F)Cp2gR1sPhc)TerI<F*q^5!j3#LZgZ|sf8ur4!?-GJQJ|rLz^&i)2
z>k5b4SUEeoI*8f1zD`XUY|2uljX3e6z@I#N$ry^wc*bE!KvsvAo*>tJxoB^AaOBu7
z2V}jBV35s0oNZrI#=KRffIs6gr&jTRCX)nbbrT&(#8S7+^ldChcV$xAIlHITfsxTx
z?A*3FU8VU3TQ3pL>3DIGicpc8L2>s~;<<|LkZmQ(>$;Z?Pt>MJjkolHSd7#FA;HA}
z7}1${A>T0|CTiDP<qWSx`Xp#7j?dTuoEOcV@N6r#Nggs%YqFyaYTEmR;`j$~uujV$
z>{(XD(w8ZNXz`1}n;>8H&gaLg$ikf_wEVKC7p2?gJqPpZj<Ls+Tr|w+gYhw5T9pjJ
zSG^u1wY@^)tAK=8`mg6d(+&&#&f_xHZPrBYE^~MUW*bO}zbHmgVQ8PIsQICRhiVAb
z-A(mp4qHq%W-(gmIqAdDPvjBMr$)sb2TB_0t-DaoX`!tU8cHY+bl=XrAgK&@0p~9^
zV(YHCcWoA&udesF<I@^XFIlOF%i)t>a?X=q3F}W52{=PGAS3f4hr@}b#r{LU>-lWB
zfKGad=5&YKq6>bv=kW`?tJ*eTVLOm&caWKu2$?T=UFBv-<Z_p7t_bmo>6p!U_RRm6
zp0fDf!SLwZrNGSR=g-0|?bXB_)ucbTh*#FW(OsAiD(UNqwWc}t3E$a*>;(oBmFap%
z@pdJeSh+=#=^dmk<X6bn+q`m8Dusb*og1QC>!iotMY>7r7i-(<RDF*E&^g?bkFX9D
zTob_)dOp}^>EqjeDo&Kd9CYH#C1wc$_#r3E=NYJ5_CSEi6qR3{Qxdj>&XI<5&5z2s
z-P^4wFTpJufnDigaCrAQ(RabLA$`yo440&dDr@=pHP5fr(WLBR?P$tuX(+y&Xv_C0
z7j@}dVIv|<4mr1_>Q}F<n`e(RWl-tKWT}MH8Xg#k`?k+XR`J#f4oTBfwUiJwZ!{OH
zl@O}kw$KZS9pxE`xqm?Cx;j^Td+YuRZlIRix)aME!qY0c<n!;>aa{34N59iBD3S~W
zBH&KWrDFjQQ()SwZxE{6JhTmVOi$^w>=>8~4J}m33kLL-XA^t6UYiej-bQo{W_To(
zMo-1dXmt(;9{L#v<oI9{ltnM#{eHRBSQU<U-2Us@fOHG|XzD&$57~)bow0QX7`Ltn
zZSy>4J`&s%1V`PZd5FzU3CF1oh6&eWRaL0E3IUnBh!*pMd>hAHioE_Tvcx_DlNZb!
zXEzS_^PrxrFprY(IJEgD1@w030@MqSaj`WWX5?*(FlEz{(WEG_5>TVQNFHY(;w81z
z(7tQB3pc${uR0R(C6v+4lR`n}@2}g9E9s>^0;#Bxyl@Ha>ZRvZ#+>$5ds;HTB3PgL
z0EZJzlh!-mhvmO#DP3n!gm>uAbtVy`on!1HoJpP%WDCEO<QrT|rPt^=9M0bu`ILbf
zpeJ`p$tW$2GVWC>5C%oN_P95xM0A~sEbk<ctq%|E`-A;1E;fi^Cz?f9?vlRp5u1F-
z>%h|&U{)n=j6p)aN+6K|X*XGV2qpBdWH19SFlZEq1sOlQBW(vM@*}7V<E4*a^<Td~
zvtZdm6G?;3!OcHY`h0z{KuN(&RAk!8SNb4PNL4+$@@){0!}-U|sH^!YCsBE+Tr`WB
zJ+gV^W4orZcYDx={rTdtvGCfW39p1Pj%D9)tpY}v8|E3$CCW|JFH18Xd3nqIuXB+e
zpuBmCSh_D+h)2BXV<|+diR)}%9he62?g#GDq?+b(%2qMz%lU)t%$<@s{=BHT0Ev!X
zxzh}9RKOeW=!p4SJlO{|WJD+ebonPznorKdqf}Na*`C`wZ#e4X<BsD+3vV{UJGMn^
zbt>MO;@^|B#_G`~n0>>c!s8AwX$0j!YB6NjT>M8LL)TR*%=GSUFaDWG<=p#*^_>?7
z8F<n~DPBkUGtT~HL3!3Ar_;MWN>8k#joeezhs%;kPE56~ga%|1q})SAMMZSK8o}DW
zEUHZp@Y$s0*cOQ{NA+f$MfLxnG1ZJ~a<+{No8E5dHYDG{|MWT&7AQ17XOy}DTvL|L
z*6+otUg~%JqTz~TI|I$}X$PO~Z4MCm7MgwE5I0Z0yGz2I(A*j<`ha&Iaq-xhRQwG|
zi1JQc4@7RF;ZuD^wz=jv`&lk2-^Edz07M%>Z+gnFyYU{3;0@=b<Aj~*8I`SPRdLtv
z;WPBjVx+YX_&vOOE{6lr{(8Ac;Oa+5PEs{r;BR3^l()ek^`4XFM)(_q-NQDaF<Bi3
z7bQjHIHoCmuLxV3I6NV@NT0@ABh@IAH{bxf6Ds|kEZy`0$|JBB=b9uWUA@VOm!e#C
z=_KoTV9n@<no9&1I8VR6NwUIQ#oaWya0i2KE3&8UX}KsFc_;r{izxyRU{zb3vKko;
ziqk(%WJh?m0(*37jo_zM=#8z4`UmYIF={UPW`knIvS!C*@|XEbS7ahUd;0^3#s~{n
z)^%5uk|C@QLbXfQx1t-la6=3d2BpJDXB|Xj9vP|UE@cYe8vQV7Uv<3ID3gjv)6%#W
z?e@w^y(EOq+i$|4y>-BoIj6air$12vrDCC0AEmAXJ;cMghoo`7pO@XngWeLL!jdFh
zfU#{cVlmv<XE-Ykq0zOk0woOxUg_TMUmC{_(_BjX%LiY1dU3n;dYkQGLeDF8Q^#ws
z%0)b$B|l;3oX2neM$Q$rnODoz9eDh-OnS~w^3y>$Oer^8od$5FwQML|?R)KW8sRzU
zue^L8mhVnx)N%ZshHb;jC2}kHH+{@G-&g(2A6$Ml{Ea8~c}2KUJZF?69z*p9tM)~q
zZcKOHGY#+>wpZQWz>RuSIDYKu#WoQ*HGS{x%Ib0unf`2)V>l;^5{B`ndZ79sMKw@=
zal?6zCX8*B83usW$!d)D2y(4SR0rVj!wb83cRcy=usgFu=tUwz2)Rxhc#cPOjaLHm
z25jGf{>d}F?ev^>bMK~>)BdAlcay!PahjV7HNPqwv!3JFYclgGO1ZZuJf-iw$c}KY
z{NntR3Myb-Il4GHICx&Hs}o(u>(2ZN8$ET5Fh0gT1ZXHTtjg0z-DHIK?a~fB3E`?G
z18Q)m`+O;y%Ur?Vqgk?Kx4$5Usj-fFZE2fU8vL<JbnN5s`sczbCe0}jI_^Rw=Bd^N
zg-;?0(U<fHsC;UVcbQ~|!WmOV(at*<bqJ-0X;vA1WCiPw8Y98l56(vO`c0+cBGe`f
z16GBj01nJlKn-`%;MWBBYVTvat{PEZSY4lc7_nSTtg#X3gvnt+t}ipAY>2u7FL$?<
zFzx{{GQiu;x|OwocjHP8wcynDA-rwr)KzFF!=O}qWlui6H)QwraKJAxcfq@oN9Q#3
zygy7^ACI@_GVNO>>GdOZ#q7ye5M16u*&d3(%bn5I?4}q+t)=NiF-Ha`GP~IhO?UcT
z->-Vjt&iC0gyymjL!iAp!9g{7p+;<O*g&(udoQ^esP<^E`rmpj4PFndQu9~oG=nL$
zeSC~tb!ZZj)s`nIU+TPS;43$$H8nh5Av6d?9^Jq@z2?B=8R`%as(}8l_Db?k@iiI3
zCMlU!C(bP?Iz`YP5z_um^WXUY82?e2O>SlrefV+Ve`$6Wq5shSh5w)S-_H2XA8-73
zyZvYICkwK3K5PYn{|OH*3;RdsU-+Lo|Lq|_AR5qr>L@2ivU7=nvMu)Ee~y1(9{2O_
cG!{uC{?RkkAtC)cBJrOdOaKDyv-~~#AF@3i7ytkO

diff --git a/integration-tests/src/test/resources/Files/VNFs/vLBMS.zip b/integration-tests/src/test/resources/Files/VNFs/vLBMS.zip
deleted file mode 100644
index c542870bad6c69a7bd6e3587fd11e445aaf8bcef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7218
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
O?|TIb01$cmC;K0RCy$Z<

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java
index c331deb134..073400fd68 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java
@@ -1,5 +1,6 @@
 /*
  * Copyright © 2016-2018 European Support Limited
+ * Copyright © 2021 Nokia
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,7 +105,7 @@ public class OrchestrationTemplateCandidateImpl implements OrchestrationTemplate
     final OnboardingPackageProcessor onboardingPackageProcessor = new OnboardingPackageProcessor(filename, fileToUploadBytes);
     if (onboardingPackageProcessor.hasErrors()) {
       final UploadFileResponseDto uploadFileResponseDto =
-          buildUploadResponseWithError(onboardingPackageProcessor.getErrorMessageSet().toArray(new ErrorMessage[0]));
+          buildUploadResponseWithError(onboardingPackageProcessor.getErrorMessages().toArray(new ErrorMessage[0]));
       return Response.ok(uploadFileResponseDto).build();
     }
 
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/ManifestAnalyzer.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/ManifestAnalyzer.java
new file mode 100644
index 0000000000..ecb3ac62ed
--- /dev/null
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/ManifestAnalyzer.java
@@ -0,0 +1,73 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2021 Nokia
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.vendorsoftwareproduct.impl.onboarding;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData.Type;
+import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
+
+public class ManifestAnalyzer {
+
+    private final ManifestContent manifest;
+
+    private final static Set<Type> HEAT_TYPES = Collections.singleton(Type.HEAT);
+
+    private final static Set<Type> HELM_TYPES = Collections.singleton(Type.HELM);
+
+    public ManifestAnalyzer(ManifestContent manifest) {
+        this.manifest = manifest;
+    }
+
+    public boolean hasHeatEntries() {
+        return hasEntriesOfType(HEAT_TYPES);
+    }
+
+    public boolean hasHelmEntries() {
+        return hasEntriesOfType(HELM_TYPES);
+    }
+
+    public List<FileData> getHelmEntries() {
+        List<FileData> entries = new ArrayList<>();
+        if (hasFileData()) {
+            for (FileData d : manifest.getData()) {
+                if (HELM_TYPES.contains(d.getType())) {
+                    entries.add(d);
+                }
+            }
+        }
+        return entries;
+    }
+
+    private boolean hasEntriesOfType(Set<Type> types) {
+        boolean result = false;
+        if (hasFileData()) {
+            result = manifest.getData().stream().anyMatch(fileData -> types.contains(fileData.getType()));
+        }
+        return result;
+    }
+
+    private boolean hasFileData() {
+        return manifest != null && manifest.getData() != null && !manifest.getData().isEmpty();
+    }
+}
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/OnboardingPackageProcessor.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/OnboardingPackageProcessor.java
index a40f2ebd30..e863f34696 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/OnboardingPackageProcessor.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/OnboardingPackageProcessor.java
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Nordix Foundation
+ *  Copyright (C) 2021 Nokia
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,6 +20,7 @@
 
 package org.openecomp.sdc.vendorsoftwareproduct.impl.onboarding;
 
+import static org.openecomp.sdc.common.errors.Messages.COULD_NOT_READ_MANIFEST_FILE;
 import static org.openecomp.sdc.common.errors.Messages.PACKAGE_EMPTY_ERROR;
 import static org.openecomp.sdc.common.errors.Messages.PACKAGE_INVALID_ERROR;
 import static org.openecomp.sdc.common.errors.Messages.PACKAGE_INVALID_EXTENSION;
@@ -35,6 +37,7 @@ import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -47,89 +50,157 @@ import org.apache.commons.io.FilenameUtils;
 import org.openecomp.core.utilities.file.FileContentHandler;
 import org.openecomp.core.utilities.json.JsonUtil;
 import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum;
+import org.openecomp.sdc.common.utils.CommonUtil;
 import org.openecomp.sdc.common.utils.SdcCommon;
 import org.openecomp.sdc.common.zip.exception.ZipException;
-import org.openecomp.sdc.common.utils.CommonUtil;
 import org.openecomp.sdc.datatypes.error.ErrorLevel;
 import org.openecomp.sdc.datatypes.error.ErrorMessage;
 import org.openecomp.sdc.heat.datatypes.manifest.FileData;
 import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
 import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
+import org.openecomp.sdc.vendorsoftwareproduct.impl.onboarding.validation.CnfPackageValidator;
 import org.openecomp.sdc.vendorsoftwareproduct.types.OnboardPackage;
 import org.openecomp.sdc.vendorsoftwareproduct.types.OnboardPackageInfo;
 import org.openecomp.sdc.vendorsoftwareproduct.types.OnboardSignedPackage;
 
 public class OnboardingPackageProcessor {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(OnboardingPackageProcessor.class);
     private static final String CSAR_EXTENSION = "csar";
     private static final String ZIP_EXTENSION = "zip";
-    private static  boolean helmBase = false;
 
     private final String packageFileName;
     private final byte[] packageFileContent;
-    private FileContentHandler onboardPackageContentHandler;
-    private Set<ErrorMessage> errorMessageSet = new HashSet<>();
-    private OnboardPackageInfo onboardPackageInfo;
+    private FileContentHandler packageContent;
+    private final Set<ErrorMessage> errorMessages = new HashSet<>();
+    private final OnboardPackageInfo onboardPackageInfo;
+    private final CnfPackageValidator cnfPackageValidator;
 
     public OnboardingPackageProcessor(final String packageFileName, final byte[] packageFileContent) {
         this.packageFileName = packageFileName;
         this.packageFileContent = packageFileContent;
+        this.cnfPackageValidator = new CnfPackageValidator();
         onboardPackageInfo = processPackage();
     }
 
+    public Optional<OnboardPackageInfo> getOnboardPackageInfo() {
+        return Optional.ofNullable(onboardPackageInfo);
+    }
+
+    public boolean hasErrors() {
+        return !errorMessages.isEmpty();
+    }
+
+    public boolean hasNoErrors() {
+        return errorMessages.isEmpty();
+    }
+
+    public Set<ErrorMessage> getErrorMessages() {
+        return errorMessages;
+    }
+
     private OnboardPackageInfo processPackage() {
-        if (!hasValidExtension()) {
-            final String message = PACKAGE_INVALID_EXTENSION.formatMessage(packageFileName, String.join(", ", CSAR_EXTENSION, ZIP_EXTENSION));
-            reportError(ErrorLevel.ERROR, message);
-            return null;
-        }
-        try {
-            onboardPackageContentHandler = CommonUtil.getZipContent(packageFileContent);
-        } catch (final ZipException e) {
-            final String message = PACKAGE_PROCESS_ERROR.formatMessage(packageFileName);
-            LOGGER.error(message, e);
-            reportError(ErrorLevel.ERROR, message);
-            return null;
+        OnboardPackageInfo packageInfo = null;
+        validateFile();
+        if (hasNoErrors()) {
+            final String packageName = FilenameUtils.getBaseName(packageFileName);
+            final String packageExtension = FilenameUtils.getExtension(packageFileName);
+
+            if (hasSignedPackageStructure()) {
+                packageInfo = processSignedPackage(packageName, packageExtension);
+            } else {
+                if (packageExtension.equalsIgnoreCase(CSAR_EXTENSION)) {
+                    packageInfo = processCsarPackage(packageName, packageExtension);
+                } else if (packageExtension.equalsIgnoreCase(ZIP_EXTENSION)) {
+                    packageInfo = processOnapNativeZipPackage(packageName, packageExtension);
+                }
+            }
         }
-        if (isPackageEmpty()) {
-            final String message = PACKAGE_EMPTY_ERROR.formatMessage(packageFileName);
+        return packageInfo;
+    }
+
+    private void validateFile() {
+        if (!hasValidExtension()) {
+            String message = PACKAGE_INVALID_EXTENSION
+                .formatMessage(packageFileName, String.join(", ", CSAR_EXTENSION, ZIP_EXTENSION));
             reportError(ErrorLevel.ERROR, message);
-            return null;
+        } else {
+            try {
+                packageContent = CommonUtil.getZipContent(packageFileContent);
+                if (isPackageEmpty()) {
+                    String message = PACKAGE_EMPTY_ERROR.formatMessage(packageFileName);
+                    reportError(ErrorLevel.ERROR, message);
+                }
+            } catch (final ZipException e) {
+                String message = PACKAGE_PROCESS_ERROR.formatMessage(packageFileName);
+                reportError(ErrorLevel.ERROR, message);
+                LOGGER.error(message, e);
+            }
         }
+    }
 
-        final String packageName = FilenameUtils.getBaseName(packageFileName);
-        final String packageExtension = FilenameUtils.getExtension(packageFileName);
+    private OnboardPackageInfo processCsarPackage(String packageName, String packageExtension) {
+        OnboardPackage onboardPackage = new OnboardPackage(packageName, packageExtension,
+            ByteBuffer.wrap(packageFileContent), new OnboardingPackageContentHandler(packageContent));
+        return new OnboardPackageInfo(onboardPackage, OnboardingTypesEnum.CSAR);
+    }
 
-        if (hasSignedPackageStructure()) {
-            return processSignedPackage(packageName, packageExtension);
-        } else {
-            if (packageExtension.equalsIgnoreCase(CSAR_EXTENSION)) {
+    private OnboardPackageInfo processOnapNativeZipPackage(String packageName, String packageExtension) {
+        ManifestContent manifest = getManifest();
+        if (manifest != null) {
+            List<String> errors = validateZipPackage(manifest);
+            if (errors.isEmpty()) {
                 final OnboardPackage onboardPackage = new OnboardPackage(packageName, packageExtension,
-                    ByteBuffer.wrap(packageFileContent), new OnboardingPackageContentHandler(onboardPackageContentHandler));
-                return new OnboardPackageInfo(onboardPackage, OnboardingTypesEnum.CSAR);
-            } else if (packageExtension.equalsIgnoreCase(ZIP_EXTENSION)) {
-                addDummyHeat();
-                final OnboardPackage onboardPackage = new OnboardPackage(packageName, packageExtension,
-                    ByteBuffer.wrap(packageFileContent), onboardPackageContentHandler);
+                    ByteBuffer.wrap(packageFileContent), packageContent);
                 return new OnboardPackageInfo(onboardPackage, OnboardingTypesEnum.ZIP);
+            } else {
+                errors.forEach(message -> reportError(ErrorLevel.ERROR, message));
+            }
+        } else {
+            reportError(ErrorLevel.ERROR,
+                COULD_NOT_READ_MANIFEST_FILE.formatMessage(SdcCommon.MANIFEST_NAME, packageFileName));
+        }
+        return null;
+    }
+
+    List<String> validateZipPackage(ManifestContent manifest) {
+        ManifestAnalyzer analyzer = new ManifestAnalyzer(manifest);
+        List<String> errors = Collections.emptyList();
+        if (analyzer.hasHelmEntries()) {
+            if (shouldValidateHelmPackage(analyzer)) {
+                errors = cnfPackageValidator.validateHelmPackage(analyzer.getHelmEntries());
             }
         }
+        addDummyHeat(manifest);
+        return errors;
+    }
 
-        reportError(ErrorLevel.ERROR, PACKAGE_INVALID_ERROR.formatMessage(packageFileName));
-        return null;
+    boolean shouldValidateHelmPackage(ManifestAnalyzer analyzer) {
+        return analyzer.hasHelmEntries() && !analyzer.hasHeatEntries();
     }
 
-    private void addDummyHeat() {
+    private ManifestContent getManifest() {
+        ManifestContent manifest = null;
+        try (InputStream zipFileManifest = packageContent.getFileContentAsStream(SdcCommon.MANIFEST_NAME)) {
+            manifest = JsonUtil.json2Object(zipFileManifest, ManifestContent.class);
+
+        } catch (Exception e) {
+            final String message = COULD_NOT_READ_MANIFEST_FILE.formatMessage(SdcCommon.MANIFEST_NAME, packageFileName);
+            LOGGER.error(message, e);
+        }
+        return manifest;
+    }
+
+    private void addDummyHeat(ManifestContent manifestContent) {
         // temporary fix for adding dummy base
         List<FileData> newfiledata = new ArrayList<>();
-        try (InputStream zipFileManifest = onboardPackageContentHandler.getFileContentAsStream(SdcCommon.MANIFEST_NAME)) {
-            ManifestContent manifestContent =
-                    JsonUtil.json2Object(zipFileManifest, ManifestContent.class);
+        try {
+            boolean heatBase = false;
             for (FileData fileData : manifestContent.getData()) {
                 if (Objects.nonNull(fileData.getType()) &&
-                        fileData.getType().equals(FileData.Type.HELM) && fileData.getBase()) {
-                    helmBase = true;
+                    fileData.getType().equals(FileData.Type.HELM) && fileData.getBase()) {
+                    heatBase = true;
                     fileData.setBase(false);
                     FileData dummyHeat = new FileData();
                     dummyHeat.setBase(true);
@@ -146,27 +217,28 @@ public class OnboardingPackageProcessor {
                     String filePath = new File("").getAbsolutePath() + "/resources";
                     File envFilePath = new File(filePath + "/base_template.env");
                     File baseFilePath = new File(filePath + "/base_template.yaml");
-                    try (
-                            InputStream envStream = new FileInputStream(envFilePath);
-                            InputStream baseStream = new FileInputStream(baseFilePath);) {
-                        onboardPackageContentHandler.addFile("base_template_dummy_ignore.env", envStream);
-                        onboardPackageContentHandler.addFile("base_template_dummy_ignore.yaml", baseStream);
+                    try (InputStream envStream = new FileInputStream(envFilePath);
+                        InputStream baseStream = new FileInputStream(baseFilePath)) {
+                        packageContent.addFile("base_template_dummy_ignore.env", envStream);
+                        packageContent.addFile("base_template_dummy_ignore.yaml", baseStream);
                     } catch (Exception e) {
                         LOGGER.error("Failed creating input stream {}", e);
                     }
                 }
             }
-            if (helmBase) {
+            if (heatBase) {
                 manifestContent.getData().addAll(newfiledata);
-                InputStream manifestContentStream = new ByteArrayInputStream((JsonUtil.object2Json(manifestContent)).getBytes(StandardCharsets.UTF_8));
-                onboardPackageContentHandler.remove(SdcCommon.MANIFEST_NAME);
-                onboardPackageContentHandler.addFile(SdcCommon.MANIFEST_NAME, manifestContentStream);
+                InputStream manifestContentStream = new ByteArrayInputStream(
+                    (JsonUtil.object2Json(manifestContent)).getBytes(StandardCharsets.UTF_8));
+                packageContent.remove(SdcCommon.MANIFEST_NAME);
+                packageContent.addFile(SdcCommon.MANIFEST_NAME, manifestContentStream);
             }
         } catch (Exception e) {
             final String message = PACKAGE_INVALID_ERROR.formatMessage(packageFileName);
             LOGGER.error(message, e);
         }
     }
+
     private boolean hasValidExtension() {
         final String packageExtension = FilenameUtils.getExtension(packageFileName);
         return packageExtension.equalsIgnoreCase(CSAR_EXTENSION) || packageExtension.equalsIgnoreCase(ZIP_EXTENSION);
@@ -182,12 +254,12 @@ public class OnboardingPackageProcessor {
         final String certificateFilePath = findCertificateFilePath().orElse(null);
         final OnboardSignedPackage onboardSignedPackage =
             new OnboardSignedPackage(packageName, packageExtension, ByteBuffer.wrap(packageFileContent),
-                onboardPackageContentHandler, signatureFilePath, internalPackagePath, certificateFilePath);
+                packageContent, signatureFilePath, internalPackagePath, certificateFilePath);
 
         final String internalPackageName = FilenameUtils.getName(internalPackagePath);
         final String internalPackageBaseName = FilenameUtils.getBaseName(internalPackagePath);
         final String internalPackageExtension = FilenameUtils.getExtension(internalPackagePath);
-        final byte[] internalPackageContent = onboardPackageContentHandler.getFileContent(internalPackagePath);
+        final byte[] internalPackageContent = packageContent.getFileContent(internalPackagePath);
         final OnboardPackage onboardPackage;
         try {
             final OnboardingPackageContentHandler fileContentHandler =
@@ -205,19 +277,11 @@ public class OnboardingPackageProcessor {
     }
 
     private void reportError(final ErrorLevel errorLevel, final String message) {
-        errorMessageSet.add(new ErrorMessage(errorLevel, message));
-    }
-
-    public boolean hasErrors() {
-        return !errorMessageSet.isEmpty();
-    }
-
-    public Set<ErrorMessage> getErrorMessageSet() {
-        return errorMessageSet;
+        errorMessages.add(new ErrorMessage(errorLevel, message));
     }
 
     private Optional<String> findInternalPackagePath() {
-        return onboardPackageContentHandler.getFileList().stream()
+        return packageContent.getFileList().stream()
             .filter(filePath -> {
                     final String extension = FilenameUtils.getExtension(filePath);
                     return CSAR_EXTENSION.equalsIgnoreCase(extension) || ZIP_EXTENSION.equalsIgnoreCase(extension);
@@ -227,24 +291,24 @@ public class OnboardingPackageProcessor {
     }
 
     private boolean isPackageEmpty() {
-        return MapUtils.isEmpty(onboardPackageContentHandler.getFiles());
+        return MapUtils.isEmpty(packageContent.getFiles());
     }
 
     private boolean hasSignedPackageStructure() {
-        if (MapUtils.isEmpty(onboardPackageContentHandler.getFiles()) || !CollectionUtils.isEmpty(
-            onboardPackageContentHandler.getFolderList())) {
+        if (MapUtils.isEmpty(packageContent.getFiles()) || !CollectionUtils.isEmpty(
+            packageContent.getFolderList())) {
             return false;
         }
-        final int numberOfFiles = onboardPackageContentHandler.getFileList().size();
+        final int numberOfFiles = packageContent.getFileList().size();
         if (numberOfFiles == 2) {
-            return hasOneInternalPackageFile(onboardPackageContentHandler) &&
-                hasOneSignatureFile(onboardPackageContentHandler);
+            return hasOneInternalPackageFile(packageContent) &&
+                hasOneSignatureFile(packageContent);
         }
 
         if (numberOfFiles == 3) {
-            return hasOneInternalPackageFile(onboardPackageContentHandler) &&
-                hasOneSignatureFile(onboardPackageContentHandler) &&
-                hasOneCertificateFile(onboardPackageContentHandler);
+            return hasOneInternalPackageFile(packageContent) &&
+                hasOneSignatureFile(packageContent) &&
+                hasOneCertificateFile(packageContent);
         }
 
         return false;
@@ -272,20 +336,19 @@ public class OnboardingPackageProcessor {
     }
 
     private Optional<String> findSignatureFilePath() {
-        final Map<String, byte[]> files = onboardPackageContentHandler.getFiles();
+        final Map<String, byte[]> files = packageContent.getFiles();
         return files.keySet().stream()
-            .filter(fileName -> ALLOWED_SIGNATURE_EXTENSIONS.contains(FilenameUtils.getExtension(fileName).toLowerCase()))
+            .filter(
+                fileName -> ALLOWED_SIGNATURE_EXTENSIONS.contains(FilenameUtils.getExtension(fileName).toLowerCase()))
             .findFirst();
     }
 
     private Optional<String> findCertificateFilePath() {
-        final Map<String, byte[]> files = onboardPackageContentHandler.getFiles();
+        final Map<String, byte[]> files = packageContent.getFiles();
         return files.keySet().stream()
-            .filter(fileName -> ALLOWED_CERTIFICATE_EXTENSIONS.contains(FilenameUtils.getExtension(fileName).toLowerCase()))
+            .filter(
+                fileName -> ALLOWED_CERTIFICATE_EXTENSIONS.contains(FilenameUtils.getExtension(fileName).toLowerCase()))
             .findFirst();
     }
 
-    public Optional<OnboardPackageInfo> getOnboardPackageInfo() {
-        return Optional.ofNullable(onboardPackageInfo);
-    }
 }
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/validation/CnfPackageValidator.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/validation/CnfPackageValidator.java
new file mode 100644
index 0000000000..8520672cd3
--- /dev/null
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/validation/CnfPackageValidator.java
@@ -0,0 +1,77 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2021 Nokia
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.vendorsoftwareproduct.impl.onboarding.validation;
+
+import static org.openecomp.sdc.common.errors.Messages.MANIFEST_VALIDATION_HELM_IS_BASE_MISSING;
+import static org.openecomp.sdc.common.errors.Messages.MANIFEST_VALIDATION_HELM_IS_BASE_NOT_SET;
+import static org.openecomp.sdc.common.errors.Messages.MANIFEST_VALIDATION_HELM_IS_BASE_NOT_UNIQUE;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData;
+
+public class CnfPackageValidator {
+
+    public List<String> validateHelmPackage(List<FileData> modules) {
+        List<String> messages = Collections.emptyList();
+
+        if (modules != null && !modules.isEmpty()) {
+            Stats stats = calculateStats(modules);
+            messages = createErrorMessages(stats);
+        }
+
+        return messages;
+    }
+
+    private Stats calculateStats(List<FileData> modules) {
+        Stats stats = new Stats();
+        for (FileData mod : modules) {
+            if (mod.getBase() == null) {
+                stats.without++;
+            } else if (mod.getBase()) {
+                stats.base++;
+            }
+        }
+        return stats;
+    }
+
+    private List<String> createErrorMessages(Stats stats) {
+        List<String> messages = new ArrayList<>();
+
+        if (stats.without > 0) {
+            messages.add(MANIFEST_VALIDATION_HELM_IS_BASE_MISSING.formatMessage(stats.without));
+        }
+
+        if (stats.base == 0) {
+            messages.add(MANIFEST_VALIDATION_HELM_IS_BASE_NOT_SET.getErrorMessage());
+        } else if (stats.base > 1) {
+            messages.add(MANIFEST_VALIDATION_HELM_IS_BASE_NOT_UNIQUE.getErrorMessage());
+        }
+
+        return messages;
+    }
+
+    private static class Stats {
+
+        private int base = 0;
+        private int without = 0;
+    }
+}
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/ManifestAnalyzerTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/ManifestAnalyzerTest.java
new file mode 100644
index 0000000000..51b34b6bb4
--- /dev/null
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/ManifestAnalyzerTest.java
@@ -0,0 +1,152 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2021 Nokia
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.vendorsoftwareproduct.impl.onboarding;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Test;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData.Type;
+import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
+
+
+public class ManifestAnalyzerTest {
+
+    @Test
+    public void shouldAnalyzeManifestWithOnlyHelmEntries() {
+        ManifestAnalyzer analyzer = new ManifestAnalyzer(manifest(helmOnly()));
+
+        assertThat(analyzer.hasHelmEntries(), is(true));
+        assertThat(analyzer.hasHeatEntries(), is(false));
+        assertThat(analyzer.getHelmEntries().size(), is(3));
+        assertThatContainsOnlyHelm(analyzer.getHelmEntries());
+    }
+
+    @Test
+    public void shouldAnalyzeManifestWithoutHelmEntries() {
+        ManifestAnalyzer analyzer = new ManifestAnalyzer(manifest(withoutHelm()));
+
+        assertThat(analyzer.hasHelmEntries(), is(false));
+        assertThat(analyzer.hasHeatEntries(), is(true));
+        assertThat(analyzer.getHelmEntries().size(), is(0));
+    }
+
+    @Test
+    public void shouldAnalyzeManifestWitoutyHelmAndHeatEntries() {
+        ManifestAnalyzer analyzer = new ManifestAnalyzer(manifest(withoutHelmAndHeat()));
+
+        assertThat(analyzer.hasHelmEntries(), is(false));
+        assertThat(analyzer.hasHeatEntries(), is(false));
+        assertThat(analyzer.getHelmEntries().size(), is(0));
+    }
+
+    @Test
+    public void shouldAnalyzeManifestWithHelmAndHeatEntries() {
+        ManifestAnalyzer analyzer = new ManifestAnalyzer(manifest(helmAndHeat()));
+
+        assertThat(analyzer.hasHelmEntries(), is(true));
+        assertThat(analyzer.hasHeatEntries(), is(true));
+        assertThat(analyzer.getHelmEntries().size(), is(2));
+        assertThatContainsOnlyHelm(analyzer.getHelmEntries());
+    }
+
+    @Test
+    public void shouldAnalyzeManifestWithMultipleTypeEntries() {
+        ManifestAnalyzer analyzer = new ManifestAnalyzer(manifest(helmAndHeatAndOther()));
+
+        assertThat(analyzer.hasHelmEntries(), is(true));
+        assertThat(analyzer.hasHeatEntries(), is(true));
+        assertThat(analyzer.getHelmEntries().size(), is(2));
+        assertThatContainsOnlyHelm(analyzer.getHelmEntries());
+    }
+
+    private void assertThatContainsOnlyHelm(List<FileData> entries) {
+        entries.forEach(fileData -> assertThat(fileData.getType(), is(Type.HELM)));
+    }
+
+    private ManifestContent manifest(List<FileData> entries) {
+        ManifestContent manifest = new ManifestContent();
+        manifest.setData(entries);
+        return  manifest;
+    }
+
+    private List<FileData> withoutHelm() {
+        List<FileData> entries = new ArrayList<>();
+
+        entries.add(createFileData(Type.HEAT, true));
+        entries.add(createFileData(Type.CHEF, false));
+        entries.add(createFileData(Type.PM_DICTIONARY, false));
+
+        return entries;
+    }
+
+    private List<FileData> withoutHelmAndHeat() {
+        List<FileData> entries = new ArrayList<>();
+
+        entries.add(createFileData(Type.PUPPET, true));
+        entries.add(createFileData(Type.CHEF, false));
+        entries.add(createFileData(Type.PM_DICTIONARY, false));
+
+        return entries;
+    }
+
+    private List<FileData> helmOnly() {
+        List<FileData> entries = new ArrayList<>();
+
+        entries.add(createFileData(Type.HELM, true));
+        entries.add(createFileData(Type.HELM, false));
+        entries.add(createFileData(Type.HELM, false));
+
+        return entries;
+    }
+
+    private List<FileData> helmAndHeat() {
+        List<FileData> entries = new ArrayList<>();
+
+        entries.add(createFileData(Type.HELM, true));
+        entries.add(createFileData(Type.HELM, false));
+        entries.add(createFileData(Type.HEAT, false));
+
+        return entries;
+    }
+
+    private List<FileData> helmAndHeatAndOther() {
+        List<FileData> entries = new ArrayList<>();
+
+        entries.add(createFileData(Type.HELM, true));
+        entries.add(createFileData(Type.HELM, false));
+        entries.add(createFileData(Type.HEAT, false));
+        entries.add(createFileData(Type.PUPPET, false));
+        entries.add(createFileData(Type.CHEF, false));
+
+        return entries;
+    }
+
+    private FileData createFileData(Type type, Boolean base) {
+        FileData f = new FileData();
+        f.setType(type);
+        f.setBase(base);
+        return f;
+    }
+
+}
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/OnboardingPackageProcessorTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/OnboardingPackageProcessorTest.java
index a62aea761a..d6327866f4 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/OnboardingPackageProcessorTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/OnboardingPackageProcessorTest.java
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Nordix Foundation
+ *  Copyright (C) 2021 Nokia
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -25,6 +26,9 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
+import static org.openecomp.sdc.common.errors.Messages.COULD_NOT_READ_MANIFEST_FILE;
+import static org.openecomp.sdc.common.errors.Messages.MANIFEST_VALIDATION_HELM_IS_BASE_MISSING;
+import static org.openecomp.sdc.common.errors.Messages.MANIFEST_VALIDATION_HELM_IS_BASE_NOT_SET;
 import static org.openecomp.sdc.common.errors.Messages.PACKAGE_EMPTY_ERROR;
 import static org.openecomp.sdc.common.errors.Messages.PACKAGE_INVALID_EXTENSION;
 
@@ -49,6 +53,7 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.OnboardPackageInfo;
 
 @RunWith(Parameterized.class)
 public class OnboardingPackageProcessorTest {
+
     private static final String BASE_DIR = "/vspmanager.csar/";
     private final String packageName;
     private final byte[] packageBytes;
@@ -56,8 +61,8 @@ public class OnboardingPackageProcessorTest {
     private final OnboardingTypesEnum expectedPackageType;
 
     public OnboardingPackageProcessorTest(final String packageName, final byte[] packageBytes,
-                                          final Set<ErrorMessage> expectedErrorSet,
-                                          final OnboardingTypesEnum expectedPackageType) {
+        final Set<ErrorMessage> expectedErrorSet,
+        final OnboardingTypesEnum expectedPackageType) {
         this.packageName = packageName;
         this.packageBytes = packageBytes;
         this.expectedErrorSet = expectedErrorSet;
@@ -87,23 +92,42 @@ public class OnboardingPackageProcessorTest {
             {"successfulUpload.csar", getFileBytes("successfulUpload.csar"), Collections.emptySet(),
                 OnboardingTypesEnum.CSAR},
 
-            {"fakeNonSignedZipPackage.zip", getFileBytes("signing/fakeNonSignedZipPackage.zip"), Collections.emptySet(),
+            {"helm-package-valid.zip", getFileBytes("helm-package-valid.zip"), Collections.emptySet(),
+                OnboardingTypesEnum.ZIP},
+
+            {"helm-package-invalid.zip", getFileBytes("helm-package-invalid-missing-flag-isbase.zip"), ImmutableSet.of(
+                new ErrorMessage(ErrorLevel.ERROR,
+                    MANIFEST_VALIDATION_HELM_IS_BASE_NOT_SET.getErrorMessage()),
+                new ErrorMessage(ErrorLevel.ERROR,
+                    MANIFEST_VALIDATION_HELM_IS_BASE_MISSING.formatMessage(3)
+                )
+            ),
+                OnboardingTypesEnum.ZIP},
+
+            {"fakeNonSignedZipPackage.zip", getFileBytes("signing/fakeNonSignedZipPackage.zip"), ImmutableSet.of(
+                new ErrorMessage(ErrorLevel.ERROR,
+                    COULD_NOT_READ_MANIFEST_FILE.formatMessage("MANIFEST.json", "fakeNonSignedZipPackage.zip")
+                )),
                 OnboardingTypesEnum.ZIP}
         });
     }
 
     @Test
     public void processPackage() {
-        final OnboardingPackageProcessor onboardingPackageProcessor = new OnboardingPackageProcessor(packageName, packageBytes);
+        final OnboardingPackageProcessor onboardingPackageProcessor = new OnboardingPackageProcessor(packageName,
+            packageBytes);
         assertThat("Should contains errors", onboardingPackageProcessor.hasErrors(), is(!expectedErrorSet.isEmpty()));
-        assertThat("Should have the same number of errors", onboardingPackageProcessor.getErrorMessageSet().size(), equalTo(expectedErrorSet.size()));
+        assertThat("Should have the same number of errors", onboardingPackageProcessor.getErrorMessages().size(),
+            equalTo(expectedErrorSet.size()));
         if (expectedErrorSet.size() > 0) {
-            assertThat("Should have the expected errors", onboardingPackageProcessor.getErrorMessageSet(), containsInAnyOrder(expectedErrorSet.toArray()));
+            assertThat("Should have the expected errors", onboardingPackageProcessor.getErrorMessages(),
+                containsInAnyOrder(expectedErrorSet.toArray()));
             return;
         }
         final OnboardPackageInfo onboardPackageInfo = onboardingPackageProcessor.getOnboardPackageInfo().orElse(null);
         assertThat("Should build onboardPackageInfo", onboardPackageInfo, is(notNullValue()));
-        assertThat("Should have the expected package type", onboardPackageInfo.getPackageType(), is(equalTo(expectedPackageType)));
+        assertThat("Should have the expected package type", onboardPackageInfo.getPackageType(),
+            is(equalTo(expectedPackageType)));
     }
 
     private static byte[] getFileBytes(final String filePath) {
@@ -117,4 +141,4 @@ public class OnboardingPackageProcessorTest {
         return null;
     }
 
-}
\ No newline at end of file
+}
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/OnboardingPackageProcessorUnitTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/OnboardingPackageProcessorUnitTest.java
new file mode 100644
index 0000000000..a97a0f639a
--- /dev/null
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/OnboardingPackageProcessorUnitTest.java
@@ -0,0 +1,143 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2021 Nokia
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.vendorsoftwareproduct.impl.onboarding;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Test;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData.Type;
+import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+
+public class OnboardingPackageProcessorUnitTest {
+
+    private OnboardingPackageProcessor processor = new OnboardingPackageProcessor("unitTestPackage", null);
+
+    @Test
+    public void shouldValidateZipPackage_helmWithoutHeat() {
+        assertThat(processor.validateZipPackage(manifest(withHelmWithoutHeat())).size(), is(0));
+    }
+
+    @Test
+    public void shouldValidateZipPackage_withHelmAndHeat() {
+        assertThat(processor.validateZipPackage(manifest(withHelmAndHeat())).size(), is(0));
+    }
+
+    @Test
+    public void shouldValidateZipPackage_withHelmWithoutHeat() {
+        assertThat(processor.validateZipPackage(manifest(withoutHelmWithoutHeat())).size(), is(0));
+    }
+
+    @Test
+    public void shouldValidateZipPackage_helmInvalid() {
+        assertThat(processor.validateZipPackage(manifest(withHelmInvalid())).size(), is(1));
+    }
+
+    @Test
+    public void shouldValidateHelmPackage() {
+        ManifestAnalyzer analyzer = new ManifestAnalyzer(manifest(withHelmWithoutHeat()));
+
+       assertThat(processor.shouldValidateHelmPackage(analyzer), is(true));
+    }
+
+    @Test
+    public void shouldNotValidateHelmPackage_emptyInput() {
+        ManifestAnalyzer analyzer = new ManifestAnalyzer(manifest(empty()));
+
+        assertThat(processor.shouldValidateHelmPackage(analyzer), is(false));
+    }
+
+    @Test
+    public void shouldNotValidateHelmPackage_containsHeatModule() {
+        ManifestAnalyzer analyzer = new ManifestAnalyzer(manifest(withHelmAndHeat()));
+
+        assertThat(processor.shouldValidateHelmPackage(analyzer), is(false));
+    }
+
+    @Test
+    public void shouldNotValidateHelmPackage_noHelmModule() {
+        ManifestAnalyzer analyzer = new ManifestAnalyzer(manifest(withoutHelmWithoutHeat()));
+
+        assertThat(processor.shouldValidateHelmPackage(analyzer), is(false));
+    }
+
+    private ManifestContent manifest(List<FileData> entries) {
+        ManifestContent manifest = new ManifestContent();
+        manifest.setData(entries);
+        return  manifest;
+    }
+
+    private List<FileData> empty() {
+        return Collections.emptyList();
+    }
+
+    private List<FileData> withHelmAndHeat() {
+        List<FileData> entries = new ArrayList<>();
+
+        entries.add(createFileData(Type.HEAT, true));
+        entries.add(createFileData(Type.HELM, false));
+        entries.add(createFileData(Type.PM_DICTIONARY, false));
+
+        return entries;
+    }
+
+    private List<FileData> withHelmWithoutHeat() {
+        List<FileData> entries = new ArrayList<>();
+
+        entries.add(createFileData(Type.HELM, true));
+        entries.add(createFileData(Type.CHEF, false));
+        entries.add(createFileData(Type.PM_DICTIONARY, false));
+
+        return entries;
+    }
+
+    private List<FileData> withHelmInvalid() {
+        List<FileData> entries = new ArrayList<>();
+
+        entries.add(createFileData(Type.HELM, false));
+        entries.add(createFileData(Type.CHEF, false));
+        entries.add(createFileData(Type.PM_DICTIONARY, false));
+
+        return entries;
+    }
+
+    private List<FileData> withoutHelmWithoutHeat() {
+        List<FileData> entries = new ArrayList<>();
+
+        entries.add(createFileData(Type.CHEF, false));
+        entries.add(createFileData(Type.PM_DICTIONARY, false));
+
+        return entries;
+    }
+
+
+    private FileData createFileData(Type type, Boolean base) {
+        FileData f = new FileData();
+        f.setType(type);
+        f.setBase(base);
+        return f;
+    }
+
+}
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/validation/CnfPackageValidatorTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/validation/CnfPackageValidatorTest.java
new file mode 100644
index 0000000000..e969c3d389
--- /dev/null
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/impl/onboarding/validation/CnfPackageValidatorTest.java
@@ -0,0 +1,137 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2021 Nokia
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *  ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.vendorsoftwareproduct.impl.onboarding.validation;
+
+import static org.hamcrest.Matchers.emptyIterable;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Test;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData;
+
+public class CnfPackageValidatorTest {
+
+    private CnfPackageValidator validator = new CnfPackageValidator();
+
+    @Test
+    public void shouldBeValidForNullInput() {
+        List<String> messages = validator.validateHelmPackage(null);
+
+        assertThat(messages, is(emptyIterable()));
+    }
+
+    @Test
+    public void shouldBeValidForEmptyInput() {
+        List<String> messages = validator.validateHelmPackage(Collections.emptyList());
+
+        assertThat(messages, is(emptyIterable()));
+    }
+
+    @Test
+    public void shouldBeValid() {
+        List<String> messages = validator.validateHelmPackage(createValidInput());
+
+        assertThat(messages, is(emptyIterable()));
+    }
+
+    @Test
+    public void shouldBeInvalidNoneIsMarkedAsBase() {
+        List<String> messages = validator.validateHelmPackage(noneIsMarkedAsBase());
+
+        assertThat(messages.size(), is(1));
+        assertThat(messages.get(0), is("None of charts is marked as 'isBase'."));
+    }
+
+    @Test
+    public void shouldBeInvalidMultipleAreMarkedAsBase() {
+        List<String> messages = validator.validateHelmPackage(multipleAreMarkedAsBase());
+
+        assertThat(messages.size(), is(1));
+        assertThat(messages.get(0), is("More than one chart is marked as 'isBase'."));
+    }
+
+    @Test
+    public void shouldBeInvalidIsBaseMissing() {
+        List<String> messages = validator.validateHelmPackage(isBaseMissing());
+
+        assertThat(messages.size(), is(1));
+        assertThat(messages.get(0), is("Definition of 'isBase' is missing in 2 charts."));
+    }
+
+    @Test
+    public void shouldBeInvalidDueMultipleReasons() {
+        List<String> messages = validator.validateHelmPackage(invalidMultipleReasons());
+
+        assertThat(messages.size(), is(2));
+        assertThat(messages.get(0), is("Definition of 'isBase' is missing in 1 charts."));
+        assertThat(messages.get(1), is("None of charts is marked as 'isBase'."));
+    }
+
+    private List<FileData> createValidInput() {
+        List<FileData> files = new ArrayList<>();
+        files.add(createFileData(true));
+        files.add(createFileData(false));
+        files.add(createFileData(false));
+        return files;
+    }
+
+    private List<FileData> noneIsMarkedAsBase() {
+        List<FileData> files = new ArrayList<>();
+        files.add(createFileData(false));
+        files.add(createFileData(false));
+        files.add(createFileData(false));
+        return files;
+    }
+
+    private List<FileData> multipleAreMarkedAsBase() {
+        List<FileData> files = new ArrayList<>();
+        files.add(createFileData(true));
+        files.add(createFileData(true));
+        files.add(createFileData(false));
+        return files;
+    }
+
+    private List<FileData> isBaseMissing() {
+        List<FileData> files = new ArrayList<>();
+        files.add(createFileData(true));
+        files.add(createFileData(null));
+        files.add(createFileData(null));
+        files.add(createFileData(false));
+        return files;
+    }
+
+    private List<FileData> invalidMultipleReasons() {
+        List<FileData> files = new ArrayList<>();
+        files.add(createFileData(false));
+        files.add(createFileData(null));
+        files.add(createFileData(false));
+        files.add(createFileData(false));
+        return files;
+    }
+
+    private FileData createFileData(Boolean base) {
+        FileData f = new FileData();
+        f.setBase(base);
+        return f;
+    }
+}
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/helm-package-invalid-missing-flag-isbase.zip b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/helm-package-invalid-missing-flag-isbase.zip
new file mode 100644
index 0000000000000000000000000000000000000000..15b0f57554ab3930795bc7541035c12653cb480c
GIT binary patch
literal 1374
zcmWIWW@Zs#-~hs>F`hvTNPvq$fgw2~v8Y6^GBGzNG=!Id-9Jq!;W!Y3=+X*q21b?_
z%nS@*f|((}o1Fusoe6420NiBuScJ*dKv_<p$!VEI#U*+r=~ZBZ`+)||0%8!2X7J?q
z&k`7zpKX86^OH}KV@J%Ex1Yo-s$b8DtzSK9Rl`rizUBAT4180#b85HRugy-owDZB4
zTO99isI%=?W4*ic%gN8b{Y^KnRy!@UZ0D=6HT7Ro+qeJup7D3{H0$*_U6ubnCcpcB
z^$pL72af;ug!8n&Gs-Y9U;z8&6x*u%r9jt$T#WFG5|Uq385tOOfqwCI^z(Fc4Gz)E
zD$dUX`{w}AAE1B&(P;iz{VXUTAmEhu8Q;)NK>?pmpFii*WA3Z(tr>cW@$`}<V(Q|l
zVpCF{J#Q2_;3DiT)OaUDfSqMkB9B0T*Xc8iv!_jq42fA3J}Hj%BI|Vhl{yTkt9ShR
zp>;4Nt8|A&;jEB3v*yg7?j*X{%gCs^!@RTGc-rb|++hDalA3J~@(;+>2><XR`3K}v
zP^=fHCg<m+z#|6~F(A)?Xf)3Zvd9rY^9(4Vm1JZVA^frc>K70_IQ_!NB*KiEAz>K`
z6g4ogr4hs;K6?guBg_S5N94o}3MClW(ijC~5}i4bjRoZl<TM7#88EP=QH_y-w0weW
zG$@fGyBIYjz5$IUKFK1R3ra7@=AwqgVPL=$oq7ViS=m6oWd*{WKnL{$3q}S80O>)h
A=>Px#

literal 0
HcmV?d00001

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/helm-package-valid.zip b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/vspmanager.csar/helm-package-valid.zip
new file mode 100644
index 0000000000000000000000000000000000000000..397dceeb7992ef234c9338b73855f3edf17b0b96
GIT binary patch
literal 1393
zcmWIWW@Zs#-~hs>F`hvTNPvq$fgw2~v8Y6^GBGzNG=!Id-9Jq!;W!kRR&X;gvb<ns
zU;q=$3<2Kk93bsXP%{GHCbP#POs)pXaso|G%PcA`(JM)>0vp^9G}JmBVmO+?lixo}
zU|@c>{W;H1K1q%pF<ah#60fL!JtMY$^`un|KMnhq-&Zs6P2tX|-D<x!JMGfW2WM_^
zyuYE&wqK3)?#?eKKmYbO-MCuqw9vAhufo>Ue@SiM{^xtf-_6sk*XMLq{`;8x?)%j@
zJSQGF{@)YM)BesV!@z(6?3Yt)tL~QqT?=wC!Y?66eyL+*VBiJ%#n;i#)6F$FL@%p2
zKM(95MWA0m{sGZw{#pGjC?Fu<l=m6m&`m)BpH81Y=hI{EtM9EDdWrG$k|kp5;;CX&
zQl33;6gl7`>@C!ICqsapWmO`NK!DfjGmNvRO^XbPSrk4gj`bqz^z%ApUOH^6H8iz+
zT_@|T)M4<h-0|y&*1?pl(j69sQNeR&&6z*F>H54aN9H7*($zY7LTAx5+n6~UW46YC
zy|{3B{^Aax_dp&&c##*$iy+T~5<+oma(-S4JicZPnfMYw^9(5Mm1JZVA^fsn(EEjv
zNrV|SkHYd8C~9C}OCyLye2xw9MwkoAp~&eS6iP6#r7;S~Bs#w$8w<)T$Y~6eSzusG
zqZ%UvX;}x^Xiy?Wb}?#5Z~_B}_#}&LE-1Yqn~NF}*MQ~{oq7ViS=m6oWd*{WK))^m
ImX!<)05^iMe*gdg

literal 0
HcmV?d00001

diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java
index cf34984fe0..ab088a4dda 100644
--- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java
+++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java
@@ -33,6 +33,7 @@ public enum Messages {
     PACKAGE_PROCESS_INTERNAL_PACKAGE_ERROR("Could not process internal package '%s'"),
     PACKAGE_INVALID_ERROR("Invalid package content '%s'"),
     PACKAGE_MISSING_INTERNAL_PACKAGE("Missing expected internal package"),
+    COULD_NOT_READ_MANIFEST_FILE("Could not read manifest file: %s [%s]"),
     INVALID_ZIP_FILE("Invalid zip file"),
     INVALID_CSAR_FILE("Invalid csar file"),
     CSAR_FILE_NOT_FOUND("Each CSAR file must contain %s file."),
@@ -71,6 +72,9 @@ public enum Messages {
     MANIFEST_ERROR_WITH_LINE("%s;%nAt line %s: '%s'."),
     MANIFEST_PARSER_INTERNAL("Invalid manifest file"),
     MANIFEST_UNEXPECTED_ERROR("An unexpected error occurred while validating manifest '%s': %s"),
+    MANIFEST_VALIDATION_HELM_IS_BASE_MISSING("Definition of 'isBase' is missing in %d charts."),
+    MANIFEST_VALIDATION_HELM_IS_BASE_NOT_UNIQUE("More than one chart is marked as 'isBase'."),
+    MANIFEST_VALIDATION_HELM_IS_BASE_NOT_SET("None of charts is marked as 'isBase'."),
     METADATA_PARSER_INTERNAL("Invalid Metadata file"),
     METADATA_MISSING_OPTIONAL_FOLDERS("Missing folder %s in package"),
     METADATA_UNSUPPORTED_ENTRY("Following entry not supported in TOSCA.meta %s"),
-- 
2.16.6