From: aravind.est <aravindhan.a@est.tech>
Date: Fri, 19 Apr 2024 14:17:40 +0000 (+0100)
Subject: Fix sme api definition to align with the endpoints
X-Git-Tag: 0.1.0~12^2
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=784398f194b8c0a935c863e9c7f1d4124019ac97;p=nonrtric%2Fplt%2Frappmanager.git

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>
---

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 bef788a..2288946 100644
Binary files a/sample-rapp-generator/rapp-hello-world-sme-invoker/Artifacts/Deployment/HELM/hello-world-sme-invoker-0.1.0.tgz and b/sample-rapp-generator/rapp-hello-world-sme-invoker/Artifacts/Deployment/HELM/hello-world-sme-invoker-0.1.0.tgz differ
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"
               ]