X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fpol%2Fsrc%2Fcharm.py;h=6d15c57070e0dc68bce32023ba1b1b662ed90e42;hb=54545ffacb0552cbcc3987053518fedba6c2257f;hp=649e15bb121a3db639d47082765903cfa9069a48;hpb=aeb1e5ee2d7642f4fcd7f81d808530bde779359e;p=osm%2Fdevops.git

diff --git a/installers/charm/pol/src/charm.py b/installers/charm/pol/src/charm.py
index 649e15bb..6d15c570 100755
--- a/installers/charm/pol/src/charm.py
+++ b/installers/charm/pol/src/charm.py
@@ -21,7 +21,6 @@
 ##
 
 import logging
-from pydantic import ValidationError
 from typing import Any, Dict, NoReturn
 
 from ops.charm import CharmBase, CharmEvents
@@ -99,10 +98,8 @@ class PolCharm(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
@@ -132,9 +129,7 @@ class PolCharm(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
@@ -215,7 +210,7 @@ class PolCharm(CharmBase):
                 self.relation_state,
                 self.model.app.name,
             )
-        except ValidationError as exc:
+        except ValueError as exc:
             logger.exception("Config/Relation data validation error")
             self.unit.status = BlockedStatus(str(exc))
             return