commit 4df5a461573ae47200e893453c7c7d9cb89da30d
author sousaedu <eduardo.sousa@canonical.com> Tue Nov 17 14:30:47 2020 +0000
committer sousaedu <eduardo.sousa@canonical.com> Tue Nov 17 16:43:31 2020 +0000
tree 96b2bbed7f56e400d4a06e0ac0f443203b12923b
parent 5926de2ea578ce465b6c0253f2f6eb856e6ea463

Updating unit tests for NBI charm

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

installers/charm/nbi/src/charm.py

diff --git a/installers/charm/nbi/src/charm.py b/installers/charm/nbi/src/charm.py
index 7ef9d59..3970a33 100755
--- a/installers/charm/nbi/src/charm.py
+++ b/installers/charm/nbi/src/charm.py
@@ -32,7 +32,7 @@
 
 from pod_spec import make_pod_spec
 
-LOGGER = logging.getLogger(__name__)
+logger = logging.getLogger(__name__)
 
 NBI_PORT = 9999
 
@@ -130,8 +130,10 @@
         Args:
             event (EventBase): Kafka relation event.
         """
-        message_host = event.relation.data[event.unit].get("host")
-        message_port = event.relation.data[event.unit].get("port")
+        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")
 
         if (
             message_host
@@ -161,7 +163,9 @@
         Args:
             event (EventBase): DB relation event.
         """
-        database_uri = event.relation.data[event.unit].get("connection_string")
+        data_loc = event.unit if event.unit else event.app
+
+        database_uri = event.relation.data[data_loc].get("connection_string")
 
         if database_uri and self.state.database_uri != database_uri:
             self.state.database_uri = database_uri
@@ -182,17 +186,19 @@
         Args:
             event (EventBase): Keystone relation event.
         """
-        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(
+        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(
             "user_domain_name"
         )
-        keystone_project_domain_name = event.relation.data[event.unit].get(
+        keystone_project_domain_name = event.relation.data[data_loc].get(
             "project_domain_name"
         )
-        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")
+        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")
 
         if (
             keystone_host
@@ -243,8 +249,10 @@
         Args:
             event (EventBase): Prometheus relation event.
         """
-        prometheus_host = event.relation.data[event.unit].get("hostname")
-        prometheus_port = event.relation.data[event.unit].get("port")
+        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")
 
         if (
             prometheus_host
@@ -367,7 +375,7 @@
                 self.port,
             )
         except ValidationError as exc:
-            LOGGER.exception("Config/Relation data validation error")
+            logger.exception("Config/Relation data validation error")
             self.unit.status = BlockedStatus(str(exc))
             return
 

installers/charm/nbi/src/pod_spec.py

diff --git a/installers/charm/nbi/src/pod_spec.py b/installers/charm/nbi/src/pod_spec.py
index 105e877..68915de 100644
--- a/installers/charm/nbi/src/pod_spec.py
+++ b/installers/charm/nbi/src/pod_spec.py
@@ -28,7 +28,6 @@
     IPvAnyNetwork,
     PositiveInt,
     validator,
-    ValidationError,
 )
 from typing import Any, Dict, List, Optional
 from urllib.parse import urlparse
@@ -78,7 +77,7 @@
 
     message_host: str
     message_port: PositiveInt
-    database_uri: constr(regex=r"^(mongo://)")
+    database_uri: constr(regex=r"^(mongodb://)")
     prometheus_host: str
     prometheus_port: PositiveInt
     keystone: bool