From 53fd619323dc8db8fc8a43cf2a55ed1a52f3c74c Mon Sep 17 00:00:00 2001
From: "saul.gill" <saul.gill@est.tech>
Date: Wed, 20 Aug 2025 13:44:03 +0100
Subject: [PATCH] Updated ES Rapp version

Updated app and chart to 0.2.16
Added ncmp-sdnc query functionality
Added teiv query functionality
Updated README with smo install flafour info
Altered NRCellDU name parsing
Added retrieval of influx token from environment

Issue-ID: NONRTRIC-1083
Change-Id: I714ca70b6a11a497876ca45e4ff364930fb3dc1a
Signed-off-by: saul.gill <saul.gill@est.tech>
---
 sample-rapp-generator/es-demo-rapp/README.md       |  24 +++++
 .../Deployment/HELM/energy-saving-chart/Chart.yaml |   4 +-
 .../resources/config/config.json                   |   2 +
 .../energy-saving-chart/templates/deployment.yaml  |   5 +
 .../HELM/energy-saving-chart/values.yaml           |  12 ++-
 .../Deployment/HELM/energy-saving-rapp-0.2.16.tgz  | Bin 0 -> 5228 bytes
 .../Deployment/HELM/energy-saving-rapp-0.2.5.tgz   | Bin 5057 -> 0 bytes
 .../rapp-energy-saving/Definitions/asd.yaml        |   2 +-
 .../Files/Acm/instances/es-instance.json           |   4 +-
 sample-rapp-generator/es-demo-rapp/src/config.json |   6 +-
 sample-rapp-generator/es-demo-rapp/src/data.py     |  14 ++-
 sample-rapp-generator/es-demo-rapp/src/main.py     |  59 ++++++------
 .../es-demo-rapp/src/ncmp_client.py                | 102 ++++++++++++---------
 .../es-demo-rapp/src/teiv_client.py                |  20 ++--
 14 files changed, 158 insertions(+), 96 deletions(-)
 create mode 100644 sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-rapp-0.2.16.tgz
 delete mode 100644 sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-rapp-0.2.5.tgz

diff --git a/sample-rapp-generator/es-demo-rapp/README.md b/sample-rapp-generator/es-demo-rapp/README.md
index 8b89ab5..0dee90d 100644
--- a/sample-rapp-generator/es-demo-rapp/README.md
+++ b/sample-rapp-generator/es-demo-rapp/README.md
@@ -21,6 +21,30 @@ The instructions below describe how to:
 For a complete guide on the installation of the SMO rApp platform,
 please follow the instructions [here](https://gerrit.o-ran-sc.org/r/gitweb?p=it/dep.git;a=blob_plain;f=smo-install/README.md;hb=HEAD).
 
+As an additional note, a special flavour of the SMO installation is available for the Energy Saving rApp demo.
+This flavour is located in the `smo-install/helm-override/ranpm-pynts-es-rapp` directory. 
+There is some detail on flavours [here](https://github.com/o-ran-sc/it-dep/blob/master/smo-install/README.md).
+This flavour is designed to install the SMO components required for the Energy Saving rapp demo.
+After all the other steps in the SMO installation guide are completed, you can run the following command to 
+install the Energy Saving rApp flavour:
+
+```bash
+./dep/smo-install/scripts/layer-2/2-install-oran.sh ranpm-pynts-es-rapp dev
+```
+
+Once all the components are installed and ready, you can proceed with the install of the DU simulators.
+These will start a flow of sample data through the system, which will be used by the Energy Saving rApp demo.
+wait around 10 minutes after all the components are installed before proceeding with the next simulator install.
+
+```bash
+./dep/smo-install/scripts/layer-2/2-install-simulators.sh ranpm-pynts-es-rapp
+```
+
+```text
+NOTE: The installation is just pointed at with the above commands. For the full installation and details of flavours, go to the smo installation docs.
+```
+[SMO Install Guide](https://github.com/o-ran-sc/it-dep/blob/master/smo-install/README.md)
+
 ### Energy Saving rApp Deployment Preparation
 1. The rApp needs to know the address and port of your chart repository. We can do this by running the following command:
    ```bash
diff --git a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/Chart.yaml b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/Chart.yaml
index 2fd7fe3..c3680e8 100644
--- a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/Chart.yaml
+++ b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/Chart.yaml
@@ -32,10 +32,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.5
+version: 0.2.16
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.2.5"
+appVersion: "0.2.16"
diff --git a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/resources/config/config.json b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/resources/config/config.json
index e473291..6a25026 100644
--- a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/resources/config/config.json
+++ b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/resources/config/config.json
@@ -7,6 +7,8 @@
     "ncmp_api_name": "{{ .Values.ncmp.apiName }}",
     "ncmp_resource_name": "{{ .Values.ncmp.resourceName }}",
     "resource_id": "{{ .Values.ncmp.resourceId}}",
+    "ncmp_managed_element_id": "{{ .Values.ncmp.managedElementId }}",
+    "ncmp_gnbdufunction_id": "{{ .Values.ncmp.gnbduFunctionId }}",
     "influxdb_invoker_id": "{{ .Values.environment.appId }}",
     "influxdb_api_name": "{{ .Values.influxdb.apiName }}",
     "influxdb_resource_name": "{{ .Values.influxdb.resourceName }}",
diff --git a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/templates/deployment.yaml b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/templates/deployment.yaml
index 1ce26ac..d624ea6 100644
--- a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/templates/deployment.yaml
+++ b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/templates/deployment.yaml
@@ -63,6 +63,11 @@ spec:
               value: {{ .Values.environment.appId | quote }}
             - name: SME_DISCOVERY_ENDPOINT
               value: {{ .Values.environment.smeDiscoveryEndpoint | quote }}
+            - name: INFLUX_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  key: token
+                  name: {{ .Values.influxdb.tokenSecretName | quote }}
           volumeMounts:
             - mountPath: /app/config.json
               name: config
diff --git a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/values.yaml b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/values.yaml
index 890579a..885b4dd 100644
--- a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/values.yaml
+++ b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-chart/values.yaml
@@ -25,7 +25,7 @@ image:
   repository: "nexus3.onap.org:10001/estdemoimages/es-rapp"
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "0.2.5"
+  tag: "0.2.16"
 
 imagePullSecrets: []
 nameOverride: "energy-saving-rapp"
@@ -103,13 +103,15 @@ environment:
 
 influxdb:
   token: "hIVMgY7vn3M772PSk3yrI2IjeWzybPw0"
+  # This token secret is part of the smo install. The rapp will expect that this secret is created in the same namespace as the rapp.
+  tokenSecretName: influxdb-api-token
   user: "admin"
   password: "mySuP3rS3cr3tT0keN"
   bucket: "pm-logg-bucket"
   org: "est"
   apiName: "influxdb2-http"
   resourceName: "root"
-  timeRange: "-6h"
+  timeRange: "-5m"
   measurements:
     - "ManagedElement=o-du-pynts-1122,ManagedElement=o-du-pynts-1122,GNBDUFunction=1,NRCellDU=1"
     - "ManagedElement=o-du-pynts-1123,ManagedElement=o-du-pynts-1123,GNBDUFunction=1,NRCellDU=1"
@@ -117,9 +119,11 @@ influxdb:
 
 
 ncmp:
-  apiName: "ncmp-dmi-plugin-http"
+  apiName: "cps-core-http"
   resourceName: "root"
   resourceId: "/_3gpp-common-managed-element:ManagedElement=ManagedElement-002/_3gpp-nr-nrm-gnbdufunction:GNBDUFunction=GNBDUFunction-001/_3gpp-nr-nrm-nrcelldu:NRCellDU=NRCellDU-001/attributes"
+  managedElementId: "ManagedElement-002"
+  gnbduFunctionId: "GNBDUFunction-001"
 
 kserve:
   apiName: "es-predictor-http"
@@ -128,7 +132,7 @@ kserve:
 teiv:
   apiName: "topology-exposure-http"
   resourceName: "root"
-  oduFunctionId: "GNBDUFunction-001"
+  oduFunctionId: "urn:oran:smo:teiv:GNBDUFunction-001"
 
 appStartup:
   command: ["/bin/sh", "-c"]
diff --git a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-rapp-0.2.16.tgz b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-rapp-0.2.16.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..1f8013948ea4378a37d98f9543599431b1fd888d
GIT binary patch
literal 5228
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

literal 0
HcmV?d00001

diff --git a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-rapp-0.2.5.tgz b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Artifacts/Deployment/HELM/energy-saving-rapp-0.2.5.tgz
deleted file mode 100644
index c4b3413df9cbeb3c4197012ae3179be564c6fe0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5057
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
XwrtC`l*|7I00960vSv#v0Db@f!|MhQ

diff --git a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Definitions/asd.yaml b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Definitions/asd.yaml
index 31ac972..3228768 100755
--- a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Definitions/asd.yaml
+++ b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Definitions/asd.yaml
@@ -22,7 +22,7 @@ topology_template:
       artifacts:
         energy-saving:
           type: tosca.artifacts.asd.deploymentItem
-          file: "Artifacts/Deployment/HELM/energy-saving-rapp-0.2.5.tgz"
+          file: "Artifacts/Deployment/HELM/energy-saving-rapp-0.2.16.tgz"
           properties:
             artifact_type: "helm_chart"
             target_server: "chartmuseum"
diff --git a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Acm/instances/es-instance.json b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Acm/instances/es-instance.json
index 9184b9f..7651179 100644
--- a/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Acm/instances/es-instance.json
+++ b/sample-rapp-generator/es-demo-rapp/rapp-energy-saving/Files/Acm/instances/es-instance.json
@@ -15,9 +15,9 @@
         "chart": {
           "chartId": {
             "name": "energy-saving-rapp",
-            "version": "0.2.5"
+            "version": "0.2.16"
           },
-          "namespace": "nonrtric",
+          "namespace": "smo",
           "releaseName": "energy-saving-rapp",
           "podName": "energy-saving-rapp",
           "repository": {
diff --git a/sample-rapp-generator/es-demo-rapp/src/config.json b/sample-rapp-generator/es-demo-rapp/src/config.json
index 33d2c4a..3189957 100644
--- a/sample-rapp-generator/es-demo-rapp/src/config.json
+++ b/sample-rapp-generator/es-demo-rapp/src/config.json
@@ -4,9 +4,11 @@
     "host": "localhost",
     "port": 31575,
     "ncmp_invoker_id": "6a965002-ed7c-4f69-855c-ab9196f86e61",
-    "ncmp_api_name": "ncmp-dmi-plugin-http",
+    "ncmp_api_name": "cps-core-http",
     "ncmp_resource_name": "root",
     "resource_id": "/_3gpp-common-managed-element:ManagedElement=ManagedElement-002/_3gpp-nr-nrm-gnbdufunction:GNBDUFunction=GNBDUFunction-001/_3gpp-nr-nrm-nrcelldu:NRCellDU=NRCellDU-001/attributes",
+    "ncmp_managed_element_id": "ManagedElement-002",
+    "ncmp_gnbdufunction_id": "GNBDUFunction-001",
     "influxdb_invoker_id": "6a965002-ed7c-4f69-855c-ab9196f86e61",
     "influxdb_api_name": "influxdb2-http",
     "influxdb_resource_name": "root",
@@ -16,7 +18,7 @@
     "teiv_invoker_id": "6a965002-ed7c-4f69-855c-ab9196f86e61",
     "teiv_api_name": "topology-exposure-http",
     "teiv_resource_name": "root",
-    "odufunction_id": "GNBDUFunction-001"
+    "odufunction_id": "urn:oran:smo:teiv:GNBDUFunction-001"
   },
   "DB": {
     "host": "10.101.3.89",
diff --git a/sample-rapp-generator/es-demo-rapp/src/data.py b/sample-rapp-generator/es-demo-rapp/src/data.py
index 0b70154..4a11f91 100644
--- a/sample-rapp-generator/es-demo-rapp/src/data.py
+++ b/sample-rapp-generator/es-demo-rapp/src/data.py
@@ -14,7 +14,7 @@
 #  limitations under the License.
 #  ============LICENSE_END=================================================
 #
-
+import os
 import time
 import logging
 from influxdb.exceptions import InfluxDBClientError, InfluxDBServerError
@@ -145,7 +145,7 @@ class DATABASE(object):
                 time.sleep(60)
 
     def mapping(self, data):
-        data[['S', 'B', 'C']] = data['CellID'].str.extract(r'S(\d+)/[BN](\d+)/C(\d+)')
+        data[['S', 'B', 'C']] = data['CellID'].str.extract(r'S(\d+)-[BN](\d+)-C(\d+)')
         data[['S', 'B', 'C']] = data[['S', 'B', 'C']].astype(int)
         data = data.sort_values(by=['B', 'S', 'C'])
         data['cellidnumber'] = data.groupby(['B', 'S', 'C']).ngroup().add(1)
@@ -165,7 +165,7 @@ class DATABASE(object):
 
             for field in fields:
                 value = (
-                    f"S{random.randint(1,9)}/B{random.randint(1,9)}/C{random.randint(1,9)}" if field == "CellID"
+                    f"S{random.randint(1,9)}-B{random.randint(1,9)}-C{random.randint(1,9)}" if field == "CellID"
                     else (900 if field == "GranularityPeriod"
                     else str(round(random.uniform(1, 100), 5)))
                 )
@@ -208,7 +208,13 @@ class DATABASE(object):
 
         # Initialize the InfluxDB client
         influx_config = config.get("DB", {})
-        self.token = influx_config.get("token")
+
+        if os.getenv('INFLUX_TOKEN'):
+            self.token = os.getenv('INFLUX_TOKEN')
+        else:
+            logger.info("INFLUX_TOKEN environment variable is not set.")
+            self.token = influx_config.get("token")
+
         self.org = influx_config.get("org")
         self.bucket = influx_config.get("bucket")
         self.address = influx_config.get("address")
diff --git a/sample-rapp-generator/es-demo-rapp/src/main.py b/sample-rapp-generator/es-demo-rapp/src/main.py
index 89dd281..0c4a5d4 100644
--- a/sample-rapp-generator/es-demo-rapp/src/main.py
+++ b/sample-rapp-generator/es-demo-rapp/src/main.py
@@ -131,40 +131,44 @@ class ESrapp():
             status_code, response_text = self.assist.send_request_to_server(json_data, randomize=self.random_predictions)
             if not self.check_and_perform_action(response_text):
                 cell_id_name = group_data['CellID'].iloc[0]
+                # Check if the cell is in TEIV
+                self.check_cell_in_teiv(cell_id_name)
                 du_name = self.extract_managed_element(group_data['_measurement'].iloc[0])
-                full_cell_id = cell_id_name + "-" + du_name
+                cell_with_node = cell_id_name + "_" + du_name
                 logger.info(f"Turn on the cell {group_name}")
                 # Wait for 3 seconds before performing the action
                 time.sleep(3)
 
-                if full_cell_id not in self.cell_power_status:
-                    logger.debug(f"Cell {full_cell_id} not in local cache. Adding it...")
-                    self.cell_power_status[full_cell_id] = "off"
+                if cell_with_node not in self.cell_power_status:
+                    logger.debug(f"Cell {cell_with_node} not in local cache. Adding it...")
+                    self.cell_power_status[cell_with_node] = "off"
                 # Check if the cell is already powered on
-                if self.cell_power_status[full_cell_id] == "on":
-                    logger.debug(f"Cell {full_cell_id} is already powered on.")
+                if self.cell_power_status[cell_with_node] == "on":
+                    logger.debug(f"Cell {cell_with_node} is already powered on.")
                     # continue
                 else:
-                    self.ncmp_client.power_on_cell(full_cell_id)
-                    self.cell_power_status[full_cell_id] = "on"
+                    self.ncmp_client.power_on_cell(cell_with_node)
+                    self.cell_power_status[cell_with_node] = "on"
             else:
                 du_name = self.extract_managed_element(group_data['_measurement'].iloc[0])
                 cell_id_name = group_data['CellID'].iloc[0]
-                full_cell_id = cell_id_name + "-" + du_name
+                # Check if the cell is in TEIV
+                self.check_cell_in_teiv(cell_id_name)
+                cell_with_node = cell_id_name + "_" + du_name
                 logger.info(f"Turn off the cell {group_name}")
                 # Wait for 3 seconds before performing the action
                 time.sleep(3)
 
-                if full_cell_id not in self.cell_power_status:
-                    logger.debug(f"Cell {full_cell_id} not in local cache. Adding it...")
-                    self.cell_power_status[full_cell_id] = "on"
+                if cell_with_node not in self.cell_power_status:
+                    logger.debug(f"Cell {cell_with_node} not in local cache. Adding it...")
+                    self.cell_power_status[cell_with_node] = "on"
 
-                if self.cell_power_status[full_cell_id] == "off":
-                    logger.debug(f"Cell {full_cell_id} is already powered off.")
+                if self.cell_power_status[cell_with_node] == "off":
+                    logger.debug(f"Cell {cell_with_node} is already powered off.")
                     # continue
                 else:
-                    self.ncmp_client.power_off_cell(full_cell_id)
-                    self.cell_power_status[full_cell_id] = "off"
+                    if self.ncmp_client.power_off_cell(cell_with_node):
+                        self.cell_power_status[cell_with_node] = "off"
 
     def extract_managed_element(self, measurement):
         if '=' not in measurement or ',' not in measurement:
@@ -201,7 +205,7 @@ class ESrapp():
     def mapping(self, data):
         data = pd.DataFrame(data)
         # TODO: This regex is not likely to match all cell IDs. Will need to be improved.
-        data[['S', 'B', 'C']] = data['CellID'].str.extract(r'S(\d+)/[BN](\d+)/C(\d+)')
+        data[['S', 'B', 'C']] = data['CellID'].str.extract(r'S(\d+)-[BN](\d+)-C(\d+)')
         data[['S', 'B', 'C']] = data[['S', 'B', 'C']].astype(int)
         data = data.sort_values(by=['B', 'S', 'C'])
         data['cellidnumber'] = data.groupby(['B', 'S', 'C']).ngroup().add(1)
@@ -220,20 +224,15 @@ class ESrapp():
                     return False
         return False
 
+    # Check if the cell is in TEIV cell inventory
+    def check_cell_in_teiv(self, cell_id):
+        # Check if the cell ID is in the TEIV cell inventory
+        self.teiv_cells = self.teiv_client.get_nrcelldus()
 
-
-    # def get_teiv_cells(self):
-    #     # Get the TEIV cells from the teiv
-    #     odufunction_id = self.teiv_client.odufunction_id
-    #     logger.info("ODU function ID: " + str(odufunction_id))
-    #     # Get the NRCellDUs from the TEIV
-    #     nrcelldus = self.teiv_client.get_nrcelldus(odufunction_id)
-    #     if nrcelldus is None:
-    #         logger.error("Failed to retrieve NRCellDUs.")
-    #         return None
-    #     # Extract the cell IDs from the NRCellDUs
-    #     self.teiv_cells = self.teiv_client.search_entity_data_for_ids(nrcelldus)
-    #     logger.info("NRCellDUs: " + str(self.nrcelldus))
+        if cell_id in self.teiv_cells:
+            logger.info(f"Cell {cell_id} is in the TEIV cell inventory.")
+        else:
+            logger.info(f"Cell {cell_id} is not in the TEIV cell inventory.")
 
 
 if __name__ == "__main__":
diff --git a/sample-rapp-generator/es-demo-rapp/src/ncmp_client.py b/sample-rapp-generator/es-demo-rapp/src/ncmp_client.py
index 0093f88..fa97813 100644
--- a/sample-rapp-generator/es-demo-rapp/src/ncmp_client.py
+++ b/sample-rapp-generator/es-demo-rapp/src/ncmp_client.py
@@ -17,6 +17,7 @@
 
 import json
 import logging
+import requests
 from sme_client import SMEClient
 
 logger = logging.getLogger(__name__)
@@ -32,6 +33,8 @@ class NCMP_CLIENT(object):
         self.ncmp_invoker_id = sme_config.get("ncmp_invoker_id")
         self.ncmp_api_name = sme_config.get("ncmp_api_name")
         self.ncmp_resource_name = sme_config.get("ncmp_resource_name")
+        self.ncmp_me = sme_config.get("ncmp_managed_element_id", "ManagedElement-002")
+        self.ncmp_gnb = sme_config.get("ncmp_gnbdufunction_id", "GNBDUFunction-001")
         self.resourse_identifier = sme_config.get("resource_id")
         self.ncmp_uri = None
 
@@ -45,61 +48,74 @@ class NCMP_CLIENT(object):
 
         print("Discovered NCMP URI: ", self.ncmp_uri)
 
-    def power_off_cell(self, endpoint):
+    def power_off_cell(self, cell_with_node):
 
+        passthrough_request = self.make_passthrough_request(cell_with_node)
         # This log is all it does in testing
-        logger.info("Powering-off cell " + str(endpoint) + " successful")
+        logger.info("Powering-off cell " + str(cell_with_node) + " in progress...")
 
         # It expects the SME ncmp endpoint to call power off
         # endpoint_with_query = f"{endpoint}?resourceIdentifier={self.resourse_identifier}"
         #
-        # headers = {
-        #     "Content-Type": "application/json"
-        # }
-        #
-        # body = {
-        #     "attributes": {
-        #         "administrativeState": "LOCKED"
-        #     }
-        # }
-        #
-        # response = requests.patch(endpoint_with_query, data=body, headers=headers)
-        #
-        # if response.status_code == 200:
-        #     logger.info("Power-off successful. " + response.text)
-        #     return response.json()
-        # else:
-        #     logger.error(f"Error in connection to NCMP for power off: {response.status_code}")
-        #     logger.error(response.text)
-        #     return None
+        headers = {
+            "Content-Type": "application/json"
+        }
+
+        body = {
+            "attributes": {
+                "administrativeState": "LOCKED"
+            }
+        }
+
+        response = requests.patch(passthrough_request, json=body, headers=headers)
 
-    def power_on_cell(self, endpoint):
+        if response.status_code == 200:
+            logger.info("Power-off successful. " + response.text)
+            return True
+        else:
+            logger.error(f"Error in connection to NCMP for power off: {response.status_code}")
+            logger.error(response.text)
+            return False
+
+    def power_on_cell(self, cell_with_node):
 
         # This log is all it does in testing
-        logger.info("Powering-on cell " + str(endpoint) + " successful")
+        passthrough_request = self.make_passthrough_request(cell_with_node)
+        logger.info("Powering-on cell " + str(cell_with_node) + " in progress...")
 
         # It expects the SME ncmp endpoint to call power on
         # endpoint_with_query = f"{endpoint}?resourceIdentifier={self.resourse_identifier}"
-        #
-        # headers = {
-        #     "Content-Type": "application/json"
-        # }
-        #
-        # body = {
-        #     "attributes": {
-        #         "administrativeState": "UNLOCKED"
-        #     }
-        # }
-        #
-        # response = requests.patch(endpoint_with_query, data=body, headers=headers)
-        #
-        # if response.status_code == 200:
-        #     logger.info("Power-on successful. " + response.text)
-        #     return response.json()
-        # else:
-        #     logger.error(f"Error in connection to NCMP for power on: {response.status_code}")
-        #     logger.error(response.text)
-        #     return None
+
+        headers = {
+            "Content-Type": "application/json"
+        }
+
+        body = {
+            "attributes": {
+                "administrativeState": "UNLOCKED"
+            }
+        }
+
+        response = requests.patch(passthrough_request, json=body, headers=headers)
+
+        if response.status_code == 200:
+            logger.info("Power-on successful. " + response.text)
+            return True
+        else:
+            logger.error(f"Error in connection to NCMP for power on: {response.status_code}")
+            logger.error(response.text)
+            return False
+
+    def make_passthrough_request(self, cell_with_node):
+        node_id = cell_with_node.split('_')[1]
+        cell_id = cell_with_node.split('_')[0]
+
+        endpoint = f"ncmp/v1/ch/{node_id}/data/ds/ncmp-datastore%3Apassthrough-running"
+        query_param = (f"?resourceIdentifier=/_3gpp-common-managed-element:ManagedElement={self.ncmp_me}"
+                       f"/_3gpp-nr-nrm-gnbdufunction:GNBDUFunction={self.ncmp_gnb}"
+                       f"/_3gpp-nr-nrm-nrcelldu:NRCellDU={cell_id}/attributes")
+
+        return f"{self.ncmp_uri}{endpoint}{query_param}"
 
 # if __name__ == "__main__":
 #     logging.basicConfig(level=logging.INFO)  # Set up logging for better visibility
diff --git a/sample-rapp-generator/es-demo-rapp/src/teiv_client.py b/sample-rapp-generator/es-demo-rapp/src/teiv_client.py
index 3b4456b..a54f56a 100644
--- a/sample-rapp-generator/es-demo-rapp/src/teiv_client.py
+++ b/sample-rapp-generator/es-demo-rapp/src/teiv_client.py
@@ -43,12 +43,12 @@ class TEIV_CLIENT(object):
             resource_name=self.teiv_resource_name
         )
 
-        self.teiv_uri = sme_client.discover_service()
+        self.teiv_uri = sme_client.discover_service() + "topology-inventory/v1alpha11/"
 
         print("Discovered TEIV URI: ", self.teiv_uri)
 
-    def get_nrcelldus(self, odufunction_id):
-
+    def get_nrcelldus(self):
+        odufunction_id = self.odufunction_id
         scope_filter = f"/provided-by-oduFunction[@id=\"{odufunction_id}\"]"
         encoded_scope_filter = urllib.parse.quote(scope_filter)
         endpoint = (
@@ -59,8 +59,9 @@ class TEIV_CLIENT(object):
         response = requests.get(endpoint)
         
         if response.status_code == 200:
-            logger.info("Retrieved NRCellDUs. " + response.text)
-            return response.json()
+            nrcelldu_ids = self.search_entity_data_for_ids(response.json())
+            logger.info(f"Retrieved NRCellDU IDs form TEIV: {nrcelldu_ids}")
+            return nrcelldu_ids
         else:
             logger.error(f"Error in connection to TEIV: {response.status_code}")
             logger.error(response.text)
@@ -71,7 +72,11 @@ class TEIV_CLIENT(object):
         ids = []
         for item in items:
             for key in item:
-                ids.extend(entity.get('id') for entity in item[key] if 'id' in entity)
+                ids.extend(
+                    entity.get('id').split(':')[-1]
+                    for entity in item[key]
+                    if 'id' in entity
+                )
         return ids
 
 # if __name__ == "__main__":
@@ -80,5 +85,4 @@ class TEIV_CLIENT(object):
 #     # Instantiate the TEIVClient
 #     teiv_client = TEIV_CLIENT()
 #
-#     nrcelldu_json = teiv_client.get_nrcelldus(teiv_client.odufunction_id)
-#     nrcelldu_ids = teiv_client.search_entity_data_for_ids(nrcelldu_json)
\ No newline at end of file
+#     nrcelldu_json = teiv_client.get_nrcelldus()
-- 
2.16.6