From bedf1ad331ac7a19339197fef19c5f7c096e28d3 Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Wed, 16 May 2018 01:20:22 +0300
Subject: [PATCH] fix missng categoryTypes

add back the flowing categories
for service E2E Service and Network Service

for resource add Network Service as an option for sub category

Change-Id: I57d65ff7ff7f2035124cdac8911c10f162ca966c
Issue-ID: SDC-1336
Signed-off-by: Michael Lando <ml636r@att.com>
---
 .../import/tosca/categories/categoryTypes.yml         |   9 +++++++++
 .../import/tosca/categories/categoryTypes.zip         | Bin 1102 -> 1139 bytes
 2 files changed, 9 insertions(+)

diff --git a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml
index 6e8b4487a5..5f28c147b6 100644
--- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml
@@ -11,6 +11,12 @@ services:
     VoIP_Call_Control:
       name: "VoIP Call Control"
       icons: ['call_controll']
+    E2E_Service:
+      name: "E2E Service"
+      icons: ['network_l_1-3']
+    Network_Service:
+      name: "Network Service"
+      icons: ['network_l_1-3']
 resources:
   NetworkLayer23:
     name: "Network L2-3"
@@ -81,6 +87,9 @@ resources:
       Rules:
           name: "Rules"
           icons: ['networkrules','securityrules']
+      NetworkService:
+          name: "Network Service"
+          icons: ['network']
   NetworkConnectivity:
     name: "Network Connectivity"
     subcategories:
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 a139e43aa77157a7ad819211f1ba2927f36f69c2..897cb36b18380e8297f88e6111a1152061ae60c6 100644
GIT binary patch
literal 1139
zcmWIWW@Zs#U|`^2xWu`^M=GVO^)xdBL%1LV0}wGJCzhn9=NDCmR2HNb>s99FY@P0%
zf5kxH`1=~J?$dG&%>BaK-!ivsaSc7~z2MZRs=G%Y+?e=yir)Nrowj}Evpu8YEVusr
z|9SRCTe)iKr}<k#&YouHnP<HHnp?Z<A8~nYt*?`8&#ae!l&w2AH*S-DH&^S?(2#qp
zJ{<n}zUJ!`dwYikN5cH)+sG&C)TLXjXkQ~9yhOY|%|Tz_^TEBA&yOFHsC$$1;hf9`
ztGT6C&b3FT+&ym8$+mL&dB2~jvvxAeY4A+FFQw+|{Pmv8da3JGF@Aq4RLf4;cfU5A
zcR0P$bXJ+JYe4jK)0(pe7h1EMKfS!{nB?g(U+&41#ak-&?C@Ncx8P$X?;rUj_X`1v
zg}0Y{ozj1L``w@@)#lH<jLgj1ZHHw1rJrbQ7W}tvE`RNetFeh;|5eUNSHE=?uF-aW
zEh?Cnp>TN1rZ5H>J&Sj<KF*sNnJ3{NYI(ZYH}1<-lXKdUk!<O&-?$u6nO>S}a^%`M
zq0V<J%T=qN{Bf(S%L-YVqY&i7*2ZSEv2=@yd)ySquEO|fvIY|~jV21ZY*Y=`OxZeb
zS@VzdD~_wBi;vHJCwG_c9P8GLN~zv?Z7Yng)EhsZDlA>6(z9XGoG!ogNcEd+G8q~-
zgawa8nOvE7N{I9Jf*Z|onf$yb0yfW76)NdXV%ZxOR;kOrweS52ssHV77rwV$y6^gj
z)(KbUofPscdY#X(i)G4<RY#NAUaZPv_6xN<^J(4^Emqyi@Ou|6BIp0DkGRo&ZNl2M
z)%LTezvsDdQd%{dfBXC&{~xOG@O}9$^J=oJ@ZX9XFQhv>%)ZwiUa{iW#BXNl=jSdH
zUl|ec=|XGh_vC*IYBO3RGk?#0wD648+_bw(a+w;}f8F+VqdyOuWk8zS_TwHLHEDs5
zYhHOBYw=qWa6I7Yxkr-0S#K*UPgP~AEk0dgAhcPiwKJ-9gU#F(OE)_^_gObOe7$Aj
zo94}5BY!EjzQ;LL>ROZHn^PYbEG<8qa!|Z7Z^zYntG8%rpV7<k3=LiHYwWu1Pwn>?
z1&hUs-aQCdoMymzd5P7lRHoKHtJX$oK3uyknyG_tny&F@i<F}h??XbRSDbNVeLmfI
zYc)%=ZE=|MO$M!chb7k~BMZMVo-|o~@3`})sgircx9sQLVsfl?fmubite>~o=ecE7
zbshmV?~cjF^<Ox;*XqW%_fap7J`>)SqU2z-;f=ya#i}2=#~+szUcGPdYV)^mE}?IA
z8{6g|Td+xEa!hRTgdfX{znrPrpld#L8;fYFSgBBVY(w`s#u%36-K#IC{o9~&BGP|<
z^h;-M-8;Mg&OWUw_jLZ;r3WI@=K3w~;rk~n)4e)Az?+fDo&i_hR{`dJ5KsV<SV{se
zs1zfE1jA}g2kBXFE;Bavy-Rtr>oVhqwFg9{v@SCSc(byB^fLlsGLZfSELs>C0BD~G
Aw*UYD

literal 1102
zcmV-U1hM;2O9KQ7000080Iz;*Oo>MkW6A>n02C1b01*HH0ApcvWoK`4c~p6DWpgfh
zZEUTVO>fjN5Qgta{0FO-Jpc!2PrYqFKuEh))$%1!WqG~sVsPxpaZ1atXX208$xc!P
z-P3N~cb^$gCS#`&_D*uq96x_X;IlRxsib>|KMB#S6365qT|Y?IB{#Y`Cf^oSR2DZu
zx)AP{u|MhRH9Z_tqDEG)Umfm~bo{5HAn)OhCSgY}=2%CG^vS%xq^C?NdTO+@MvZ};
zfpi8E4f|N${hbF@bzmzR)7n(On9_<p2>T|jew^-`e(g=W;mnDhu@V3zMY}Ss6SmK;
zU<Bo$RQlAc*A_1qcfpmGO~^Zl@rylRz$oFwT@W+q^YWsrofg~~+h9C!knF&*@zy}5
zJUQWeZLG_YR*yznJyE3h`qr|>*_ON33M|slfk$e2EdsM_fuo5I=o@yT0ZvU-8BJ5`
zUk!R}lwI(qu%!3SSH!2ftZOA9zBC$3w~!xC`NY_*u=HGsN@#~A8XP1#@bos`6D|23
z6`9a$m{<72QRW+5co3F-!B#Z5*vtd~^<Tm0*eUNKHgyK@y~z{wwb)7)b4L5a8)DiM
zO)-=A%CIdxVTx&v*Q7I$WWezXEXk3{XUwq;YtSbyX*h2i)y#S;EetA!RyJuk>o%%^
z^-gGEB_BQp@#1{@Kg|@$Q!2Oq2L8i1`a~rShndX}U|j=^?Zo0G0eV%##*o=*zQpGZ
zZJ#t(lIM{@ORzOO<*mMI6+Q>OFq@t295DYI!CMOlmhihA+HpUTcliJ`Dnsc&J0g$p
zU^M#D$cfr!4+*A;uBh|!KS}FardCq_M3GS^-hkuoVzWc^Te)kkf9{8?9Z0jwEHIg}
zzsx<_URHI*Lt1B?3E0zWqw_wJdgXL^PI_%NuWP>vVigL?M7u$38urg(bi=&$4UONz
zD9!+R@?_>mH#}q)#3;@1T5!1HRJNAfnkF3M(H)@BXRuXaE9Q@8>cL5lc3UsbU|I4!
z$vo(Y`$OT<!2X3+Gbl5#+8c^uGX7m^u@cN`sds2SgM}o|Tuq0x5axrZY6UGjZ0>Y*
zwyjTK*=wUEG!x)Pph1$IlVmFy;YZ0<y^*?TEK2fM0slYNQYqt{*rp@w=rkJD{)9VQ
zs0r4vdnbsad|9;7^s1LD^Pz<SuD--Mj>QNLk}P-x=S}pU#=UcKlg}0Py1hRWReO(~
zDJ}`f#OpX())X|l?HmR6Iy~mfZ6!52B!f=80Vl^vL0M-3bn)^6XH+JYe+!-1_Pimy
z=T4r4yodU?+76#Sc?n?`{|cJ{zJ#EY&M>uvV4=UkQpWfLP)h*<6aWeU000O8uYPPy
ziAND*$^!rZ6cGRb5dZ)H00000001B$00000003iQbY*96a(PsFaAk8Yd2MV^O9ci1
U000010096$0002_0{{R308F6$UjP6A

-- 
2.16.6