Adding fix for SME array initialization issue in serivce apis

Issue-ID: NONRTRIC-1098
Change-Id: Ia56b0f09d5cfc95b19dc3b1101121288efc1ef77
Signed-off-by: saul.gill <saul.gill@est.tech>

diff --git a/rapp-manager-sme/pom.xml b/rapp-manager-sme/pom.xml
index f171fbf..4b55026 100755 (executable)
--- a/rapp-manager-sme/pom.xml
+++ b/rapp-manager-sme/pom.xml
@@ -200,6 +200,7 @@
                                 <apiPackage>org.oransc.rappmanager.sme.publishservice.rest</apiPackage>
                                 <modelPackage>org.oransc.rappmanager.sme.publishservice.data</modelPackage>
                                 <generateClientAsBean>false</generateClientAsBean>
+                                <containerDefaultToNull>true</containerDefaultToNull>
                             </configOptions>
                         </configuration>
                     </execution>

diff --git a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Sme/serviceapis/api-set-1.json b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Sme/serviceapis/api-set-1.json
index 86ac84b..7287685 100644 (file)
--- a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Sme/serviceapis/api-set-1.json
+++ b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Sme/serviceapis/api-set-1.json
@@ -24,8 +24,7 @@
       "interfaceDescriptions": [\r
         {\r
           "ipv4Addr": "energysaving.nonrtric.svc.cluster.local",\r
-          "port": 8080,\r
-          "securityMethods": null\r
+          "port": 8080\r
         }\r
       ]\r
     }\r

diff --git a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Sme/serviceapis/api-set-2.json b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Sme/serviceapis/api-set-2.json
index e84d9cf..19b1a25 100644 (file)
--- a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Sme/serviceapis/api-set-2.json
+++ b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Sme/serviceapis/api-set-2.json
@@ -24,8 +24,7 @@
       "interfaceDescriptions": [\r
         {\r
           "ipv4Addr": "energysaving.nonrtric.svc.cluster.local",\r
-          "port": 8080,\r
-          "securityMethods": null\r
+          "port": 8080\r
         }\r
       ]\r
     }\r

diff --git a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Sme/serviceapis/api-set-kserve-predictor.json b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Sme/serviceapis/api-set-kserve-predictor.json
index 9c84824..84d8dbf 100644 (file)
--- a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Sme/serviceapis/api-set-kserve-predictor.json
+++ b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Sme/serviceapis/api-set-kserve-predictor.json
@@ -28,8 +28,7 @@
       "interfaceDescriptions": [\r
         {\r
           "ipv4Addr": "es-aiml-model-predictor.kserve-test.svc.cluster.local",\r
-          "port": 80,\r
-          "securityMethods": null\r
+          "port": 80\r
         }\r
       ]\r
     }\r

diff --git a/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-1.json b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-1.json
index bee0486..cdcf111 100755 (executable)
--- a/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-1.json
+++ b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-1.json
@@ -24,8 +24,7 @@
       "interfaceDescriptions": [
         {
           "ipv4Addr": "hello-world-chart-service.nonrtric.svc.cluster.local",
-          "port": 8080,
-          "securityMethods": null
+          "port": 8080
         }
       ]
     }

diff --git a/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-2.json b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-2.json
index 419c7f2..34b00d3 100755 (executable)
--- a/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-2.json
+++ b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-2.json
@@ -24,8 +24,7 @@
       "interfaceDescriptions": [
         {
           "ipv4Addr": "sklearn-iris-predictor-default.kserve-test.svc.cluster.local",
-          "port": 80,
-          "securityMethods": null
+          "port": 80
         }
       ]
     }

diff --git a/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-3.json b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-3.json
index f1ceec5..dab491f 100644 (file)
--- a/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-3.json
+++ b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-3.json
@@ -24,8 +24,7 @@
       "interfaceDescriptions": [
         {
           "ipv4Addr": "hello-world-chart-service.nonrtric.svc.cluster.local",
-          "port": 8080,
-          "securityMethods": null
+          "port": 8080
         }
       ]
     }

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 0eb8acc..862d65d 100644 (file)
--- 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
@@ -24,8 +24,7 @@
       "interfaceDescriptions": [\r
         {\r
           "ipv4Addr": "hello-world-chart-service.nonrtric.svc.cluster.local",\r
-          "port": 8080,\r
-          "securityMethods": null\r
+          "port": 8080\r
         }\r
       ]\r
     }\r

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 1a652bf..0f69bc9 100644 (file)
--- 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
@@ -24,8 +24,7 @@
       "interfaceDescriptions": [\r
         {\r
           "ipv4Addr": "hello-world-chart-service.nonrtric.svc.cluster.local",\r
-          "port": 8080,\r
-          "securityMethods": null\r
+          "port": 8080\r
         }\r
       ]\r
     }\r

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 d853b31..aa685a6 100644 (file)
--- 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
@@ -24,8 +24,7 @@
       "interfaceDescriptions": [\r
         {\r
           "ipv4Addr": "sklearn-iris-predictor-default.kserve-test.svc.cluster.local",\r
-          "port": 80,\r
-          "securityMethods": null\r
+          "port": 80\r
         }\r
       ]\r
     }\r

diff --git a/sample-rapp-generator/rapp-ran-nssmf-simulator/ran-nssmf-simulator-rapp/Files/Sme/serviceapis/api-set-1.json b/sample-rapp-generator/rapp-ran-nssmf-simulator/ran-nssmf-simulator-rapp/Files/Sme/serviceapis/api-set-1.json
index 931f891..ce7807b 100644 (file)
--- a/sample-rapp-generator/rapp-ran-nssmf-simulator/ran-nssmf-simulator-rapp/Files/Sme/serviceapis/api-set-1.json
+++ b/sample-rapp-generator/rapp-ran-nssmf-simulator/ran-nssmf-simulator-rapp/Files/Sme/serviceapis/api-set-1.json
@@ -27,8 +27,7 @@
       "interfaceDescriptions": [\r
         {\r
           "ipv4Addr": "ran-nssmf-simulator-rapp.smo.svc.cluster.local",\r
-          "port": 8080,\r
-          "securityMethods": null\r
+          "port": 8080\r
         }\r
       ]\r
     }\r

diff --git a/sample-rapp-generator/rapp-slice-prb-prediction/README.md b/sample-rapp-generator/rapp-slice-prb-prediction/README.md
index af7017e..d6e05e9 100644 (file)
--- a/sample-rapp-generator/rapp-slice-prb-prediction/README.md
+++ b/sample-rapp-generator/rapp-slice-prb-prediction/README.md
@@ -382,7 +382,7 @@ The SME returns a nested JSON structure containing:
 - `aefProfiles`: Application Exposure Function profiles
 - `versions`: API version information
 - `resources`: Available resources within each version
-- `interfaceDescriptions`: Network endpoint details (IP, port securityMethods)
+- `interfaceDescriptions`: Network endpoint details (IP, port )
 
 ## RAN NSSMF Client (`src/ran_nssmf_client.py`)
 

diff --git a/sample-rapp-generator/rapp-slice-prb-prediction/slice-prb-prediction-rapp/Files/Sme/serviceapis/api-set-1.json b/sample-rapp-generator/rapp-slice-prb-prediction/slice-prb-prediction-rapp/Files/Sme/serviceapis/api-set-1.json
index d8a37f2..4f37013 100644 (file)
--- a/sample-rapp-generator/rapp-slice-prb-prediction/slice-prb-prediction-rapp/Files/Sme/serviceapis/api-set-1.json
+++ b/sample-rapp-generator/rapp-slice-prb-prediction/slice-prb-prediction-rapp/Files/Sme/serviceapis/api-set-1.json
@@ -24,8 +24,7 @@
       "interfaceDescriptions": [\r
         {\r
           "ipv4Addr": "slice-prb-prediction-rapp.smo.svc.cluster.local",\r
-          "port": 8080,\r
-          "securityMethods": null\r
+          "port": 8080\r
         }\r
       ]\r
     }\r

diff --git a/sample-rapp-generator/rapp-slice-prb-prediction/slice-prb-prediction-rapp/Files/Sme/serviceapis/api-set-2.json b/sample-rapp-generator/rapp-slice-prb-prediction/slice-prb-prediction-rapp/Files/Sme/serviceapis/api-set-2.json
index 325e1dc..bea05ee 100644 (file)
--- a/sample-rapp-generator/rapp-slice-prb-prediction/slice-prb-prediction-rapp/Files/Sme/serviceapis/api-set-2.json
+++ b/sample-rapp-generator/rapp-slice-prb-prediction/slice-prb-prediction-rapp/Files/Sme/serviceapis/api-set-2.json
@@ -24,8 +24,7 @@
       "interfaceDescriptions": [\r
         {\r
           "ipv4Addr": "slice-prb-prediction-rapp.smo.svc.cluster.local",\r
-          "port": 8080,\r
-          "securityMethods": null\r
+          "port": 8080\r
         }\r
       ]\r
     }\r