From 184a534c48377f89b0ac6ae6c3aacd7ed2d4f340 Mon Sep 17 00:00:00 2001 From: "Gitelman, Tal (tg851x)" Date: Mon, 12 Mar 2018 18:33:32 +0200 Subject: [PATCH] Normative alignemet Change-Id: I4ec063f938f9bde2f5727c338177e6d99ef5bc9a Issue-ID: SDC-1104 Signed-off-by: Gitelman, Tal (tg851x) --- .../import/tosca/categories/categoryTypes.yml | 12 +++-------- .../import/tosca/categories/categoryTypes.zip | Bin 1109 -> 1102 bytes .../import/tosca/data-types/dataTypes.yml | 1 - .../import/tosca/data-types/dataTypes.zip | Bin 6315 -> 6300 bytes .../import/tosca/group-types/groupTypes.yml | 24 ++++++--------------- .../import/tosca/group-types/groupTypes.zip | Bin 1356 -> 1319 bytes .../tosca/heat-types/Generic_CR/Generic_CR.yml | 10 +++------ .../tosca/heat-types/Generic_CR/Generic_CR.zip | Bin 678 -> 278 bytes .../import/tosca/onap-types/vduCpd/vduCpd.zip | Bin 567 -> 554 bytes .../import/tosca/policy-types/policyTypes.zip | Bin 905 -> 905 bytes 10 files changed, 13 insertions(+), 34 deletions(-) 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 519d1ee695..6e8b4487a5 100644 --- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml @@ -11,12 +11,6 @@ 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" @@ -87,9 +81,6 @@ resources: Rules: name: "Rules" icons: ['networkrules','securityrules'] - NetworkService: - name: "Network Service" - icons: ['network'] NetworkConnectivity: name: "Network Connectivity" subcategories: @@ -135,6 +126,9 @@ resources: Template: name: "Template" subcategories: + BaseMonitoringTemplate: + name: "Base Monitoring Template" + icons: ['monitoring_template'] MonitoringTemplate: name: "Monitoring Template" icons: ['monitoring_template'] 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 de33b5bf893f943f042a4ff48a4cbcaeb057da23..a139e43aa77157a7ad819211f1ba2927f36f69c2 100644 GIT binary patch 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_T|jew^-`e(g=W;mnDhu@V3zMY}Ss6SmK; zU*_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~^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`$OTY* zwyjTK*=wUEG!x)Pph1$IlVmFy;YZ0QNLk}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 literal 1109 zcmWIWW@Zs#U|`^2U@8yvzNf3ezm}PSVZHzZgCI~eIk6-)J-?_jq_QBjSg$fSXX|v| z{3`|mZSOt)uy>!9Yhb<*oWGQ{Ws7U*>FEwrpMKrdy)xOo?{eACuRd=I=j5aXJE$(d zyC;91r1j&Cmo@4aFU{hUw@)gVyKAbMRnG4HA2%%uYJcOo@4w3Z>z8gmn@}4cvO-61 z@)yU}=;!NyeqycP>h0L88*fu@sv22ysbGToj^@1^nwJ-^Y4-W`=HC2|$%#DnWo8xW zWsP$iOWE4mG{egJPcNCp_a^jl)cj}b{mV4Bo!alSc>c2Ao8+r6uUo>A^>|NM!}*Kn zVx^}XU+ylc#ybC==UMmMk2!^tV+wD4tYSCJJ35VNk&Cdor_KU>clljAH+!)?m+oTc z3zO+s8qb@ewOP3C`nh(Y%*y;FPnlh-^4IUlXv$B`*tSW|y${oHu%^Y|yjS6ZzE1k)$eBbTqa1+1fze zHQR4FFE)B|CapIucHyju_ftaSPJc8yFuUZZeU7+h?5ZjMxaJ8?iV2KdoS64jI6~Y( zSbA&4v4*&-xhF1%ZM(K7$KeXTb>hrY=wHt(=ZT>u$`B(kol-Car z2>tJ$W%f?}7hA}#QhwRXT^cjLx}~3=bI*AD(ZiE6{X?&${+Pd&f31Oc?s`v^S8I&l z9K4&b(fNz^-ptyV?~gC`ExDPwVF^_ui3He*A zmI~d=+P!c_M&eCl^X17=T%Q9&w>D0a6))ds9er*2xhxG8hg9pS358!bzK~gc?*y~d z$CQj7ZpXDBO?FPs3j3T`td~AZbiKX8JGqbx$M)WeT`C{_V(ByOZ6R82MH_M!Dz{`j zDwo;5@o4JJN3Sn`d*>4RR@Sv$-+e;lmCP;cEHi5ETC&~f-twsL+SF|#5~X6iCX(X1 z;&WLq%$&6>E#$-K@KC_%XZMgU_LD4brd7(@$zdrq4}0FL2>dePgP` zWAgxSMkad(T)A5Xn7=_l0Zd}a>s(MNMg|Fn4HtJjw{ySD_(3%81c?4-E?uUjewi`A Uo0ScupAiU?f%F|<;laQF08xAYF8}}l diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml index 493f399453..282595dcab 100644 --- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml @@ -866,7 +866,6 @@ org.openecomp.datatypes.Root: properties: supplemental_data: type: map - required: true entry_schema: description: > A placeholder for missing properties that would be included in future ecomp model versions. diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip index 75f9f73a352699471bce65c14a01a5de57b0c6d9..401bb7f43b9eb3a16d7beeaf89e456d25389449f 100644 GIT binary patch literal 6300 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 diff --git a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml index 9711bfdebe..394ffb1f6e 100644 --- a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml @@ -86,21 +86,11 @@ org.openecomp.groups.NetworkCollection: derived_from: tosca.groups.Root description: groups l3-networks in network collection properties: - network_collection_type: + network_collection_function: type: string required: true - description: network collection type, defined with default value - default: l3-network - network_collection_subtype: - type: string - required: true - description: network collection subtype, defined with default value - default: sub-interface - network_collection_role: - type: string - required: true - description: network collection role - network_collection_description: + description: network collection function + network_collection_description: type: string required: true description: network collection description, free format text @@ -108,18 +98,18 @@ org.openecomp.groups.VfcInstanceGroup: derived_from: tosca.groups.Root description: groups VFCs with same parent port role properties: - vfc_instance_group_role: + vfc_instance_group_function: type: string required: true - description: role of this VFC group + description: function of this VFC group vfc_parent_port_role: type: string required: true description: common role of parent ports of VFCs in this group - network_collection_role: + network_collection_function: type: string required: true - description: network collection role assigned to this group + description: network collection function assigned to this group subinterface_role: type: string required: true 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 71a4af957ab050804a9084d148b2d789ad1cc9cd..3a26c09f43faced766164709b390e9a2dcc4cd95 100644 GIT binary patch delta 1292 zcmV+n1@rpM3a1KxP)h>@6aWAK2mr`_Y)rXV%Q%Gu008q3000gE003ulZ*_1~d2nTO zE_rQi#aB&l)G!de^D9Ps0*QtLw-rKK`T>>rrYsT&MXod1wQ%fUJEhC7XU5JZX|jv9 zP(cn=>def0GxI$52J5BBR?arH&)!=b=Jx;!^wOz1C~M|_aIr?Xc=O?S0ngbAE;coS z&>C!5qnmv4BoluuVqP2!9D3V0N$LDp zE4c>YkWvAEN*TPUFd2D9qfoUYMlLAyF{$`5FO|j{Ig+_kW)+u4@Gm$TJ8aRsw^E6K z#GEjdhsgcW5S1UI`MpsN3rf*7m=@U}G*s>nAK$)x^Zw%WXLjeVA8`4_u1IsP7G_S&@Be#q#x8vL2;zm@E&- zrQ>ja(l3K88Jr2XZ2)O$#+cxN<_Xk|tF1@q6S$ArDudaXBeSDZQ_R3Rn4O3qE(IAL zYf2E^>_K#>l*#){l%bYUjr@%~;s9KsJ2(-Vw;WhiO$A*@N@P^}L_l2cBmf67=+!o* zz@ZPKKum)YI+wOF;jqjZ_xC+y2HVIGBNO_6m>^l~6yQ;#WE^b0lTRli3f#iP zw_ZzKQ2N}C^h88enA#?;gre!IvyU^2%$kr(DjqBu0)8Jj(s;pdERc>xPkw?Ez7fGA8#b-T38Fm+q$-nu8?-;?Jz1i zfwzmC3u{qH9F*J6$MRK0+FIlle!m>7A8+QRX9E& zZpwY=oGo82UN1Vg=rvX69))&y^<*`z(JxR-0Rle&6aWAK2mr`_Y)rXV%Q%Gu008q3 zlkfyCE_W@qn+dwp0cHlan+dwp0gEQ{1k$t90Z>Z?1^@s6009620AK(B0I>uB0001c Cc3`#u delta 1335 zcmV-71<3lR3d{@6aWAK2mk?&R7`t5wlAs#001))000gE003ulZ*_1~d2nTO zE_rQiy;n_d)G!de^D9Ps0*QtLw-rJvrG-j-Qx*w?BG;MhS~zyFozmskGh=6yY_bbm z3gl32otb%WKK$$i>!rw+&Nj8r-dP*wcK{0X(y2NqYvyo&u|l|b{r=<_p0O2NtZM|J zHQ2C1H+kjB+o>yr(%Fh)DHG6@LZY9;9iZoZ5T+2WAfWgJa+*Wp(Hm#R7MN*OqFhUj z*~aURb<51wXi(a!-Vk4*2-$P`LuT?TMQ%wHIkTYX<19x>CjMB&yf_#*^tN%5()qqp zas|R6r2>?HGI&v8GV+W@p=w8rTu|s^Qt@S8Dvet?lDSi68J9-z&p8@9Y|y;7Qi*`X zoG_J#$o;_(l^>${tx*mOO3^i#7TF*)RPOg5-n@DJ?&9?6oe|)nv?Azm=|-q&d3VDW zo9GQ*3AE+bmUlyMu$0+Li=BL@v6*Iz+8(<)N|O^$|=+|oyX+eKF6ANo{1BO*P#&_ zzTz4hPuT=Zp-OaUB&N(4XGf``oE++`5A(9|flJXC^{t_4R%D-Av3PZstVd}aHkJqE z(s6iy+Ao7G8Jr2XZ2)OWV@&WsdIELhYU>gD1ny$C%wTrr$n5CU6f>|6W=};Bmx2sW zG$n{`b}u?q%H(|}%23OwMt&=gD1b|J2PZ;$%YjwZRM3T_L`J1g1jO}D0&oz6e%huK zIP^gjh-pwl=h8MN9F{rb{9(C*Z~8w=K+R?gUOM#U+VBz@tkh_IP| zBpB*Qi^XjSbjGbJ+NZ2O0v3^MzfIF2FwmXF`BPwJ7s0wT0Uk9<#=+J*`E)}>fm@jP ztDmJVD7|haJrPkArnZSIp-6p|R$-n0um=C~@V{+@2^5>h{CI!`p9sr?LF9>}BWA3| zFch+QC=!v=YZ?+6$b%2qf%Ws#;|o%M`>NK|mV50$%3LcyN~IEY`#;set#dC|ScxPu z(>xw=5LG;$KZ;f1v<{f-1Ilt<5WFhs>`rGpMp0P27bc6S~?4#+M%YVX@;@*@jxg2$$5c~K#t8Xl|zvD_V_u>tF|9XuE@9)$0 zMr2i}M2MHTeK&7;-b!E;#6KVN#o39EO-a}6S~!-;+PaYHF&*-#3<tus2gMVye>t66Q;&)os%OP)h{{000000RRC2U;qFB)&u|m003lpdT#&# 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 941bc451da..85cff11c2a 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 @@ -3,13 +3,9 @@ node_types: org.openecomp.resource.abstract.nodes.CR: derived_from: tosca.nodes.Root properties: - nf_function: + cr_function: type: string - nf_role: + cr_role: type: string - nf_naming_code: + cr_type: type: string - nf_type: - type: string - nf_naming: - type: org.openecomp.datatypes.Naming 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 5ea130c95ed752e53438e4e831ebc5f0083d6ac5..c5dc361e070436bd0d71c345f91ec82cf48aa6e8 100644 GIT binary patch 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}^ literal 678 zcmWIWW@Zs#U|`^2m}G0{!+d5z$T1+Vf{}rNA4t2W=A{;8CdWGm>17q?=cP`t=RRa0 zaJ2m3djX?vkvn%*HSg%SlBZO(EWP*25|!%^9%WXEl8vg2{o#*iCqIfkd0=|?@uBdF_+6SDpW;_uOp4$v_{^gz?+fDo&i^c zssQ~50t#RfBYL@@5{wKI43bI-j$!?m899H)gXu^!Uoees0c!9eTksiZ2~zq21}3uk g3p>&w=KDeD#Lodx^I6$Iu44kigFyN`Fj^QG065V7aR2}S diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip index e1b5be9f2f43ef05642c8b663f815a9e7b7d25c7..e1bb32dd231ef0893ab2c6784ba4300f30370696 100644 GIT binary patch literal 554 zcmWIWW@h1HU|`^2c-xTU^I~pI-xfv&hFPo(3?R|6lv3w{6urvaoTHNu=G`{nX?tJE z#cQqZ(VobD|JIUrrn$mPPOfWGx~Ll%`AOqe>;1Z-w-#X=4o}Ek!PoYo``6z<75nG2 z_g37xxBf`h=i1*DzbCx6|66wU2K(A2jZCseRpKekB9GLB{{|k|v`Ha4G^$d0dXZ)E zy@n^-nkJlek>C1a%Z38i%|8-fg{JNjR^$;dOGt6tcV^Owx!?cD1x;MvAW^+J&(tGE zTU++S?B(H|eT`g89fkg^nYe)Ecyb9#hsw+i5*1V0942=<-DFrS7f~o{^s(edp84*- zf2(Xdr(HRM+{&^vL?k&Ch{AThq+oy*)i_8;cYEDG&IKu1mV%~qIh~q(q znm+TA^rTWRp7^m=(dY9FcdqlD367%81xGTDo@9<^Di5t-+cnEVELJ!yw)^kn?Hg9H zPTJUiBRl{9jX5j->A&as!z5B|F8G+E)#byof0H;OOyl)i^E(4rSM*NL7p%W9)sRK; z#5zO!0=av~A8t#Jbk8;W`7|Z$`QsG%i!&ppY+fHW)oPJzp8vhYO)q!cJ-Yf;#(B+( zwb@DqQj>n^sQ-4Z+iv;fwc>8$HrMY}yoZzbl$##b5AbGW5&_2}_SgkRFc2sxfGMQ7 V4)A7W1Bo#Lp#_k>156PN3;=oD@PPmT literal 567 zcmWIWW@Zs#U|`^2uvzTyeQ0wV%UnhVh5}Xw1}>mzSxTvML5f~wZqCukzWG-S1lr#J z75&K^tIJV%qIZ+bgbUlEBGyg2K5xrnt8J3~!B6iS|Gcpzj&A`gr@YehuRpFn{`p`+ zPnek0mlF~-L9zjpd}DpxId8vk_`0j~Rqw4;Z+rR0M7|3K)du?p&UW;czF#u?y;*%v zm|sey!kYuD+MJ@rC$r};{QTeB^XHeH?u-apKdG`Q%>UZzpEK`d?bQ4K z*;@U~UzeXhc`7T8TKo*qe z{}*dTQoov7y%M&1^6$-FjflS6b7QWmZ?{vFnA~|lTI1E`+O78Q-oNYrefQ5U(ZdVt z_q9FjzO#GQL-hb}Mkad(T+yfkj7Shr0F%g($^{i;WRPI6`*>mbE!WG8QB3Rq&ay(# V0p6@^AdQSb7z3n_0+R;=0{}4L_U!-w diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip index fbc09f2e0c400e320c95454f0bcfed93b505080f..29dd88e4b3e873e6d85b2661765dd1a53ed34e5a 100644 GIT binary patch delta 57 zcmeBV?_}o<@MdNaVPIh3VAx%izL8gunHfk=R%Esk7S&ec?2|6}{>*BaAk(QeAm9cXA=K F1OTMk5sLr- -- 2.16.6