From 5d6528f379c4e95967cbf6203ae77c9123a93533 Mon Sep 17 00:00:00 2001
From: "aravind.est" <aravindhan.a@est.tech>
Date: Tue, 6 May 2025 16:44:13 +0100
Subject: [PATCH] SMO services added to service manager pre-configuration

SMO services added for pre configuration script of service manager

Change-Id: I33530efeb5b7b3d813a9a29646c31a945a82f76d
Signed-off-by: aravind.est <aravindhan.a@est.tech>
---
 nonrtric/servicemanager-preload/config-smo.yaml    | 121 +++++++++++++++++++--
 .../servicemanager-preload.sh                      |   7 ++
 2 files changed, 120 insertions(+), 8 deletions(-)

diff --git a/nonrtric/servicemanager-preload/config-smo.yaml b/nonrtric/servicemanager-preload/config-smo.yaml
index 51f365cb..fcdf3443 100644
--- a/nonrtric/servicemanager-preload/config-smo.yaml
+++ b/nonrtric/servicemanager-preload/config-smo.yaml
@@ -1,5 +1,5 @@
 ################################################################################
-#   Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.       #
+#   Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved.       #
 #                                                                              #
 #   Licensed under the Apache License, Version 2.0 (the "License");            #
 #   you may not use this file except in compliance with the License.           #
@@ -21,7 +21,7 @@
 policy-apex-pdp:
   AefProfiles:
   - interfaceDescriptions:
-    - ipv4Addr: "policy-apex-pdp.nonrtric.svc.cluster.local"
+    - ipv4Addr: "policy-apex-pdp.onap.svc.cluster.local"
       port: 6969
       securityMethods:
       - PKI
@@ -42,7 +42,7 @@ policy-apex-pdp:
 policy-api:
   AefProfiles:
   - interfaceDescriptions:
-    - ipv4Addr: "policy-api.nonrtric.svc.cluster.local"
+    - ipv4Addr: "policy-api.onap.svc.cluster.local"
       port: 6969
       securityMethods:
       - PKI
@@ -63,11 +63,11 @@ policy-api:
 policy-pap:
   AefProfiles:
   - interfaceDescriptions:
-    - ipv4Addr: "policy-pap.nonrtric.svc.cluster.local"
+    - ipv4Addr: "policy-pap.onap.svc.cluster.local"
       port: 6969
       securityMethods:
       - PKI
-    - ipv4Addr: "policy-pap.nonrtric.svc.cluster.local"
+    - ipv4Addr: "policy-pap.onap.svc.cluster.local"
       port: 5005
       securityMethods:
       - PSK
@@ -88,11 +88,11 @@ policy-pap:
 sdnc-oam:
   AefProfiles:
   - interfaceDescriptions:
-    - ipv4Addr: "sdnc-oam.nonrtric.svc.cluster.local"
+    - ipv4Addr: "sdnc-oam.onap.svc.cluster.local"
       port: 8282
       securityMethods:
       - PKI
-    - ipv4Addr: "sdnc-oam.nonrtric.svc.cluster.local"
+    - ipv4Addr: "sdnc-oam.onap.svc.cluster.local"
       port: 8202
       securityMethods:
       - PSK
@@ -113,7 +113,7 @@ sdnc-oam:
 sdnc-web:
   AefProfiles:
   - interfaceDescriptions:
-    - ipv4Addr: "sdnc-web.nonrtric.svc.cluster.local"
+    - ipv4Addr: "sdnc-web.onap.svc.cluster.local"
       port: 8080
       securityMethods:
       - PKI
@@ -130,3 +130,108 @@ sdnc-web:
           ResourceName: root
           Uri: "/"
   ApiName: sdnc-web-http
+
+cps-core:
+  AefProfiles:
+  - interfaceDescriptions:
+    - ipv4Addr: "cps-core.onap.svc.cluster.local"
+      port: 8080
+      securityMethods:
+      - PKI
+    Versions:
+      - ApiVersion: ""
+        Resources:
+        - CommType: REQUEST_RESPONSE
+          Operations:
+          - DELETE
+          - GET
+          - PATCH
+          - POST
+          - PUT
+          ResourceName: root
+          Uri: "/"
+  ApiName: cps-core-http
+
+ncmp-dmi-plugin:
+  AefProfiles:
+  - interfaceDescriptions:
+    - ipv4Addr: "ncmp-dmi-plugin.onap.svc.cluster.local"
+      port: 8080
+      securityMethods:
+      - PKI
+    Versions:
+      - ApiVersion: ""
+        Resources:
+        - CommType: REQUEST_RESPONSE
+          Operations:
+          - DELETE
+          - GET
+          - PATCH
+          - POST
+          - PUT
+          ResourceName: root
+          Uri: "/"
+  ApiName: ncmp-dmi-plugin-http
+
+dcae-ves-collector:
+  AefProfiles:
+  - interfaceDescriptions:
+    - ipv4Addr: "dcae-ves-collector.onap.svc.cluster.local"
+      port: 8080
+      securityMethods:
+      - PKI
+    Versions:
+      - ApiVersion: ""
+        Resources:
+        - CommType: REQUEST_RESPONSE
+          Operations:
+          - DELETE
+          - GET
+          - PATCH
+          - POST
+          - PUT
+          ResourceName: root
+          Uri: "/"
+  ApiName: dcae-ves-collector-http
+
+topology-exposure:
+  AefProfiles:
+  - interfaceDescriptions:
+    - ipv4Addr: "topology-exposure.smo.svc.cluster.local"
+      port: 8080
+      securityMethods:
+      - PKI
+    Versions:
+      - ApiVersion: ""
+        Resources:
+        - CommType: REQUEST_RESPONSE
+          Operations:
+          - DELETE
+          - GET
+          - PATCH
+          - POST
+          - PUT
+          ResourceName: root
+          Uri: "/"
+  ApiName: topology-exposure-http
+
+influxdb2:
+  AefProfiles:
+  - interfaceDescriptions:
+    - ipv4Addr: "influxdb2.smo.svc.cluster.local"
+      port: 8086
+      securityMethods:
+      - PKI
+    Versions:
+      - ApiVersion: ""
+        Resources:
+        - CommType: REQUEST_RESPONSE
+          Operations:
+          - DELETE
+          - GET
+          - PATCH
+          - POST
+          - PUT
+          ResourceName: root
+          Uri: "/"
+  ApiName: influxdb2-http
diff --git a/nonrtric/servicemanager-preload/servicemanager-preload.sh b/nonrtric/servicemanager-preload/servicemanager-preload.sh
index fcf4a82c..5f7347ff 100755
--- a/nonrtric/servicemanager-preload/servicemanager-preload.sh
+++ b/nonrtric/servicemanager-preload/servicemanager-preload.sh
@@ -314,6 +314,13 @@ function find_running_services_from_config() {
                 result+="$service "
             else
                 >&2 echo "Service $service is not found in onap"
+                SERVICE_STATUS=$(kubectl get service "$service" -n smo)
+                if [ $? = 0 ]; then
+                    >&2 echo "Service $service is found in smo"
+                    result+="$service "
+                else
+                    >&2 echo "Service $service is not found in smo"
+                fi
             fi
         fi
     done
-- 
2.16.6