X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fnbi%2Ftests%2Ftest_pod_spec.py;h=7cf586ce1d9b51a245396f353c82f3311b9bf12b;hb=4df5a461573ae47200e893453c7c7d9cb89da30d;hp=7be45915cbdb632503f966783e00333768bc1725;hpb=5926de2ea578ce465b6c0253f2f6eb856e6ea463;p=osm%2Fdevops.git

diff --git a/installers/charm/nbi/tests/test_pod_spec.py b/installers/charm/nbi/tests/test_pod_spec.py
index 7be45915..7cf586ce 100644
--- a/installers/charm/nbi/tests/test_pod_spec.py
+++ b/installers/charm/nbi/tests/test_pod_spec.py
@@ -57,7 +57,7 @@ class TestPodSpec(unittest.TestCase):
         relation_state = {
             "message_host": "kafka",
             "message_port": 9090,
-            "database_uri": "mongo://mongo",
+            "database_uri": "mongodb://mongo",
             "prometheus_host": "prometheus",
             "prometheus_port": 9082,
         }
@@ -97,7 +97,7 @@ class TestPodSpec(unittest.TestCase):
         relation_state = {
             "message_host": "kafka",
             "message_port": 9090,
-            "database_uri": "mongo://mongo",
+            "database_uri": "mongodb://mongo",
             "prometheus_host": "prometheus",
             "prometheus_port": 9082,
             "keystone_host": "keystone",
@@ -159,7 +159,7 @@ class TestPodSpec(unittest.TestCase):
         relation_state = {
             "message_host": "kafka",
             "message_port": 9090,
-            "database_uri": "mongo://mongo",
+            "database_uri": "mongodb://mongo",
             "prometheus_host": "prometheus",
             "prometheus_port": 9082,
             "keystone_host": "keystone",
@@ -205,6 +205,7 @@ class TestPodSpec(unittest.TestCase):
                 "name": f"{app_name}-ingress",
                 "annotations": {
                     "nginx.ingress.kubernetes.io/proxy-body-size": f"{config['max_file_size']}",
+                    "nginx.ingress.kubernetes.io/backend-protocol": "HTTPS",
                     "nginx.ingress.kubernetes.io/ssl-redirect": "false",
                 },
                 "spec": {
@@ -249,6 +250,7 @@ class TestPodSpec(unittest.TestCase):
                 "name": f"{app_name}-ingress",
                 "annotations": {
                     "nginx.ingress.kubernetes.io/proxy-body-size": f"{config['max_file_size']}",
+                    "nginx.ingress.kubernetes.io/backend-protocol": "HTTPS",
                     "nginx.ingress.kubernetes.io/ssl-redirect": "false",
                     "nginx.ingress.kubernetes.io/whitelist-source-range": config[
                         "ingress_whitelist_source_range"
@@ -297,6 +299,7 @@ class TestPodSpec(unittest.TestCase):
                 "name": f"{app_name}-ingress",
                 "annotations": {
                     "nginx.ingress.kubernetes.io/proxy-body-size": f"{config['max_file_size']}",
+                    "nginx.ingress.kubernetes.io/backend-protocol": "HTTPS",
                 },
                 "spec": {
                     "rules": [
@@ -342,6 +345,7 @@ class TestPodSpec(unittest.TestCase):
                 "name": f"{app_name}-ingress",
                 "annotations": {
                     "nginx.ingress.kubernetes.io/proxy-body-size": f"{config['max_file_size']}",
+                    "nginx.ingress.kubernetes.io/backend-protocol": "HTTPS",
                 },
                 "spec": {
                     "rules": [
@@ -432,7 +436,7 @@ class TestPodSpec(unittest.TestCase):
         relation_state = {
             "message_host": "kafka",
             "message_port": 9090,
-            "database_uri": "mongo://mongo",
+            "database_uri": "mongodb://mongo",
             "prometheus_host": "prometheus",
             "prometheus_port": 9082,
         }
@@ -452,17 +456,15 @@ class TestPodSpec(unittest.TestCase):
         relation_state = {
             "message_host": "kafka",
             "message_port": 9090,
-            "database_uri": "mongo://mongo",
+            "database_uri": "mongodb://mongo",
             "prometheus_host": "prometheus",
             "prometheus_port": 9082,
         }
         app_name = "nbi"
         port = 9999
 
-        with self.assertRaises(ValidationError) as exc:
-            pod_spec.make_pod_spec(
-                image_info, config, relation_state, app_name, port
-            )
+        with self.assertRaises(ValidationError):
+            pod_spec.make_pod_spec(image_info, config, relation_state, app_name, port)
 
     def test_make_pod_spec_without_relation_state(self) -> NoReturn:
         """Testing make pod spec without relation_state."""
@@ -478,10 +480,8 @@ class TestPodSpec(unittest.TestCase):
         app_name = "nbi"
         port = 9999
 
-        with self.assertRaises(ValidationError) as exc:
-            pod_spec.make_pod_spec(
-                image_info, config, relation_state, app_name, port
-            )
+        with self.assertRaises(ValidationError):
+            pod_spec.make_pod_spec(image_info, config, relation_state, app_name, port)
 
     def test_make_pod_spec(self) -> NoReturn:
         """Testing make pod spec."""
@@ -496,7 +496,7 @@ class TestPodSpec(unittest.TestCase):
         relation_state = {
             "message_host": "kafka",
             "message_port": 9090,
-            "database_uri": "mongo://mongo",
+            "database_uri": "mongodb://mongo",
             "prometheus_host": "prometheus",
             "prometheus_port": 9082,
         }
@@ -562,7 +562,7 @@ class TestPodSpec(unittest.TestCase):
         relation_state = {
             "message_host": "kafka",
             "message_port": 9090,
-            "database_uri": "mongo://mongo",
+            "database_uri": "mongodb://mongo",
             "prometheus_host": "prometheus",
             "prometheus_port": 9082,
             "keystone_host": "keystone",