From 00dfa07e91d2d90422334e1696b94b5e3b39f854 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Thu, 5 Oct 2017 01:49:07 +0300 Subject: [PATCH] normative fix Change-Id: I66176e5dcbda425436bf7e0594e6bed1a914bb3f Issue-ID: SDC-410 Signed-off-by: Michael Lando --- .gitignore | 2 + .../heat-types/overlayTunnel/overlayTunnel.yml | 244 ++++++++++----------- .../heat-types/overlayTunnel/overlayTunnel.zip | Bin 1128 -> 1081 bytes .../tosca/heat-types/underlayVpn/underlayVpn.zip | Bin 1181 -> 1164 bytes .../import/tosca/onap-types/extZteCP/extZteCP.json | 2 +- .../tosca/onap-types/extZteVDU/extZteVDU.yml | 3 +- .../tosca/onap-types/extZteVDU/extZteVDU.zip | Bin 658 -> 636 bytes .../scripts/import/tosca/importOnapTypes.py | 7 +- 8 files changed, 133 insertions(+), 125 deletions(-) diff --git a/.gitignore b/.gitignore index e38db8cb2b..26ba10439c 100644 --- a/.gitignore +++ b/.gitignore @@ -166,3 +166,5 @@ sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/* /common/openecomp-common-configuration-management/openecomp-configuration-management-cli/dependency-reduced-pom.xml + +/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/tools/* diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml index 958806a097..51a8ce539e 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml @@ -17,126 +17,126 @@ metadata: node_types: - # ***************************************************************************** - # Overlay tunnel service - # ***************************************************************************** + # ***************************************************************************** + # Overlay tunnel service + # ***************************************************************************** - org.openecomp.resource.vl.overlaytunnel: - derived_from: tosca.nodes.Root - description: This entity represents abstract overlay tunnel end point. - properties: - id: - type: string - description: Identifier of the Tunnel Endpoint node. - required: false - template_name: - type: string - required: false - version: - type: string - required: false - name: - type: string - description: Overlay tunnel name used by for reference by the administrator. - required: false - description: - type: string - description: Additional comments/information about overlay tunnel. - required: false - tunnelType: - type: string - constraints: - - valid_values: ['L3-DCI','L2-DCI'] - description: type defines if the overlay tunnel is L3-DCI tunnel or L2-DCI tunnel. - required: true - site1_id: - type: string - description: Identifier of first DCI overlay tunnel endpoint. This could be IP address of domain controller. - required: true - site1_description: - type: string - description: Additional comments/information about overlay tunnel. Description can also be used to identify domain controller. - required: false - site1_networkName: - type: string - description: Name of the network that is being associated with overlay tunnel. - required: true - site1_routerId: - type: string - description: Identifier of router connected to L3 tunnel end point, while configuring L3-DCI tunnel. - required: false - site1_importRT1: - type: string - description: List of Route targets imported by the local router. - required: false - site1_exportRT1: - type: string - description: List of Route targets exported by the local router. - required: false - site1_vni: - type: integer - description: VXLAN ID - required: false - site1_fireWallEnable: - type: boolean - required: false - description: Identifies if a firewall exists in the path of overlay tunnel. - default: false - site1_fireWallId: - type: string - description: Identifier of Firewall that is in overlay tunnel path - required: false - site1_localNetworkAll: - type: boolean - description: Identifies whether all the local networks associate with the tunnel or not. - required: false - default: 'false' - site2_id: - type: string - description: Identifier of second DCI overlay tunnel endpoint. This could be IP address of domain controller. - required: true - site2_description: - type: string - description: Additional comments/information about overlay tunnel. Description can also be used to identify domain controller. - required: false - site2_networkName: - type: string - description: Name of the network that is being associated with overlay tunnel. - required: true - site2_routerId: - type: string - description: Identifier of router connected to L3 tunnel end point, while configuring L3-DCI tunnel. - required: false - site2_importRT1: - type: string - description: List of Route targets imported by the local router. - required: false - site2_exportRT1: - type: string - description: List of Route targets exported by the local router. - required: false - site2_vni: - type: integer - description: VXLAN ID - required: false - site2_fireWallEnable: - type: boolean - required: false - description: Identifies if a firewall exists in the path of overlay tunnel. - default: false - site2_fireWallId: - type: string - description: Identifier of Firewall that is in overlay tunnel path - required: false - site2_localNetworkAll: - type: boolean - description: Identifies whether all the local networks associate with the tunnel or not. - required: false - default: 'false' - requirements: - - virtualLink: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - capabilities: - virtual_linkable: - type: tosca.capabilities.network.Linkable + org.openecomp.resource.vl.overlaytunnel: + derived_from: tosca.nodes.Root + description: This entity represents abstract overlay tunnel end point. + properties: + id: + type: string + description: Identifier of the Tunnel Endpoint node. + required: false + template_name: + type: string + required: false + version: + type: string + required: false + name: + type: string + description: Overlay tunnel name used by for reference by the administrator. + required: false + description: + type: string + description: Additional comments/information about overlay tunnel. + required: false + tunnelType: + type: string + constraints: + - valid_values: ['L3-DCI','L2-DCI'] + description: type defines if the overlay tunnel is L3-DCI tunnel or L2-DCI tunnel. + required: true + site1_id: + type: string + description: Identifier of first DCI overlay tunnel endpoint. This could be IP address of domain controller. + required: true + site1_description: + type: string + description: Additional comments/information about overlay tunnel. Description can also be used to identify domain controller. + required: false + site1_networkName: + type: string + description: Name of the network that is being associated with overlay tunnel. + required: true + site1_routerId: + type: string + description: Identifier of router connected to L3 tunnel end point, while configuring L3-DCI tunnel. + required: false + site1_importRT1: + type: string + description: List of Route targets imported by the local router. + required: false + site1_exportRT1: + type: string + description: List of Route targets exported by the local router. + required: false + site1_vni: + type: integer + description: VXLAN ID + required: false + site1_fireWallEnable: + type: boolean + required: false + description: Identifies if a firewall exists in the path of overlay tunnel. + default: false + site1_fireWallId: + type: string + description: Identifier of Firewall that is in overlay tunnel path + required: false + site1_localNetworkAll: + type: boolean + description: Identifies whether all the local networks associate with the tunnel or not. + required: false + default: 'false' + site2_id: + type: string + description: Identifier of second DCI overlay tunnel endpoint. This could be IP address of domain controller. + required: true + site2_description: + type: string + description: Additional comments/information about overlay tunnel. Description can also be used to identify domain controller. + required: false + site2_networkName: + type: string + description: Name of the network that is being associated with overlay tunnel. + required: true + site2_routerId: + type: string + description: Identifier of router connected to L3 tunnel end point, while configuring L3-DCI tunnel. + required: false + site2_importRT1: + type: string + description: List of Route targets imported by the local router. + required: false + site2_exportRT1: + type: string + description: List of Route targets exported by the local router. + required: false + site2_vni: + type: integer + description: VXLAN ID + required: false + site2_fireWallEnable: + type: boolean + required: false + description: Identifies if a firewall exists in the path of overlay tunnel. + default: false + site2_fireWallId: + type: string + description: Identifier of Firewall that is in overlay tunnel path + required: false + site2_localNetworkAll: + type: boolean + description: Identifies whether all the local networks associate with the tunnel or not. + required: false + default: 'false' + requirements: + - virtualLink: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + capabilities: + virtual_linkable: + type: tosca.capabilities.network.Linkable diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip index e60fcbc0a62c23b69a00e4f558b0fe5d14a6413a..9340f06ca7836265b6db96f3a9fb45587ba31aa7 100644 GIT binary patch literal 1081 zcmWIWW@Zs#U|`^2n7rA=`|z9mIa`?-7&L)Gfo0 zZcOo(h&{L`=)p8mr{m%4%h~e%DkttYTe5np(@yD6R|Kn7t&Yu1ZkD^C`a|n=p+mvu zF4=kOZ&Xi@F=IQrRr0{{+po_bd@z9{mCrbA_sv%)PZrK^yd=YHf8L?%`&`!h&2p)w zS^w`PKmWC*@|oD#m?uAY3QsOIyX+Fa!r*%9REaIS%q-Q4XPO+Bb96B+FiGmO(eBZk z-Q;OwYPR$8EmLo+uSWAYxmV07@HU8;SpF-i(RYopPWkOeYA+p@wibC7gi11{&H1pz zJ;|eY?=+QqDP{$CC*Sa6y)T^KIg2y#zF@k;qv$1Jry+NU<)q5$vuyQO4=HHwOSqJj z9RD(WqtN%3{r8=tmFqWuZ&)C0neTZ#zx|d{`$-|LTn(>Aw$Q$N4>S|^EUEhT{Na|H z$6d{@2s^|U%UQ8acF@w^%XW{;wZQAy*(L0;`Q3@~Q+8y%Nw)7(S+3`K^J3xcuU-w@ zGmJGW+~%8d^6dNW9xiVFzWwj#e;T~z_V4`D?lxX*>ezMbl3}NvRW`3nP025hqH|Yr z^TI6loaqy+R_rN#!2E7n#F`Bevv;mj&16peF>}g+l@4p~pDXojseCo(V$h?#hi)+b z(Z9-Qo-IDXI7)Txw@#Lg*1l_%K5VqnnZ9mQk`dQkr`hwj`>(OzzwfPCFZZtWbJ48TUOz>>>^&lrnHI{yG88&T&8v6l8dL$dTUq1*FAH>i|e9EQPuBf zpR()mu3CEO*xg?J`Aiiqz9*gcehxTjXzVH_dolD)`n=?o#g}}2o*Nka_??olXm#>| zGgEK0Ic|9@a`vyqz8dM+`-eU}Q+R%b<%9O*Pt8ffI~PCdye2gB*5j9oqOI4C*UUf2 z+Nz+{p=h+q!R6?l4c+Wpecw*LddZgUmqclOPT2duRXA z_8U=WCUh7I1a1w=v}%bpZ@nS>r|avBfLm{agWE6FZTN2Oxx~F!$UDF73je>CI-dWR zM^4)J0EjmM@e&BOd#>Xd{}_mG0P%O7OtJQPQWG!xYb3^;ed4iV{_B*Yu#KG)zRceL zw>u$K@r!4(@yFSFrdegAWLzp!TUC~RecR5feWm%zQP1<6*uvCi3*2^*Z+gWa;LXS+ m!hk!M12Z}UBZC5n0s@RYAK=Z(29jU|LVFe literal 1128 zcmWIWW@Zs#U|`^22u*kL-p-YK{s1!r!*p>520@@`epzZ!PGV(9XfXmEcD8$QFrB{l%gk_sRw%QtsDh%%&W}sC7Q9J_kNS1Lc-!QXTuq(mWtqzS z!LQ}Z@7I36dsoUt@A=FIr>xFP8PnGuwEAU`Sa|y6rl1MAl`A)Ge)HC&;q=-y1~P^v z5g&DD&)r zEc?y++dZ}PvrS^h{B9gy-R+;q*vRpeLvnrL)ps^5!M8X#{@5^R-YXN!@pn^Pwb0gO zw)wpN-<9PF*NxiQKg#wts#On(e$P%yaTTj+T&%HcV?`non?LpITNS zW`E<{J40xlW8Ya2Y@a37%X%10SrgY@# zzS{D4UvHC^cVuhXtZ-^dU6!ze$*iB_UbY|uOQCAJn?~FGty>&Sg9@H5 zxPAZf-e;;`SjsQGTla`tudHZBc9;++=06>M$hY&qTTb1 z9Q&~7<9{V@G}kD)yhw~Oyj1-%^oLs(Q*_aOpDvTH3uS&Y_Le`py-I)U&WrOTg<_RI zK7MW*U99TrR-diK@-5fKy1w>jo>iUcyrmBhf8XD}f40(t89ZI~YizZyWNe9D;Ntdp z`vT_Nz31B|bEMy#;2P!edP1eeabM+cJvVZTg0+K`HoR27GaABg+rmb(qGp~FsTp?AE{HA|(bs1Ov{2xF=S4a!|K#w0j#T&c&zpa@7%#r|ntA89MuR71oF*;JnOw_rFP(Z4)0*&JP4dUr zgn)%)+#^Q1uN=~j*4`BTzs5#Neoxqs_ZQmM?B(Zuwk*5i0=onAzc?4yEsoCN z8`Wbqu9^!kpK)&uLwL(vgZE2reY4x1UB2*ktMKl^)x6(=KgUHKORTRE$+CJOQReX1 z*XEgw-~aiRbL?&c@oFHR3&rUnWnl?dK(z?Y|@Sb+5&oUGlF`rsACT zz6o9T=5AeodzWaJL1vQYpVaja?G?fjC+wWMCW_nq`ZwPlJ0)eS?5f^gV>%b|c+1_p zOJ9{m)H4ToGcwsT;L7kSz$^~}3SbgT_UD31F)~On%=qugmTG;Ov77N2Pa=>$5VP{{ ZEUU|m0p6@^ApML$m<*)f1IrTz1^}-y0TciL diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip index 4a0bce00f7d8c7523ffbd9aa0c3bdf70eb3ab2a0..65bc805bb7167b8355b56e789577a9b7c009ebd7 100644 GIT binary patch literal 1164 zcmV;71atdPO9KQH0000804_pdmh4+e(DsMS6BEo-(SK#>@Y*M|)QK}#o_4MlP!rOy9;M_Q6)!-*wF zs2*hT#Jl_MOhF*bPzzl?d2z1HPV@i!^Z^Nf4Gm;i|E5b-yo?pnX}u4V1RY#xUy z({=%m54TGidL$CLN5)IPZRMk*eFsWs7+D#g3ZQEe?6YWpu@?Z0>}PMXbNyK}9@hII zgtv;}jqaE%YP*?fg9=k!n3+YVOPk`XlC$yvVjnmSMTHs5tuE?PnFVs(?5ozko^nzt zFJ^6+Z7g}VUNp?cbel9J1eFCiZ-v^lLW}>F!Xjm5&ZWaz-sYO(1zu&L$>r;GW8z<< zdRipc*tk08?qXe|@6c8v#Z}aRSQxL^I7*F}4myW#%ZJ9y1!uuP&P(YRFqI!ErI<5b zO&cDy(Nb@A7vgvkL!;l$OesgbJrZWZeXn(H@9x;$*T*IMYx>Us-VRvX z^h>wuZN#+}hEqqW?F(Xx`D`cHBNy4vq~aj{8?ej8=rvcPpka|Q(;y)~ID zJkIycqMkP({Gb-X&xLh9nz~dcG$nbfH%ARxWxd=fKJU{A&$}V}pwR!&_8EAZqI2kg zJEv1YeJX<=g4V%ranIppD9KNPl5|)-55~}vhvN(k;$LI|3++^up#2Xp+u-~?2oEXc z=o)LZ7K91+vZVPJaU|p5NZy8nr;(4r7`XR5-4>|Gx3Fm`{1G8WTi>FIIN;*a1Sl?4 z^eGx@BDg_&9u8?i)aqefm_dP>7-&j?X(e}%Qz+Dn(8eQwjMi;+DYMY*JheI~xO?sa z!ywvgu|QCUPrrjVW5cq#^n+?NDg-aN*pwDuV=L(PfIyk;b*kl16!a1r-F9c{g{AjC z^|ZQO-G8Dz=kaOz2mRbX-9ORKZ=aWR*VKUQ%NtS0V>e2+-WbN+kYMSAsFf~s>2BQ4 z(ZLZ^S*$4|nt1Do8vrqMBtI=ZuVFmBTFl8vJtDc#BYF{-T-7C#*So}thwG{{8Kopo zpuC}5Bx84r6KLafjPtDZgfMc)IFAK7nK^31XtX;xo0Dp-e)P5<6{EM6q(@t6%=W>W z#}6rk@MW2$lOLHX1i=UjXDAb<`gQsefJsLdT2jpqt(&mE$Fhf~34;2m3A? z2<-i?ty8$7Wx=Ax;QRwjPEG+Ex!DD}?o?djd41zp8PnhDV}6sj<#=DtInb^$uOjW9 zP5<#}d&?yKS)Z)9usBR_?Ln(w5gVROKYYoDwLple?z%{ zWUk0(Y37{sH=Zz7TcjyhuRZ<$aeh$K^QP*3GYs02#6PAlUT3xc%lhQECv)U>du8lS zkiTaiA9S60;tAU&dp^0U%gerHUbdy-#Hk-423eC6?0dh72Rigm{A;52{nm2b$BFyy zw|~fM`u$OMvTN>j<6H;FW!}b{AC#mT&$wC?_SV6qF<3lXATzIYXROv{hrZdhS8g3w zEDt-ia!v2zUe)v0l27M&Z2#8nI+eBf-lC{-CvJPKEe?@0i(f97_`b;ZqYzua(ChECAb&ZA|VHRCKoQT@+=xI6v{d@!E;Yubkv-VY>T$?YYmZSATi+ zxIOh(>aVv<_sSx6e>u%nYX7LIwed>eD{HP}S?pb|r!t~E1O88nF^n~@o>z0rDFI4%@>2>Iaq(R#7jE8vZdyH@<2yWbiT8Quiw=xA)7zJ7*z^5IRpK8dfrxI$phlO5}H z{`9V$ciDgD+tOuEmukFF&n|8Ds@K{3edX)f&&~7WFU|Y>uz({D)&6j4 z)>&c2@ntJs<$ZZ_;PyMAC9P9W9Xl#t^40mPbbvP_lRX2jazX`IQh1G7NL?Erk0^$JxVZ<(( diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json index 6a565dc3b8..955e5e3e30 100644 --- a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json @@ -11,5 +11,5 @@ "name": "Network Elements" }] }], - "tags": ["Ext ZTE CP"] + "tags": ["ext ZTE CP"] } \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml index 5cd45b74e3..1638305021 100644 --- a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml @@ -1,5 +1,6 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: +node_types: + tosca.nodes.nfv.ext.zte.VDU: derived_from: tosca.nodes.Root properties: manual_scale_select_vim: diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip index a7ad6244223f0387fdceac758a772494d40f92e6..2bf0f54ea3e527472eb23992c9b9870c6677c9ff 100644 GIT binary patch literal 636 zcmWIWW@Zs#U|`^2@aA;&PJ6GL!@$JA;K0tnzzY;jttg2qNey!e)vL_SSsQx0@0Ni; z?Q`uv%+eRb@7)Lr)!wS`w(ITU)Hj?vzUIF5y!GX^wV#uSS75{2;7K3n7#}a@{-wei z9+0&>uzGq0ui?ehO^MZ0w(zo5D6e@a|6|Vi^mEz|Zm@WCOTOOImE+y2{hFyR@uT#@ zirC!GhRIxu);WGOs@iQ)SpQ8fdb&VuL&q$M$n1nOT;ZIDPtI&oH&B>({TAPIkr^U7 zH_lZvAL6~nkw3L>f!G=mHOKt*p+~L%?|;C#xa>FQ7yrgj3;z7$xf|=oDUxgD_wK)L zb68#1ZO-cDT8}l&W2WRjmC}=W^-wwN*_^MFZt2g=xan+O=;?BNefp!B6DF<_s5!DN zNafc#Ce<&2ZyMS2x8%I@KEa=1A^OXY)pBkn!;Z40`!&lYzq%~wWVls(-gl1Wj*Fb< zlTseDuqQt-Fq`s*Il?e$#-*QE*y1PFnk8*NQYN#LecO5k#qXIe+O7iDxhsVGt~9&$ z->^@AqQ+~WpDLzp$UUh$eYv=ps+o~nLJsM9G@4t!-%F5T` z-k$x_|Dh;LL6^bVuM4kl3Aismr*lS}vAqpn3l|CfG$YrA&&+lQaed{R(aYtd4{ z>$~n*_=3dgd-WxEd@&2DnA($UUh_ubONqvo<_Mj|HW^DKS3LR?!HY{r^M}}jewBp+7-Ai@2pGa+3rLu-CVxsxd zN1PLP>rOOa+W6Y=?y8a%Tf;X+z7Vc3SR)nw^#9>gcGpfbFJhNf(>}QUmf(%Ao37X$ zOvul&4v6 z_uMDKGp4Hi@?*7}v-8MQZq<7tyL+lcE{L-0)tq#lV>zX~Q@9}ht3)3EM9D9p+D6i$X~4d*grkx@0m>t4NV1E zj7>}4CzgKux2O7s{rheC+xLE7IH%oeN32u)ku$gEd|DZ&veYp?ykPgV|4;5YwIr}! zK3BeXa^o+i<@%*i8f3E&Np7`EkZ{RZaXY)b>C-+#e&2pZ+`6uI&n`bwK z^PEZ$&7P;4yr#|E)@5GfR&Ix*ZD&qy{NmtydFg|Wr+t7223*NQ1(-lUKmkmmB^EBIFe8HmgYBxo)Jnt4j5m1Jyv#+S1H4(;KzbR0Fdj(D HGJ$viCh!<~ diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py index 44b63a795b..f91b64ed81 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py @@ -21,7 +21,12 @@ import importCommon def importOnapTypes(beHost, bePort, adminUser, fileDir, updateversion): - onapTypes = [ "vduCompute", + onapTypes = [ "extImageFile", + "extLocalStorage", + "extZteCP", + "extZteVDU", + "extZteVL", + "vduCompute", "vduCpd", "vduVirtualStorage", "vnfVirtualLinkDesc" -- 2.16.6