Removing pydantic from LCM charm
Change-Id: I08e4acff8b84f4f9a36846cc0f7973d06c4abc1c
Signed-off-by: sousaedu <eduardo.sousa@canonical.com>
diff --git a/installers/charm/lcm/tests/test_charm.py b/installers/charm/lcm/tests/test_charm.py
index a7133e3..25e2cd6 100644
--- a/installers/charm/lcm/tests/test_charm.py
+++ b/installers/charm/lcm/tests/test_charm.py
@@ -134,7 +134,7 @@
ro_relation_id = self.harness.add_relation("ro", "ro")
self.harness.add_relation_unit(ro_relation_id, "ro/0")
self.harness.update_relation_data(
- ro_relation_id, "ro", {"host": "ro", "port": 9090}
+ ro_relation_id, "ro/0", {"host": "ro", "port": 9090}
)
# Checking if kafka data is stored
@@ -155,35 +155,6 @@
self.assertDictEqual(expected_result, pod_spec)
- def test_on_kafka_relation_app_changed(self) -> NoReturn:
- """Test to see if kafka relation is updated."""
- self.harness.charm.on.start.emit()
-
- self.assertIsNone(self.harness.charm.state.message_host)
- self.assertIsNone(self.harness.charm.state.message_port)
-
- relation_id = self.harness.add_relation("kafka", "kafka")
- self.harness.add_relation_unit(relation_id, "kafka/0")
- self.harness.update_relation_data(
- relation_id, "kafka", {"host": "kafka", "port": 9092}
- )
-
- self.assertEqual(self.harness.charm.state.message_host, "kafka")
- self.assertEqual(self.harness.charm.state.message_port, 9092)
-
- # Verifying status
- self.assertIsInstance(self.harness.charm.unit.status, BlockedStatus)
-
- # Verifying status message
- self.assertGreater(len(self.harness.charm.unit.status.message), 0)
- self.assertTrue(
- self.harness.charm.unit.status.message.startswith("Waiting for ")
- )
- self.assertNotIn("kafka", self.harness.charm.unit.status.message)
- self.assertIn("mongodb", self.harness.charm.unit.status.message)
- self.assertIn("ro", self.harness.charm.unit.status.message)
- self.assertTrue(self.harness.charm.unit.status.message.endswith(" relations"))
-
def test_on_kafka_relation_unit_changed(self) -> NoReturn:
"""Test to see if kafka relation is updated."""
self.harness.charm.on.start.emit()
@@ -213,33 +184,6 @@
self.assertIn("ro", self.harness.charm.unit.status.message)
self.assertTrue(self.harness.charm.unit.status.message.endswith(" relations"))
- def test_on_mongodb_app_relation_changed(self) -> NoReturn:
- """Test to see if mongodb relation is updated."""
- self.harness.charm.on.start.emit()
-
- self.assertIsNone(self.harness.charm.state.database_uri)
-
- relation_id = self.harness.add_relation("mongodb", "mongodb")
- self.harness.add_relation_unit(relation_id, "mongodb/0")
- self.harness.update_relation_data(
- relation_id, "mongodb", {"connection_string": "mongodb://mongo:27017"}
- )
-
- self.assertEqual(self.harness.charm.state.database_uri, "mongodb://mongo:27017")
-
- # Verifying status
- self.assertIsInstance(self.harness.charm.unit.status, BlockedStatus)
-
- # Verifying status message
- self.assertGreater(len(self.harness.charm.unit.status.message), 0)
- self.assertTrue(
- self.harness.charm.unit.status.message.startswith("Waiting for ")
- )
- self.assertIn("kafka", self.harness.charm.unit.status.message)
- self.assertNotIn("mongodb", self.harness.charm.unit.status.message)
- self.assertIn("ro", self.harness.charm.unit.status.message)
- self.assertTrue(self.harness.charm.unit.status.message.endswith(" relations"))
-
def test_on_mongodb_unit_relation_changed(self) -> NoReturn:
"""Test to see if mongodb relation is updated."""
self.harness.charm.on.start.emit()
@@ -267,35 +211,6 @@
self.assertIn("ro", self.harness.charm.unit.status.message)
self.assertTrue(self.harness.charm.unit.status.message.endswith(" relations"))
- def test_on_ro_app_relation_changed(self) -> NoReturn:
- """Test to see if RO relation is updated."""
- self.harness.charm.on.start.emit()
-
- self.assertIsNone(self.harness.charm.state.ro_host)
- self.assertIsNone(self.harness.charm.state.ro_port)
-
- relation_id = self.harness.add_relation("ro", "ro")
- self.harness.add_relation_unit(relation_id, "ro/0")
- self.harness.update_relation_data(
- relation_id, "ro", {"host": "ro", "port": 9090}
- )
-
- self.assertEqual(self.harness.charm.state.ro_host, "ro")
- self.assertEqual(self.harness.charm.state.ro_port, 9090)
-
- # Verifying status
- self.assertIsInstance(self.harness.charm.unit.status, BlockedStatus)
-
- # Verifying status message
- self.assertGreater(len(self.harness.charm.unit.status.message), 0)
- self.assertTrue(
- self.harness.charm.unit.status.message.startswith("Waiting for ")
- )
- self.assertIn("kafka", self.harness.charm.unit.status.message)
- self.assertIn("mongodb", self.harness.charm.unit.status.message)
- self.assertNotIn("ro", self.harness.charm.unit.status.message)
- self.assertTrue(self.harness.charm.unit.status.message.endswith(" relations"))
-
def test_on_ro_unit_relation_changed(self) -> NoReturn:
"""Test to see if RO relation is updated."""
self.harness.charm.on.start.emit()
diff --git a/installers/charm/lcm/tests/test_pod_spec.py b/installers/charm/lcm/tests/test_pod_spec.py
index 4c6b0cb..c74fb10 100644
--- a/installers/charm/lcm/tests/test_pod_spec.py
+++ b/installers/charm/lcm/tests/test_pod_spec.py
@@ -20,7 +20,6 @@
# osm-charmers@lists.launchpad.net
##
-from pydantic import ValidationError
from typing import NoReturn
import unittest
@@ -396,7 +395,7 @@
app_name = "lcm"
port = 9999
- with self.assertRaises(ValidationError):
+ with self.assertRaises(ValueError):
pod_spec.make_pod_spec(image_info, config, relation_state, app_name, port)
def test_make_pod_spec_without_relation_state(self) -> NoReturn:
@@ -419,7 +418,7 @@
app_name = "lcm"
port = 9999
- with self.assertRaises(ValidationError):
+ with self.assertRaises(ValueError):
pod_spec.make_pod_spec(image_info, config, relation_state, app_name, port)