From bcbbede4b0b94afd06217f7fd44ae8f1be71509d Mon Sep 17 00:00:00 2001
From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Fri, 15 Nov 2024 10:46:36 +0100
Subject: [PATCH] Fix SDNC url path (param) in dd.json and CBAs

Fixes the CDS workflow calls on SDNC

Issue-ID: TEST-404

Change-Id: I73c6ee2fdb3e431f5da61cc79bdee6ce64e185e4
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
---
 .../templates/artifacts/basic_cnf_cba_enriched.zip | Bin 65149 -> 65150 bytes
 .../templates/artifacts/basic_vm_cba_enriched.zip  | Bin 10584 -> 10585 bytes
 src/onaptests/templates/artifacts/dd.json          | 132 ++++++++++-----------
 3 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/src/onaptests/templates/artifacts/basic_cnf_cba_enriched.zip b/src/onaptests/templates/artifacts/basic_cnf_cba_enriched.zip
index 607146aedd27e77a0a5ecff94ecd495d661e3b9d..3dda66947d0aac7f773931670477b61c63003639 100644
GIT binary patch
delta 2484
zcmZ9MdrVVz6vumSh01eP0pTZHyP<UjrOXFTmZ7N8hzbO#fY~N!91|au#|E-=Y6P0i
zv5lP(L$-yQMdyEPcAD*vMVGxYW40jUH4XAA1%`kqQm~ZWU*VqLy(1y%IiGXB=bYc~
zckZlP?QyF=*`WD3Y;!?V*k<5j^mTdhn&x@)+lxmz>9<|Y`}?C25?H<njZd{@ev$z}
zq#A!WkiBY+sR*1TIbcqdT==(dSn&@R=>9(Vx7^E@(|&51d|(fcI_=9hB-tVQfsfBf
zy>|avC^sa?+6sf)hIpBsBNegd#jIhid=&RcjihG%iyAbpZz)6r^vM+nE+=ncDUO|o
zd}LMhP@EErkzb{FSmf2z8|-Y3rf=Y-FlfwpM<x*lV_6}vD|3^~N8pRhG>o6f?3OVa
zpDnZXP-@DMV(oWKMXc)f>?UToawdZmX`~<z)6Nxyvd+IO{D7s!ohZf5?N?7lG2@Qe
z!ot!^2qVR1E0`LT*RinJ)3OJ1vC_$Msx2XS{B~Q_2<8CP{H5soV=EhX&^qUXLyXpD
zGl_lm=L3+m+3s$XX%P6M72gLmcWi>!+s;eD3-)sm+g>L5>{r@Xv4)yEK9`B<p`mjJ
z2KIHPVxaxyd%KxYbAJs^3*U8lWD*2g9weZIw%eCua7+iU_Uw`%TyjLhm7c8%dvP!0
zoEZOh?{?(W?&{sCu=n((pe^e8i5r+Zzfw2*_Q>}Tnuj96*e^t$F{o6TM@o*F%Sw%=
ztRR)fa-uF@`Xtbx>V84}t3d@lh6qLL1O0?s3Y=pd7NiZC9E95eW=9NqFF6wVg!NGD
zh=Nn=m&n|a5H}!jZ^8b7wdkc1wgIB<*`|WoZ7(SNzD~j&fajfY=%puC;uN@gsB;?8
zOPlU<3hIy)6~w26D4O0nNVwPF;GiC(X~nMxi8?=31(wuR=%?BNLxMUqT?H?tD~CKg
zMAT^+)E^Glhe9!@c_@+Z%z)zIa0txw!@{(o-T!J~$`#D51M@I@ue8YT!vY7QHx@cF
zm&v4Pj=)>8M7bC+nlxJP?PSb=;&wz`ZGuXtlK$qBhoy|=*Z`ez-w5H~FfE7$gKZ=P
zYf*ep#H|Mq8y~V(C_eU(@E_)QannN`W=fOU-dq&GI<Uf$(S3^IRilLWDe$HrDvy98
z1<O%_8%yL@79u)379m4AxHU%j8^;l^99Q<0J5KocQ(oLSu6#xlBFZvj<~6f2^TH#-
zcNQZaeza6kH+q8buF?feAiGSN{iBFU`2toxj_k*T|E2<kgHMMkgddAoSBdz&N@d*(
zPYA!*f_V5zxFXvyNqBvg7Z**kMW9#oi-=a&c#+W*3>7u(g6TD-Jr#I=s~4wPmnm+i
z<tgDS=h028a_0_D5&nGbLY6<=t!0m$)*Kb_$Y)->(Z%Y~XMNly@bB70WPqDCEe=6j
zaf;|*tB9h(Hm!liR<<h1(~0~o2}NTT6&#or_%m&o6+aWHz(q3xpVW@{hyP)hh);GP
zzShCcHUC*6X9Uho<~MB0$u^A6IPi>cRU%GOlsoJexchL<{R(<%Y@eHOTfyU2eqQ#@
v67|V06};cYJ}>kfnq~#g0)Nh~z}uj626_bUHpF^XqjI)K=lgdz-LL-uCG5(b

delta 2533
zcmZvcc}yI26vuaFpc^g=LL2z8j3ZDf3jxX%A&OkFy2^?yTc|{V5Fw>2=Y}f<Lk~7$
zNed6pv<4C*HZf^+ZDWk7{9zOQqamT3Z3A1bWlPH;H|214*7?nE(D`fL`@HXa?{~c4
z?l!Zt&0LOA2Ia?=1m?%WjX?wlOWfNFqLiP16k~V&_{E2m_-|%tS66KKxYs&iqr=na
zA{yX<F5v&K&|8dmvjMCq#jU1XNNG=Nj`6=wx&4-}ocy7`zsJ)yX7&rHKS2AfnLC5V
zot>j2!dk<iE;OF#>@X~5J3(J)xKb<c7LKZ;#d_vKb%@l}rHCa46I1k2B{ps)lwt!y
zQtB}HE+s*d%%tZ#6CDV9167(Z9R00kSBk!-y(Mi`ab^rHhCx?W4bilHAwF<i7f1LI
zT-CjU<Ck?7g4yG92;0$yQJ*EooA2t&rOIhJ*Ck^!chzH`)PQAYOAblhe^c5j$s!Ha
zxO?-pvH;1rThS<my<3GOQf2g)vUS$BOJU*l#2xyw!76E58h!9Fn7hwE!5Zjn>D$-0
zJ6twNOSYNzobf^y+H#~c8K0eV!(_OtKbFW-B?1T?`i1yUhwx#eXq$V6gQZ47hvGmv
zT1+Hy?ElxJX;?5ds>K3x!h_?IVR{&XR|_}Cc4fC|U_2hD@Uk4BFl?UTAnDQTB827{
z74$rMO=i1Hkeq{>iBy7fFg}qkvo(_%!dAKPLwV9MX1$YdlB3C2^976538JQ0Ra2-!
zp)0C7Rbi}-)MtArl#Pb=Lh-c_16!uppg)Mf)8$6PsWL}=#?J$V;=J0IWt~Edms$al
zYCJ`JK@Lt#BPtatr`2SWaC@3%;-VE$5TSzdXfGLyoMEXF(9VPt-bBWdtbpC*K*Gm?
z(uycO1X?2quL`QIEY%4e)=0u@Uw9zntx>=+jgRa&l4lW>2YItE5z!ocKZ}?Gtpb{~
z!GvE0?lzY8$%LymKhR_z!l=-eNNM4UZGTB8nCAr}S<pT23m!TbeA&bueq+uPHa4E4
z!lCl9bf4|l;?Kt{)xmqiU{vRg3rRYbK9kL-J?1H#Ue*>6r{OqeKDTGQf>Vg!UW(1G
zco~xPWFs78JVEsPdI9~U_aSO=@Q_CXCj=Drlx%~8(x-_2G*>{D+~*0ER6SW%y``8B
zPW``rIk+&7C@1Ke&m;115V(M7wv<<;K~t$8M%@dE^v%<Pn_HAO_1+?)Bg+JIsZ5TR
zd8DflkhwyRE-oQ@q*6e0OXN~G2>u(<>(v6vG0OMmHjn&j1r)F>N4d+0zFsGwgY}1T
z<Mw%2;n52X0{XZ?UhCot|LQghXl}(<rc$pW`p9_!eX=UuJA1-AtB48)%W4K8a2!GA
z8cVyFc##@1P2R-a<6vM7(e)10YmyID(K@2fw*9Meg?nxCatl13>lAR@2Dxe#7&chC
zp^HbM(A(wtpLS+>d~%S-L9jQdgswsI7OLQbO_u&$#6g5w1y&w44PoV-A(aeQY_asK
z!x;a%CC8gQHjH3w9wE2Zu~SXYSSDgr0o|j%j{CW8CFhBM-JT)loDlGetaQ;f%RIO*
z2;s{1iv;6fY8z2Wu(vILS>E13jA2Xxtz+cN;%MW>4ojVZz8!!3LM`niQh!1C?h%|h
Ncb7YG&tjkHe*kCH;~)S4

diff --git a/src/onaptests/templates/artifacts/basic_vm_cba_enriched.zip b/src/onaptests/templates/artifacts/basic_vm_cba_enriched.zip
index fa87e43ac5f8d7b3f62de13453a39840499be34c..d606cb9260cf5fb8f5e02c3bcf3dcc80555d8e49 100644
GIT binary patch
delta 1732
zcmcZ+bTepzG5cXL^Yp!9=9769)FvkAunUNTxf>_*Fu~Z9moeRiu{U=yn=!&U$5|ZN
zVVueQJT)-(=1DvzEX*3A`IAoyIM&+$jfCOS3T_5QmY2*73}E8zjQIRp1_B4}|JGcy
zqMs!~ezjq5Y2;BaZ`YSgver)U<T)#qbiQoHqOSLL>V67-bA+xf@|+zX@M!nu^WUGR
zw?9{A(5dGX&yYH#y6J#sg_v{Fgu|@faov}ui9DSpCAe^g!l}n^>s^vAIG<T+_t1{-
zYud>o!->U4et!!Rmp*=-bB*<=pyyJ#S%)<q{45gusNg=&)?0jw-tWWzj=qTIzH_&a
zz5GF~OrU+9ej>yC53iJ;?0Ng>Y5ScS4?A{sOpTfPS^SvD^C02quZwmR+Rx@+V|=k{
zv$MU*#dV!a{f<tlT)6x2B&BbY>g}Z+-*x<LNvh`L^lXZ~<Pqjl@^m?$A>ZLA2Pd!2
zJQls`rPiG1w{9jo?$gtX?&OzK()beaB5hsW`p6XPkIhExeLvp4T_KvcHbG!v)pm|2
z{VU_z9k`~?&2yL1@S4q1vsW^9<)RL@Z)JTd#%q*ciIkn2tDSCRvHAG9voFeOp53Vb
z`}$z!w&-go<*JU)`up6;dak=mldApRWXZ`-DwQ`{s#zT9wy5<iZ?IV8qqXF{tuOnj
zJBn7`d+o~AZvV*1`l<2X_wm#v>!(RcN6wT?byQB8(!-<AqtAD$J1JE<DrA@cvt0eK
z2^nUhpI-z_>^`+bqt~3NH7nU7(V{TGPh{1t`h-Pys*SRL2Pu8Ho7wRrWLebVuBN6o
ziO|g8ybv8;TOM0JU;eGPc%8r0Y8dYj_ssHIdPcZ6io4)U%niRiUP&i!CHGWvtGvH#
zvLp4)mFe-uKYR>kC@O@6?`yv|%g+3e5SwlRW2bz>cmFp}mPnf~@+&rZ<0>Q3^=;PM
zq?>CL&FbsiI?|*|+s@r&aad^HuIHb>=E3QT5>7kb{JF0`KFBiKD^pw6_TakmqKwrV
zT-}`^U*4@Pf19_vI)7#9a`xbr#?oJ_W%r3ppZae7w4Z7{N@_}pJi)?euCrfmWjXif
zK)7_M@TsPx%@a=fZ8!h?r{m}1jNjATj`J!cKRPj|yP=D>{-n(TRn7}L>gT5KmN}R6
z`ReCa4_n{vdwX(i!%uxV*RZpZGgo$9E?RyuI?m~q)zMpv|Aw0GzwX7m-aP7iX=tcb
zMR;*_=U$B!)`g;#KUJ=BO3N;kI$ZyjLHD@j4BzLBF^N&X<#QsJ3gzzI6M10kwr7)1
z))>itnd}+-_1WT;>%>!ik9_-;bL-h2CSlE$1}>6$ZGDS6726b#C3XgWc)6dw^;V^k
z-S1Be|LvN1+N9@4Gk0573MlR}{AOsoP83<c(_3b3J#&CJJIB{&rBfD7J}+VhFEe;V
z-Qa9s`7ya(R3BahY!ww}M3MX{W(t=y6<>lVMIK1FBRG0e!3a)=bTphZ`GLgS$=7A$
z;AYs!okF%C046axMd3f(;*ClQle-k1;Bp}TXGJd*eu|PC5<dxvtuWb2*#(8aRM`QE
zFT)8e<02v9BB<iY4J+k<^yH075|e9Hlo+p1UZ5g^<Q|Zy$mCfXe9E$-3=F}^MVSR9
z#rg%6B^mj7`k^7b4D4A4A0@y_WsrL<RHc}+L>VTxiE1F(4KZhfDj(yV$@^8skZe$x
z{0FGxi5SBqaXlmr3X}8Hq?jj3Fic)2p^YMb7byNf5+p7*SwLMBMb1ZEirG<`VREdr
z3X1p^bt%Thlh3QGp@_<8NHM>b1zIdQSwRljAh@rYFUm7aek(7D;@;OlZE^|>ldTk#
db)gkdI$BK;;LXa$00bgHsKmj*pr{Dq0RYX4vLOHf

delta 1741
zcmcZ^bR%ejF?(*jNqTm?$z(nSwTTHj>^=p?AnwM=JWMe5<Yi2EVeHLa%w~*m&T$q;
zb{J<eKTi#ey?GLk2@CVy#+=C~1sv<Q0gVJ<pt0$t72FJrEH9ZE7{J8a8PWN(4MZC5
z|JK&Ia(qHc?V4+uk;hl9nI4j9wK8h;iH6CWgx=g#3l4d@|9paigpczzx5;MvT^<zo
z)z;|E_npVju%U@{&f-iK@e@qPA4KwWI`Tc&snqqh4w{mk<<gSWq!FK6uO`%Nmn6r_
z!C$b%+<RKIpr!g_la6O$R{PGS%?*~B9P(<hWRLSaeQ{y=q9?cWb}cBi+#xZie_!c=
zyKgHh*zc`Rl3KHiTjG%Vo<AIx@2e_4Dw?NRER#zT4S)J)so~L`SB`}3)yTIw@r?Pk
z&lbHh2^W=nW*e`poM~kLX<J0lk+}L#%LShF-SE#y)mKpT+@LLWva3U{`HJGP#3?pE
zicHT|xSPhhZH}?7);W1SHC6lLL3b8cyRJQFuD<8(&QYricy_?>{yy2Qht{g{Bwu+W
z*7(Qp>T5xdhl{Si_hfcm>2cut?2A*ix-v8JpLrM^u3F@m`2Nh!qGN}HtKZz|$veKh
zuikctoLu_u)V*&WJ_*?TKPF@O=MIkzPo6&sIHppmr($-TrM+UGSNtVeg+7hRTt)7)
z_@?Z1zT&&ru2^mM50R}k6aFvz=ymD3N3T;@s$1xVE(uZP!`z3v_kLOwbF)os>$}O7
zw>w2u%9ba|$!Zk^P8FH@F>FCVE{{5o`nOY^L7~$1J|WfqX}RHEEsf^A0`pIWWJd%B
zT@YBTmwUQ**3yOT3y<%6xiD;ZV#hxIRJL*@Pv?~(m5TyjGxW`5-`yGRsS{b=WB9(|
zN$o7Q?Ok)9eadE^&&j68<Wws8<Hg#S#mYK~HyEE!U{S32f26PP*Xpn<nf+~ZJD8O(
z#=SF}wo`ZG$9iKoliMqbAI|Y(5UDbL@$t(su6;f3(;r+uy0+L>F3xw^^u_1TvHtkl
zp>a#2>rj%CsQUM7yYu$n-oO3IuFK6UFU?&0YcFSf*J-cs*H7=^SlrR+A#wN$%jd5L
zzbG{339w}?&T@(j$`KE``LfLLe7|VDNbdcMFDevMd}L-C3kGadte?rgLqSoBf8FPt
z@WV56_tnMO?%8m6yX{U<ga1btpUAS%HV!R}$}_Dx?d=i1{6@u={i~jpN3DGN)$R4Z
zb*r@4-xsCnZ;)^IRbQvHe%=zR#MR0n$v@W1F1TvZ{;ovqkm|DD{|CcDvo2mceVa8V
zJKJvN8THF?_A^aF^X+EMstR=T$yt7WneVx5gNc)*oTof2d!aE~B1t0Y&2$OX`Twc|
zR?Jm@yjfd*)_UokK8HK(cO<NEYZGo0{{5_FXV4VSkF$0kIrz&wz?+@J+hDTX!pRpz
z%#ex<vB}rvB_>;oO0YL0ijm0;qWbWXV4J8oBa#NS$-l%*;gV+JOAv+0LkV{TM_(!!
z!ReHahI1xAlz2P&hHM<%3|qNV$QA^^BqpaS{D)iYuck1$ThR$F2jYKG^g`jMD!HNX
zFDap_w^nvRkzc0lfW(*K1QvIZkT4Qb@#ID-^d{$P=<steC@{dlU&m{c7pjQBU6-$6
zr7R=Lz!02Vlvz+xtY1)Bl98XM9~#2Tz@ByRQ35P%L9Vt`m152mWtiM9ssXnhWIh*)
z`Lib<P!)rl57PG+sPC~D!(>KrJ-9x9H7n+c5)6~qOK2mBDNMenCdGVT5+p7*Sy)OG
zMb1}UirGP$VRD?b3X1qvbt%S0lP{>Np@_<ANHM>X1=%V&IamW>641xY7vvcxzmu0l
napfDJdRYaA$<_+Wy3m>ky~+siW@Q5fqzDiyaWF6_D1vwZPLa6O

diff --git a/src/onaptests/templates/artifacts/dd.json b/src/onaptests/templates/artifacts/dd.json
index dabb9d8..9ac1f79 100644
--- a/src/onaptests/templates/artifacts/dd.json
+++ b/src/onaptests/templates/artifacts/dd.json
@@ -30,7 +30,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_int_pktgen_private_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vpg_int_pktgen_private_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -102,7 +102,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_int_private1_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vpg_int_private1_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -193,7 +193,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_onap_private_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vpg_onap_private_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -250,7 +250,7 @@
             "path": "",
             "payload": "{\n\"GENERIC-RESOURCE-API:param\": [\n{\n\"GENERIC-RESOURCE-API:name\": \"vdns_vf_module_id\",\n\"GENERIC-RESOURCE-API:value\": \"$vf-module-id\"\n}\n]\n}",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_vf_module_id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vdns_vf_module_id",
             "verb": "PUT"
           },
           "type": "source-rest"
@@ -322,7 +322,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_onap_private_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vpg_onap_private_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -368,7 +368,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_name_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vdns_name_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -414,7 +414,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_name_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vfw_name_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -460,7 +460,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_int_private_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vlb_int_private_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -506,7 +506,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_ip",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=dcae_collector_ip",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -552,7 +552,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private2_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vfw_int_private2_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -598,7 +598,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_onap_private_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vfw_onap_private_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -644,7 +644,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private1_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vfw_int_private1_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -690,7 +690,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private2_floating_ip",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vfw_int_private2_floating_ip",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -736,7 +736,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_int_private2_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vsn_int_private2_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -782,7 +782,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_onap_private_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vsn_onap_private_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -828,7 +828,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_port",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=dcae_collector_port",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -874,7 +874,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/demo_artifacts_version",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=demo_artifacts_version",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -920,7 +920,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/install_script_version",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=install_script_version",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -966,7 +966,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_pktgen_private_net_id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=int_pktgen_private_net_id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1012,7 +1012,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_pktgen_private_subnet_id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=int_pktgen_private_subnet_id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1058,7 +1058,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private_net_id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=int_private_net_id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1104,7 +1104,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private_subnet_id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=int_private_subnet_id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1150,7 +1150,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/keypair",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=keypair",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1196,7 +1196,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/nb_api_version",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=nb_api_version",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1242,7 +1242,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/nexus_artifact_repo",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=nexus_artifact_repo",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1288,7 +1288,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=onap_private_net_id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1334,7 +1334,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_subnet_id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=onap_private_subnet_id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1380,7 +1380,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pub_key",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=pub_key",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1426,7 +1426,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/public_net_id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=public_net_id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1472,7 +1472,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/sec_group",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=sec_group",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1518,7 +1518,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_flavor_name",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vdns_flavor_name",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1564,7 +1564,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/flavor_name",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=flavor_name",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1610,7 +1610,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_image_name",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vdns_image_name",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1697,7 +1697,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_vf_module_id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vdns_vf_module_id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1756,7 +1756,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vf-naming-policy",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vf-naming-policy",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1802,7 +1802,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_0_int_pktgen_private_port_0_mac",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vlb_0_int_pktgen_private_port_0_mac",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1848,7 +1848,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_flavor_name",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vlb_flavor_name",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1894,7 +1894,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_image_name",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vlb_image_name",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1940,7 +1940,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_private_net_id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vlb_private_net_id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -1986,7 +1986,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_flavor_name",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vpg_flavor_name",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2032,7 +2032,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_image_name",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vpg_image_name",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2078,7 +2078,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/image_name",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=image_name",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2124,7 +2124,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/gre_ipaddr",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=gre_ipaddr",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2170,7 +2170,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pg_int",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=pg_int",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2218,7 +2218,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vf-modules/vf-module=$vdns_vf_module_id/vf-module-data/vf-module-topology/vf-module-parameters/param/vdns_int_private_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vf-modules/vf-module=$vdns_vf_module_id/vf-module-data/vf-module-topology/vf-module-parameters/param=vdns_int_private_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2266,7 +2266,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vf-modules/vf-module=$vdns_vf_module_id/vf-module-data/vf-module-topology/vf-module-parameters/param/vdns_onap_private_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vf-modules/vf-module=$vdns_vf_module_id/vf-module-data/vf-module-topology/vf-module-parameters/param=vdns_onap_private_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2312,7 +2312,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vip",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vip",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2358,7 +2358,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_int_pktgen_private_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vlb_int_pktgen_private_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2404,7 +2404,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pktgen_private_net_id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=pktgen_private_net_id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2450,7 +2450,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vnf-id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2496,7 +2496,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vnf_name",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2542,7 +2542,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vnf_name",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2672,7 +2672,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_name_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vlb_name_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2718,7 +2718,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/key_name",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=key_name",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2764,7 +2764,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_name_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vsn_name_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -2810,7 +2810,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_name_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vpg_name_0",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -3129,7 +3129,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/cloud_env",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=cloud_env",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -3186,7 +3186,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pktgen_private_net_cidr",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=pktgen_private_net_cidr",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -3243,7 +3243,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private2_net_cidr",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=int_private2_net_cidr",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -3300,7 +3300,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private1_net_cidr",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=int_private1_net_cidr",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -3357,7 +3357,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_cidr",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=onap_private_net_cidr",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -3414,7 +3414,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_private_net_cidr",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vlb_private_net_cidr",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -3471,7 +3471,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/management-prefix-id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=management-prefix-id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -3528,7 +3528,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private1-prefix-id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=private1-prefix-id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -3585,7 +3585,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private2-prefix-id",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=private2-prefix-id",
             "verb": "GET"
           },
           "type": "source-rest"
@@ -3631,7 +3631,7 @@
             },
             "path": "/param/0/value",
             "type": "JSON",
-            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vlb_onap_private_ip_0",
+            "url-path": "/rests/data/GENERIC-RESOURCE-API:services/service=$service-instance-id/service-data/vnfs/vnf=$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param=vlb_onap_private_ip_0",
             "verb": "GET"
           },
           "type": "source-rest"
-- 
2.16.6