X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=installers%2Fcharm%2Fnbi%2Fsrc%2Fcharm.py;h=848b53d9fd803c97a1c8b1a2347ecce5b8be0b9d;hb=958cf65b0f744ddacee2c2d1173b9a9be722661b;hp=f2b2ecf77da1be3a1b28273b03a50cb930e3b2ba;hpb=ef349d9224f93fcc3eeb7a26f71c6a128ffbf96a;p=osm%2Fdevops.git

diff --git a/installers/charm/nbi/src/charm.py b/installers/charm/nbi/src/charm.py
index f2b2ecf7..848b53d9 100755
--- a/installers/charm/nbi/src/charm.py
+++ b/installers/charm/nbi/src/charm.py
@@ -129,10 +129,8 @@ class NbiCharm(CharmBase):
         Args:
             event (EventBase): Kafka relation event.
         """
-        data_loc = event.unit if event.unit else event.app
-
-        message_host = event.relation.data[data_loc].get("host")
-        message_port = event.relation.data[data_loc].get("port")
+        message_host = event.relation.data[event.unit].get("host")
+        message_port = event.relation.data[event.unit].get("port")
 
         if (
             message_host
@@ -162,9 +160,7 @@ class NbiCharm(CharmBase):
         Args:
             event (EventBase): DB relation event.
         """
-        data_loc = event.unit if event.unit else event.app
-
-        database_uri = event.relation.data[data_loc].get("connection_string")
+        database_uri = event.relation.data[event.unit].get("connection_string")
 
         if database_uri and self.state.database_uri != database_uri:
             self.state.database_uri = database_uri
@@ -185,19 +181,17 @@ class NbiCharm(CharmBase):
         Args:
             event (EventBase): Keystone relation event.
         """
-        data_loc = event.unit if event.unit else event.app
-
-        keystone_host = event.relation.data[data_loc].get("host")
-        keystone_port = event.relation.data[data_loc].get("port")
-        keystone_user_domain_name = event.relation.data[data_loc].get(
+        keystone_host = event.relation.data[event.unit].get("host")
+        keystone_port = event.relation.data[event.unit].get("port")
+        keystone_user_domain_name = event.relation.data[event.unit].get(
             "user_domain_name"
         )
-        keystone_project_domain_name = event.relation.data[data_loc].get(
+        keystone_project_domain_name = event.relation.data[event.unit].get(
             "project_domain_name"
         )
-        keystone_username = event.relation.data[data_loc].get("username")
-        keystone_password = event.relation.data[data_loc].get("password")
-        keystone_service = event.relation.data[data_loc].get("service")
+        keystone_username = event.relation.data[event.unit].get("username")
+        keystone_password = event.relation.data[event.unit].get("password")
+        keystone_service = event.relation.data[event.unit].get("service")
 
         if (
             keystone_host
@@ -248,10 +242,8 @@ class NbiCharm(CharmBase):
         Args:
             event (EventBase): Prometheus relation event.
         """
-        data_loc = event.unit if event.unit else event.app
-
-        prometheus_host = event.relation.data[data_loc].get("hostname")
-        prometheus_port = event.relation.data[data_loc].get("port")
+        prometheus_host = event.relation.data[event.unit].get("hostname")
+        prometheus_port = event.relation.data[event.unit].get("port")
 
         if (
             prometheus_host