commit 13722ca955cf2dfc9fd7b11a4c11ea5dc63f1e46
author sousaedu <eduardo.sousa@canonical.com> Tue Jan 05 14:25:19 2021 +0000
committer beierlm <mark.beierl@canonical.com> Tue Jan 05 21:23:16 2021 +0100
tree cb6a684f9bb9233f24ea9128923b3b23edd03e1d
parent 426d4938f27b200f359078258f41109b399d5e06

Removing pydantic from LCM charm

Change-Id: I08e4acff8b84f4f9a36846cc0f7973d06c4abc1c
Signed-off-by: sousaedu <eduardo.sousa@canonical.com>

installers/charm/lcm/src/charm.py

diff --git a/installers/charm/lcm/src/charm.py b/installers/charm/lcm/src/charm.py
index d65bdcf..52b6964 100755
--- a/installers/charm/lcm/src/charm.py
+++ b/installers/charm/lcm/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
@@ -112,10 +111,8 @@
         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
@@ -145,9 +142,7 @@
         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
@@ -168,10 +163,8 @@
         Args:
             event (EventBase): Keystone relation event.
         """
-        data_loc = event.unit if event.unit else event.app
-
-        ro_host = event.relation.data[data_loc].get("host")
-        ro_port = event.relation.data[data_loc].get("port")
+        ro_host = event.relation.data[event.unit].get("host")
+        ro_port = event.relation.data[event.unit].get("port")
 
         if (
             ro_host
@@ -262,7 +255,7 @@
                 self.model.app.name,
                 self.port,
             )
-        except ValidationError as exc:
+        except ValueError as exc:
             logger.exception("Config/Relation data validation error")
             self.unit.status = BlockedStatus(str(exc))
             return