From 275c6b6fbde4fb4e964cef2bf1b370d6c3daf9d0 Mon Sep 17 00:00:00 2001
From: Tal Gitelman <tg851x@intl.att.com>
Date: Mon, 2 Oct 2017 16:30:36 +0300
Subject: [PATCH] ONAP normative fixes

Change-Id: I9474ce0537ba478fb7c2e4f838d2a07760efe3f6
Issue-ID: SDC-410
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
---
 .../heat-types/overlayTunnel/overlayTunnel.yml     |  10 +++----
 .../heat-types/overlayTunnel/overlayTunnel.zip     | Bin 1132 -> 1128 bytes
 .../tosca/heat-types/underlayVpn/underlayVpn.json  |  32 ++++++++++++---------
 .../tosca/heat-types/underlayVpn/underlayVpn.yml   |   4 ++-
 .../tosca/heat-types/underlayVpn/underlayVpn.zip   | Bin 1164 -> 1181 bytes
 5 files changed, 27 insertions(+), 19 deletions(-)

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 68b87fd3c2..958806a097 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
@@ -5,11 +5,11 @@ description: overlay L3 vpn type definitions
 # overlay tunnel type definitions
 # *****************************************************************************
 
-#metadata:
-#    id: : overlayTunnelDefinition
-#    version: 0.1
-#    vendor: ONAP
-#    template_author: ONAP
+metadata:
+    id: overlayTunnelDefinition
+    version: 0.1
+    vendor: ONAP
+    template_author: ONAP
 
 # *****************************************************************************
 # node types
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 55a836ff4cd93d011e030680847e28142b622683..e60fcbc0a62c23b69a00e4f558b0fe5d14a6413a 100644
GIT binary patch
delta 310
zcmV-60m=UC2<QkGP)h>@6aWAK2mn=QLQA&_ZO_01005Vf7oUGB0lDDFCnH9W6kXKw
zfZ($89rio+-X>?wf)>V3*vG4jPhkOp2;~SFuW{AxJOoqP2nhT<04d&f7Hm&OA*!K0
zM4LCBkNbIdVAnE-2k{+@8oNwP1sZZwR*3~?YMVo{R!Nio2!vG8JOZp-gUAYN%BFY{
zPm@cojlu5NUi~S|SJE-iC~?ayROE%eIK~$aEzj{#>?9>t8L2Vp%vF{^T9lNCZY}Dx
zlVSlY5;anA<)GW&)4k>;^aOX(?ylmKp8+2e>LEVoXly@LTgUww*n@l_MCf6Y(E&pO
zn<A4I0<Qs_v&I5B0S#4WLQA&_ZO_01005Vh3<NR`nEy!zWjoUWivh+AVLOvd1R4hK
I0{{R308WE~F8}}l

delta 335
zcmaFC@rFY@z?+#xgn@y9gCQ!;$@}K&Z-0(3Gce4XC_cZwDv+t@;6(ouX0|~-5#m2>
z7VLQQ=eV+LYyRZTWv<-G>Te!jJ-U2Hlf#~(mY(Z7vbM`L8RW9C%#v%6&bQ{?roMP$
ze^v(n#b>?GAJ_eoy|MMoL&qBS#mDr7gB#oKObJaoIP=!C32Q<xX(%ww?1^e%S`*WJ
zf-C#fvNj?A$=>UF59+?V5hr;z{F31Xjl$D9Ax~QOSsWAR(>?z&;PVpIFv*pMFVBQd
zbBLNUr6W(bYwP4VMs1<ipn|6hZr{JW_nGP!mhwyQ);*g%n^9gkOWE#uMvi@0^zpxv
zH=1h{T{4m<pJjArl2)56#I&Aq@#aHJmW;e8{-4ajVx;%_N^?)N^<~CQzk~n2w7SfA
dAZF#?SwK3#o0Sb1WDJZzm<*&p14E2~0RV_<l34%%

diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json
index 10e2d4c155..6107261dd9 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json
@@ -1,15 +1,21 @@
 {
-	"payloadName": "underlayVpn.yml",
-	"contactId": "jh0003",
-	"name": "VL UNDERLAYVPN",
-	"description": "The node represents a underlay vpn entity",
-	"resourceIconPath": "network",
-	"resourceType": "VL",
-	"categories": [{
-		"name": "Generic",
-		"subcategories": [{
-			"name": "Virtual Links"
-		}]
-	}],
-	"tags": ["VL UNDERLAYVPN"]
+  "payloadName": "underlayVpn.yml",
+  "contactId": "jh0003",
+  "name": "VL UNDERLAYVPN",
+  "description": "The node represents a underlay vpn entity",
+  "resourceIconPath": "network",
+  "resourceType": "VL",
+  "categories": [
+    {
+      "name": "Generic",
+      "subcategories": [
+        {
+          "name": "Virtual Links"
+        }
+      ]
+    }
+  ],
+  "tags": [
+    "VL UNDERLAYVPN"
+  ]
 }
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml
index 639e1e5d91..1e22852c75 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml
@@ -1,9 +1,11 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
+description: underlay L3 vpn type definitions
 # *****************************************************************************
 # underlay vpn type definitions
 # *****************************************************************************
 
 metadata:
+  id: underlayVpnDefinition
   version: 0.1
   vendor: ONAP
   template_author: ONAP
@@ -19,7 +21,7 @@ node_types:
   # *****************************************************************************
   org.openecomp.resource.vl.underlayvpn:
     derived_from: tosca.nodes.Root
-    description: undelay vpn type definitions	
+    description: undelay vpn type definitions
     properties:
       id:
         type: string
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 0a4f88bd3243965ef5a140e837dbf832f4f707b5..4a0bce00f7d8c7523ffbd9aa0c3bdf70eb3ab2a0 100644
GIT binary patch
delta 1151
zcmV-_1c3XD37rXlP)h>@6aWAK2mqXMLQBW8ho|`i0086^000jF004DvWMy(}VR=??
zZZ3IkY`s{)j?*v@z4t3Daj1l#qJdLyzyd--P_YXK5Q^M*(hTd^#&!bzd&W+awroq&
zY`}*ko_J>7Jdekgy>=N-1>~sEqgF1h!8-a_u;!P;(nv^uH@uYTJbf||;4+KG$03yx
zU?tzMcTZVu6!RMcY|q%_0ed)RBYUmO|Ko2`g6D#JzL+qEVi)meqpmu?^si&>$!s3G
zN@%-aAKpJ-Qr82K$UUUI@<k^f9qj|Aw1CLU_*5`zlVCrM_7_n=kCFW}CimK>E#qOn
z--qySg8T7*9g{_E*E4NEL8ePHv*2`PGnmzKR_#DEfm0W25NU38xm_x=K#rSz)Y``(
zcUH=&tc|0MCC}Dl%WO!u_KQW81#{k_T6aPVKPt39S($U`ppox#P4N;2S=i?CK;4k|
zgH#U|$v_)}V{RvFXxt8LjTziT4Qi)s-1XL^gU;E1=jHp>%t>cE139mxU$CisN-32(
z<JGj~Q5!Awdb1daq1Eq3W?GRhN999qcI`2%xkQoDv!bkJU#EE`<>L}uF?}>On#QMI
zrzPRU*xQ%30!NS}EVsR)S~;U{Ved1ok*Czj4uk^T_pQ$JtE=?t<A-JXW%}&`-ga2K
z^veo=bwA>Qg@M#j>N^U?Y6pr%%4k|iQ2&x#F<m!%o_yL!!52}+oG8K|8go(b(Oa9j
z=waRz3+i2%yQCJw&(S&`P5m839FpAEn*-ui^m3>8yiXxK<|f)_3j9xPZyC=ra1I>f
z&gl%PP6_rCX&!t54TtBUB>xFY!q^!whNc{U#if-B1z`z0RgHp@55yYgj~IHEQI4))
zi`FtU;aOEE&f`eN!I9h#2hZl|+5Pqi2JSu2iV_t0Mw?aW4+t^Z`iQ2(!Ol)ifa1c6
z{u2!q5m<vg3MXi>sMW(dnu`K8G0=<x(@JhwPN7gO0vnI~F<MvXN{UeIJVz>D+}-wn
zfMEdaP%JDcvzM=!H)F%Hy7CvT(Wnr-<hZUZ{Ee-i(@&Z0b*AN|DCj3^b%RQOEWP)s
z>zn5{Z(q`$^Wl2=nqF_O-(J(}#hWEPH5DLxdLs&=BT=TSwMn_VBv?8jYNbnExyNqf
z=-|jyRj$Bx@iq~60AlDsemZ(iV!Ydbc9@fqYD99TM)V>u8B`^brb_hmFl==uqb$io
zDEFxr$=KE65ZXu;<0xx=Cu-!1aU9D(D;TZz-IHpo&RFkN@z2Ui(xa>dlYOz~;UeXt
zyx~GvI{A^Q66Gc;9H9(N{cL)Am)Xfmh_knyH?+Ru@*S$%9i)sKzCww9)827MbP}Yi
zj_rYT7L@o(?jOb_k5?N7npSgPcBtxZ^yI+X?h>ShmCDA&A9VFY^&3!20Rle&6aWAK
z2mqXMLQBW8ho|`i0088ZE(9<x&c;V&Z#&ZgGi<B<nmW?~Gi<B<nmW?~P)h{{00000
R0RRC2VE_OCCIkQg005A-E_46@

delta 1134
zcmV-!1d;ol35*GUP)h>@6aWAK2mlVMHcQ39gx}}`005g5000jF004DvWMy(}VR=??
zZZ3IkY`s`b&(kmrKC@pDiNhoW6Dyo{<6B4wCKwz*sLC35HE)`PBrWXU<D_f1!N$72
zg&exZi|yyJ9Ve>SF5{_y92I)h%B3|}M=uN3{N=DT64EVyFJ(GUA5QMFdt(l=S1AEj
z@-3^4Vt#9Y9l#mg-=qZ31^0Y0VXWi&a5j%qCA3|zcW<98Y3hNfa}O!6e9_5AM|77d
zEg&)<pDv>@3HH-ye-Q=r7}-x_@?d=2B{k&qZJ@Ub?#Fjb7PZ~Xv;hT~F3rq>)0NF&
zR?Atn2hk9JrzzGT(%kBDSKzY{95;KfwcjmqnMLDcSp);;D)UZUZY;UB9%E?ZK+(Rj
zsIy?sTU47)XyJQ>7Q}+(Tsmmv`(jhPgh3W|#XL|qRQ@2<qg^u4#$e8EwubU{U~9}^
z6*Xv_v+<|5rXF<8J}uw2X3jd>8_0Pj{en&9BdV!?)ETd)Z5*}HQg614ff!o-Ze^ww
z>2g#))Mhsxu$oI0DLpHyTJ~j{S5iJG!4=c{Q=@5p>UCNYPK>idX)AC9Ny2hBE2_0K
z`UVbO(;9h7lk7++(0$wKJbC^+eg6L4GW|ULdPUs!SiADe3U#}{1q%a1N2TwGjMWYl
ziy@<bw349yDY;_0ZVop2sF8v%qKr9FghjOGD)P}=Te;|A-ZTrEU0J)N7U}0`osXve
zjv_8eZtKkf#Z~ljr}(^2BRu6M+Gh&<4{dK4&oXch9OKUE45?2E_5&#ozJMl%m!Ty8
z2};7)1u%wEj^f%*g@Ukzld48R#Rp;o^ZN{cJ<F&@*RVrt8Jh5{DioJ-B;(*nZij<s
z^Yr3*djbRZo@Ye~ihQHZD)dJIG1~fwro+K5rY1mfVMqUthMEX$z@CH?v{=;YVI9p?
zL`@``5izagmgPi+dJ))1;WiW5x<Xe{gl6YCQv2fWrUwiIV25I1L76>!!Mqt8merMi
zziN+0h2SN}O=aP4(dwCgs%)<_Ew4pEf3j9LsPxCu`<(i)da`=`jLw{QAC@oa=k<rz
zAL!@lt0g@(H6VNbAPS-rEYtPIq}*LYmTrhz=~7qjf!jK|I5Jh0Yp@;PhH(cVQU~(W
zh372BKgS+(GE$F7F7$|A0ZayUiKOX&5<NW(+nvcMTk;snZMsD=cDFc&Hd4np8MVHN
z8o6Vf#`4b^MyvhjO|?~LtoN??XKf|v(N==VzF70{CFQER;X+ut`H`s-<u)pu2pO9C
z@$~#DvzL_+v$x9|T3>Pb2Gz|TQpOEmqeQ=LKXP;uq;DO&3+XH<@wGg>j7uIizikv~
zTFpb*v8r3?$&t7HN01g)DjOHSg{vQ`Ur<W{0zUv00000801m1)OU1#2-{=DX0GpFP
z1TZd40ZZr3Gt&Vim{3l#Gt&Vim{3l#Gt&W3O9ci1000010097D0000L1ONa40RKJ{
Ai~s-t

-- 
2.16.6