X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fmon%2Fsrc%2Fcharm.py;h=ab6dd2dfd334dfb45a1d1f4f6996728e8d269f21;hb=refs%2Fheads%2Fng-ro-refactor;hp=26dee3ff1824da5f2609afeb57dd13694021b0f4;hpb=a43a22f50db90731e1c25279b721778240c2ce04;p=osm%2Fdevops.git

diff --git a/installers/charm/mon/src/charm.py b/installers/charm/mon/src/charm.py
index 26dee3ff..ab6dd2df 100755
--- a/installers/charm/mon/src/charm.py
+++ b/installers/charm/mon/src/charm.py
@@ -23,27 +23,19 @@
 # pylint: disable=E0213
 
 
+import base64
 import logging
-from typing import NoReturn
+from typing import NoReturn, Optional
 
-from ops.main import main
 
+from ops.main import main
 from opslib.osm.charm import CharmedOsmBase, RelationsMissing
-
-from opslib.osm.pod import (
-    ContainerV3Builder,
-    PodSpecV3Builder,
-)
-
-from opslib.osm.validator import (
-    ModelValidator,
-    validator,
-)
-
 from opslib.osm.interfaces.kafka import KafkaClient
+from opslib.osm.interfaces.keystone import KeystoneClient
 from opslib.osm.interfaces.mongo import MongoClient
 from opslib.osm.interfaces.prometheus import PrometheusClient
-from opslib.osm.interfaces.keystone import KeystoneClient
+from opslib.osm.pod import ContainerV3Builder, FilesV3Builder, PodSpecV3Builder
+from opslib.osm.validator import ModelValidator, validator
 
 
 logger = logging.getLogger(__name__)
@@ -51,11 +43,31 @@ logger = logging.getLogger(__name__)
 PORT = 8000
 
 
+def _check_certificate_data(name: str, content: str):
+    if not name or not content:
+        raise ValueError("certificate name and content must be a non-empty string")
+
+
+def _extract_certificates(certs_config: str):
+    certificates = {}
+    if certs_config:
+        cert_list = certs_config.split(",")
+        for cert in cert_list:
+            name, content = cert.split(":")
+            _check_certificate_data(name, content)
+            certificates[name] = content
+    return certificates
+
+
+def decode(content: str):
+    return base64.b64decode(content.encode("utf-8")).decode("utf-8")
+
+
 class ConfigModel(ModelValidator):
     keystone_enabled: bool
     vca_host: str
     vca_user: str
-    vca_password: str
+    vca_secret: str
     vca_cacert: str
     database_commonkey: str
     log_level: str
@@ -66,6 +78,7 @@ class ConfigModel(ModelValidator):
     grafana_url: str
     grafana_user: str
     grafana_password: str
+    certificates: Optional[str]
 
     @validator("log_level")
     def validate_log_level(cls, v):
@@ -73,6 +86,16 @@ class ConfigModel(ModelValidator):
             raise ValueError("value must be INFO or DEBUG")
         return v
 
+    @validator("certificates")
+    def validate_certificates(cls, v):
+        # Raises an exception if it cannot extract the certificates
+        _extract_certificates(v)
+        return v
+
+    @property
+    def certificates_dict(cls):
+        return _extract_certificates(cls.certificates) if cls.certificates else {}
+
 
 class MonCharm(CharmedOsmBase):
     def __init__(self, *args) -> NoReturn:
@@ -114,6 +137,15 @@ class MonCharm(CharmedOsmBase):
         if missing_relations:
             raise RelationsMissing(missing_relations)
 
+    def _build_cert_files(
+        self,
+        config: ConfigModel,
+    ):
+        cert_files_builder = FilesV3Builder()
+        for name, content in config.certificates_dict.items():
+            cert_files_builder.add_file(name, decode(content), mode=0o600)
+        return cert_files_builder.build()
+
     def build_pod_spec(self, image_info):
         # Validate config
         config = ConfigModel(**dict(self.config))
@@ -123,6 +155,9 @@ class MonCharm(CharmedOsmBase):
         pod_spec_builder = PodSpecV3Builder()
         # Build Container
         container_builder = ContainerV3Builder(self.app.name, image_info)
+        certs_files = self._build_cert_files(config)
+        if certs_files:
+            container_builder.add_volume_config("certs", "/certs", certs_files)
         container_builder.add_port(name=self.app.name, port=PORT)
         container_builder.add_envs(
             {
@@ -146,7 +181,7 @@ class MonCharm(CharmedOsmBase):
                 # VCA configuration
                 "OSMMON_VCA_HOST": config.vca_host,
                 "OSMMON_VCA_USER": config.vca_user,
-                "OSMMON_VCA_SECRET": config.vca_password,
+                "OSMMON_VCA_SECRET": config.vca_secret,
                 "OSMMON_VCA_CACERT": config.vca_cacert,
                 "OSMMON_GRAFANA_URL": config.grafana_url,
                 "OSMMON_GRAFANA_USER": config.grafana_user,