From 784398f194b8c0a935c863e9c7f1d4124019ac97 Mon Sep 17 00:00:00 2001
From: "aravind.est" <aravindhan.a@est.tech>
Date: Fri, 19 Apr 2024 15:17:40 +0100
Subject: [PATCH] Fix sme api definition to align with the endpoints

API endpoints given to SME modified to align with the application endpoints.

Issue-ID: NONRTRIC-981
Change-Id: I6055d6bd1d67f7a4b635fb9e98a893d2fc241bac
Signed-off-by: aravind.est <aravindhan.a@est.tech>
---
 .../Deployment/HELM/hello-world-sme-invoker-0.1.0.tgz | Bin 1555 -> 1558 bytes
 .../Files/Acm/instances/k8s-instance.json             |   4 ++--
 .../Files/Sme/serviceapis/api-set-1.json              |   4 ++--
 .../Files/Sme/serviceapis/api-set-2.json              |   4 ++--
 .../rapp-kserve/Files/Sme/serviceapis/api-set-1.json  |   2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sample-rapp-generator/rapp-hello-world-sme-invoker/Artifacts/Deployment/HELM/hello-world-sme-invoker-0.1.0.tgz b/sample-rapp-generator/rapp-hello-world-sme-invoker/Artifacts/Deployment/HELM/hello-world-sme-invoker-0.1.0.tgz
index bef788a0d07a5b839df1467888bfbce343b2eb1e..228894699593fd2206752b877e0bacce2107ff7b 100644
GIT binary patch
delta 1516
zcmV<I1rz#{43-R#JbzJh+qe<-Gk(R^o|{QB7D>sDowCyhRnpCInv*=D&Y3)UAaX_F
z3<4+sN>Ojz-`)X8*^(2Tl1nFT@3;@72!OlT#bUpY&=NV9owd|F@0b!hOswQR>Ts~6
z+6Eh1@{_NYD2k%1%S(TcqUiZO>Rnu)bT6;E(dBio+r2u8x__^)u6idBeZA@9QW;D2
zN%YmWo;&w{B2=+k)P_kB!>UK9Qjd>O&<!GzqscT=);IOx2jnGWE;(Q!HH;_Y>1>(|
zTsxQW&gBuLKaL=&^N0vqVhjhejM$CB7^qU5Wz?A<t9|SL?eP5W<<S0LQC^|>&lG?o
z`@eT_5k1@gSAX5^WxM~sg`7c$oB_aJ56IhOFdC<$yL8r{&JGQF6t8O1nfAw>bl@Mp
z`_A76Qf)LVmKI(NUP3SGUB)m`C=#*I6uy_0$o>9@QKhBA-B;hT428iQDv_fGyF}<K
znk{kLa}G_(f?g283pe1j={kM+7q4R@D=6s(gtSl@1b@3^1{RDX;D-#A1tuVqrQ(c=
z3}Mae(i>{j1YXJeMv0tT$^=lzq}qU7?2ZI#$(bMRWofO7!*IP`2h`6wkh%zYJ=TOx
za67#qYTo)ua5M%q{-a_VbC_?o)p5=dI9-F(KnsnSgOzUDYt1YZ#W@(cuxqO8*yYSv
z&E}Qei+|g8lFaN4kOHWH(|!s`dJ2E*r%8J5wY*DaKTLj_!Mpx++8@u7Q3{hO3?}1Y
zGD{}o6eiz8fBYW)o{Wd*fXpsY1Ab82`5-kg7g5aX@TG`*lW_3io{hqcEm#JeilU+g
zLLpbE1rr4*)Fm@+Z4FS7dp(?$%=%<8AG;QOR(~>&#>1nj?2?%fR?-4v0&wQ@hJr?p
z)McaZffrQdprp1Ss&bC{C9nlZ;X_PUlySFi=PnlY>s)4(hsM&vxmWA(xs>Ayxl|<z
z3n*4hOW}SK0F6o-W~JW5An-$FE&|!nRCG+{vMKIHQFIw@n?fOlwwh%fLrcZ6;|u)9
z$bSo9X|Y9FVo<MG<{kZYzy_!xd%!DWQ71P9y!$b{iQYtn>`dJ$qe>-tyd?v7Q>xTm
zk`n+^;*golE%at2awVCtF=SM+MJ6={TQ35$%7Uym7Wm-BZ=yd(VKd<lRm_B|Zb&&#
z>!$uqVhCx8!)MAN{I^&tPA!@+N5$pFt$*lmWdld>|00Sm_wm0MU0=8S|C>mQ|1JKv
z_<s=pcR!D*QVwg#Jrj8h!^g5nO0+bmmL7%A&QmQV&h5B{celJIhF^Yx;I{tkY8nT!
z5*8jF9AF~H%u4NE0Vt`>mT&1Cxv3jG)E>5*N#Sy~2Joh`H=1_l?u73t{Q|WBTYrz7
zJofCU>NLS|e%8lJV_IVE-d1Y91*bc)@J+!J3xbD-_@i!13wU@q-O+?%74JMgneX4+
z+$F=kE&%_zyKi@g$^@RrJTvg5G5v9LH%!vO<aRWD?~?0gl8k3xX5mwW=$S#sv&^S`
za&_jJy~h=}@$_uRY{Q)bPg@@zT7RzeN0#IKZ<{W^{V3?z`A>9x@tptlUSGHT?^{UA
z|62an^1sjGe~;9!IcfL;-q+O7N77dxqI?3AT}RD`cF?}l9I^ZghS%w4sV>mgfWJct
zl$KUzlE*L`+%#=_ykVbQekSE>X~XY94&i^WL|(E&NR3}@<JkYduP<Id|9}4{x{g}>
z{}yrvH`H3x!gxIK3l8fg3Yb@n=e`Kj?4A~ATy32>;53!;)d`Ht9w@k+*I%R_hct3(
z*$P2XyWDB7>$kw72KpCD<AQy_yhhtUy$oO?_{JZet9nYV`~znK0}>3=yVOdLZUb4C
zQo!vXg`8<af`Zx5U+d|UU}gSK9s29GVOfOkvVAlw5k4uJ)9k)do(>rDDlltBUIlY{
zPhJJKbibu$1$p%^at60lGg%o(h9g4)rRC3<SrV`uX;=@}@@EpPOeS*-+X~rAE3N!5
S%fABv0RR8b7U{(RCIA2)$NIeh

delta 1513
zcmV<F1s3|243i9yJbz!4;<yo?XMKv!OkLIP)?gc$ncX;*2LfE3D;t=?+-&XBl&~A4
z8(C5$8J1j4K6^?s%mBL_d$*}ca&bQZmgN4YcK?1B3*=n3R#Nl4WlC%@v6K&}!~TM5
z8?0%`&%RlrD2i^buKaftMTg%}r~CG-eRUJHJKdX3)IN*a*MB$H-7|>3-SlaxjHUW4
z`es{)!Tpa2RqPJ6VN%4f>=3Hd(`6L2gNWp4GR>6rLp}Hbc?p>-4wy>~qw#1mog{rX
z&Lw<sbp+|(hLF^CL<B7{h9gx*>{?+AR4L9f>P(R3zV-ifdVcqE?D=0(UZMH-G=LM&
zf2Z5+9z6dy?SFREJpV5t7tkUX0PyD{@;>PgN9piBo%SZvV~d`|s~Wc^y-_Re`-|_s
z^Iv_b)|wRy3$OaGp%ZnkVi+qFiI{5&-^)tm{`rStrKQ5%Ti>$`g~1#uk)sB?K<Fu&
zEpR(?37eJ$ogji&Zo&Cx>iqSeypFZ3prmUM(n4hr?0<q8m@|%mpE6Vyn1D={iZd!Q
zgcY+3Z)l??@Jc>zl*pN-OaO&Usx`>@?n<DRT=>;q7S^gb3|FgFK)ug_)J4eawI<vo
zx77)v&0RkVj>dq-zgJ9S4zu;PJI*))rz?;eXrU2vu+q7`(#$eZT!N8vyP~?zUCxZv
zY*yL5ynk(-WM*%H6hH->_fkmGbNEXyP0~xR<wG+4Vf^D1KJ+G&-e{T(Qy5R6KOPN|
zX)+$AF#aBTqmS^{WHh)0WOjiX@RQOm2C0F$jACA=FGbvQ!oi2THVQK~XBluRii#Ep
zg<PT*OcbC{m&~}mH9$q~^>9`)>x;#F9$N5K#eX~;4NjJ_D`rAiNehe#z=f|H3K}_5
zSB-uKUQv;QlG=i(${Fg{z~&%@PcdCm#@)VMx?I$^bD2>d8cPcoUaiB|QjSaHQk5ty
zpja|3h5JnaG%9JBm3ke6z)zLw2C}88Xqn7aQ{0ZC=qlU}g+dB#HOpFtmWpG`H~7zy
z7k|LgVvDlGpkA`f2l~r^4NyaNpI64BPHqYK@MCxvy^9Fhaos8F-QM0OgLumZ?k7~K
z`y?meIKurPN&Dlw;pC&+klS%Gn#Pb(#papR7;FOx%rXnI+Fs!E7r%@C7=;_3TU0R<
zF54mHJgtX%w}~O7;SOIT$MD}`sW`Q0!hakUmut79zm*M~!2fP^i2t4F?ag(A|1Tj8
z{x|sF;Qvwl-+eu%N;#k*4@~4S44&E|DbdoLT6z*bThG0exUl0I-re?^7=Hd4g1h>)
zYctrFm9X&mNB|6S%&gSz7J!o4Z1JAXkehk{oOj3VW>UDCtpR+~**BVYe0Re4lz;vT
zwE)|QoIK6!sA_GJ<KnE3mqxV2I=rpad<)KZa^Z)9XBGsHkMU>ImKN~%c)p_v#WLQx
zd^SJvq-2y%d!zpFJ{jyS0`M=s`yT9&n&9y61FO$wzD#g_ov|<LI56qxm-%w2uKgTX
zeA<{>&)RkjZ}?Q;+3e$E!=L^y<bO2(+t$TzKMFc^{u8~uI^=(y>vqHcUP2oF*YLlF
z|9utzd!l}uV}@tm2PcW&rinhWzWNm93+U@6YD%<&>#fZh%P*jHU2m4^0&NZLJK(Rh
zv@(-ChH3wHGq%SN_SxlEa=wNj{0`(8{s#->B`bu~_{}y>{r`L2y*~W^Cx5zW@c%{R
z0&c0bsD<%(;x`;t3luP`7|(qZrr856(74_@b--yV<(m^2S3OX0Iji4DJq~H))UqXl
zqIR(}UiWW-MGf??l*T#xgn5m&e|R0hSn#z!JXf_#uKfdN0s|5Z()-j(k8XWgmQui7
zKZTrWLxO_Y(0|tMlVJ7_9b)>=?ZBc4-N*LQEJgUNXhyS#N_je9$eX~d6nPWO=mU8Z
z*wX!$nib^DKgk8$QO#s!AQ=n|36z#UVP;9da-?CsT+5$Gur!&>F>D%SBaJlj-z@(M
P00960p^AdA044wcN^J=5

diff --git a/sample-rapp-generator/rapp-hello-world-sme-invoker/Files/Acm/instances/k8s-instance.json b/sample-rapp-generator/rapp-hello-world-sme-invoker/Files/Acm/instances/k8s-instance.json
index 917497e..8434ebd 100644
--- a/sample-rapp-generator/rapp-hello-world-sme-invoker/Files/Acm/instances/k8s-instance.json
+++ b/sample-rapp-generator/rapp-hello-world-sme-invoker/Files/Acm/instances/k8s-instance.json
@@ -25,8 +25,8 @@
             "address": "UPDATE_THIS_CHART_MUSEUM_GET_CHARTS_URI"
           },
           "overrideParams": {
-            "appId": "DO_NOT_CHANGE_THIS_RAPP_INSTANCE_ID",
-            "smeDiscoveryEndpoint": "DO_NOT_CHANGE_THIS_SME_DISCOVERY_ENDPOINT"
+            "environment.appId": "DO_NOT_CHANGE_THIS_RAPP_INSTANCE_ID",
+            "environment.smeDiscoveryEndpoint": "DO_NOT_CHANGE_THIS_SME_DISCOVERY_ENDPOINT"
           }
         }
       }
diff --git a/sample-rapp-generator/rapp-hello-world/Files/Sme/serviceapis/api-set-1.json b/sample-rapp-generator/rapp-hello-world/Files/Sme/serviceapis/api-set-1.json
index cd8b414..862d65d 100644
--- a/sample-rapp-generator/rapp-hello-world/Files/Sme/serviceapis/api-set-1.json
+++ b/sample-rapp-generator/rapp-hello-world/Files/Sme/serviceapis/api-set-1.json
@@ -7,7 +7,7 @@
       "description": "Simple Hello World API",
       "versions": [
         {
-          "apiVersion": "v1",
+          "apiVersion": "",
           "resources": [
             {
               "resourceName": "helloworld",
@@ -23,7 +23,7 @@
       "protocol": "HTTP_1_1",
       "interfaceDescriptions": [
         {
-          "ipv4Addr": "hello-world-chart.nonrtric.svc.cluster.local",
+          "ipv4Addr": "hello-world-chart-service.nonrtric.svc.cluster.local",
           "port": 8080
         }
       ]
diff --git a/sample-rapp-generator/rapp-hello-world/Files/Sme/serviceapis/api-set-2.json b/sample-rapp-generator/rapp-hello-world/Files/Sme/serviceapis/api-set-2.json
index 11694c9..0f69bc9 100644
--- a/sample-rapp-generator/rapp-hello-world/Files/Sme/serviceapis/api-set-2.json
+++ b/sample-rapp-generator/rapp-hello-world/Files/Sme/serviceapis/api-set-2.json
@@ -7,7 +7,7 @@
       "description": "Simple Hello World API for Subpath",
       "versions": [
         {
-          "apiVersion": "v1",
+          "apiVersion": "",
           "resources": [
             {
               "resourceName": "helloworld",
@@ -23,7 +23,7 @@
       "protocol": "HTTP_1_1",
       "interfaceDescriptions": [
         {
-          "ipv4Addr": "hello-world-chart.nonrtric.svc.cluster.local",
+          "ipv4Addr": "hello-world-chart-service.nonrtric.svc.cluster.local",
           "port": 8080
         }
       ]
diff --git a/sample-rapp-generator/rapp-kserve/Files/Sme/serviceapis/api-set-1.json b/sample-rapp-generator/rapp-kserve/Files/Sme/serviceapis/api-set-1.json
index 5137b82..aa685a6 100644
--- a/sample-rapp-generator/rapp-kserve/Files/Sme/serviceapis/api-set-1.json
+++ b/sample-rapp-generator/rapp-kserve/Files/Sme/serviceapis/api-set-1.json
@@ -12,7 +12,7 @@
             {
               "resourceName": "sklearn",
               "commType": "REQUEST_RESPONSE",
-              "uri": "v1/models/sklearn-iris:predict",
+              "uri": "models/sklearn-iris:predict",
               "operations": [
                 "POST"
               ]
-- 
2.16.6