X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fng-ui%2Fsrc%2Fcharm.py;h=7d461307c199c17d3a7a06962aef7ee4325f4e3d;hb=7cebea8dfc8d698581135f5b9ab234154a3b62a8;hp=23d316138153c451595a04b9ad9d3b086173f2a3;hpb=081f469ea6358cdd9c6d4c992a7668a2199c8cdc;p=osm%2Fdevops.git

diff --git a/installers/charm/ng-ui/src/charm.py b/installers/charm/ng-ui/src/charm.py
index 23d31613..7d461307 100755
--- a/installers/charm/ng-ui/src/charm.py
+++ b/installers/charm/ng-ui/src/charm.py
@@ -24,6 +24,8 @@ from ops.main import main
 from ops.model import (
     ActiveStatus,
     MaintenanceStatus,
+    BlockedStatus,
+    ModelError,
 )
 
 from glob import glob
@@ -39,24 +41,40 @@ class NGUICharm(CharmBase):
     def __init__(self, framework, key):
         super().__init__(framework, key)
         self.state.set_default(spec=None)
+        self.state.set_default(nbi_host=None)
+        self.state.set_default(nbi_port=None)
 
         # Observe Charm related events
         self.framework.observe(self.on.config_changed, self.on_config_changed)
         self.framework.observe(self.on.start, self.on_start)
         self.framework.observe(self.on.upgrade_charm, self.on_upgrade_charm)
-        # self.framework.observe(
-        #     self.on.nbi_relation_joined, self.on_nbi_relation_joined
-        # )
+        self.framework.observe(
+            self.on.nbi_relation_changed, self.on_nbi_relation_changed
+        )
+
+        # SSL Certificate path
+        self.ssl_folder = "/certs"
+        self.ssl_crt = "{}/ssl_certificate.crt".format(self.ssl_folder)
+        self.ssl_key = "{}/ssl_certificate.key".format(self.ssl_folder)
 
     def _apply_spec(self):
         # Only apply the spec if this unit is a leader.
-        if not self.framework.model.unit.is_leader():
+        unit = self.model.unit
+        if not unit.is_leader():
+            unit.status = ActiveStatus("Ready")
+            return
+        if not self.state.nbi_host or not self.state.nbi_port:
+            unit.status = MaintenanceStatus("Waiting for NBI")
             return
+        unit.status = MaintenanceStatus("Applying new pod spec")
+
         new_spec = self.make_pod_spec()
         if new_spec == self.state.spec:
+            unit.status = ActiveStatus("Ready")
             return
         self.framework.model.pod.set_spec(new_spec)
         self.state.spec = new_spec
+        unit.status = ActiveStatus("Ready")
 
     def make_pod_spec(self):
         config = self.framework.model.config
@@ -78,14 +96,30 @@ class NGUICharm(CharmBase):
                 "initialDelaySeconds": 45,
             },
         }
+
+        ssl_certificate = None
+        ssl_certificate_key = None
+        try:
+            ssl_certificate = self.model.resources.fetch("ssl_certificate")
+            ssl_certificate_key = self.model.resources.fetch("ssl_certificate_key")
+        except ModelError as e:
+            logger.info(e)
+
         config_spec = {
             "port": config["port"],
             "server_name": config["server_name"],
             "client_max_body_size": config["client_max_body_size"],
-            "nbi_hostname": config["nbi_hostname"],
-            "nbi_port": config["nbi_port"],
+            "nbi_host": self.state.nbi_host or config["nbi_host"],
+            "nbi_port": self.state.nbi_port or config["nbi_port"],
+            "ssl_crt": "",
+            "ssl_crt_key": "",
         }
 
+        if ssl_certificate and ssl_certificate_key:
+            config_spec["ssl_crt"] = "ssl_certificate {};".format(self.ssl_crt)
+            config_spec["ssl_crt_key"] = "ssl_certificate_key {};".format(self.ssl_key)
+            config_spec["port"] = "{} ssl".format(config_spec["port"])
+
         files = [
             {
                 "name": "configuration",
@@ -96,8 +130,22 @@ class NGUICharm(CharmBase):
                     .substitute(config_spec)
                     for filename in glob("files/*")
                 },
-            },
+            }
         ]
+
+        if ssl_certificate and ssl_certificate_key:
+            files.append(
+                {
+                    "name": "ssl",
+                    "mountPath": self.ssl_folder,
+                    "files": {
+                        Path(filename)
+                        .name: Template(Path(filename).read_text())
+                        .substitute(config_spec)
+                        for filename in [ssl_certificate, ssl_certificate_key]
+                    },
+                }
+            )
         logger.debug(files)
         spec = {
             "version": 2,
@@ -116,17 +164,11 @@ class NGUICharm(CharmBase):
 
     def on_config_changed(self, event):
         """Handle changes in configuration"""
-        unit = self.model.unit
-        unit.status = MaintenanceStatus("Applying new pod spec")
         self._apply_spec()
-        unit.status = ActiveStatus("Ready")
 
     def on_start(self, event):
         """Called when the charm is being installed"""
-        unit = self.model.unit
-        unit.status = MaintenanceStatus("Applying pod spec")
         self._apply_spec()
-        unit.status = ActiveStatus("Ready")
 
     def on_upgrade_charm(self, event):
         """Upgrade the charm."""
@@ -134,14 +176,20 @@ class NGUICharm(CharmBase):
         unit.status = MaintenanceStatus("Upgrading charm")
         self.on_start(event)
 
-    # def on_nbi_relation_joined(self, event):
-    #     unit = self.model.unit
-    #     if not unit.is_leader():
-    #         return
-    #     config = self.framework.model.config
-    #     unit = MaintenanceStatus("Sending connection data")
+    def on_nbi_relation_changed(self, event):
+        unit = self.model.unit
+        if not unit.is_leader():
+            return
+        self.state.nbi_host = event.relation.data[event.unit].get("host")
+        self.state.nbi_port = event.relation.data[event.unit].get("port")
+        self._apply_spec()
+
+    def resource_get(self, resource_name: str) -> Path:
+        from pathlib import Path
+        from subprocess import run
 
-    #     unit = ActiveStatus("Ready")
+        result = run(["resource-get", resource_name], output=True, text=True)
+        return Path(result.stdout.strip())
 
 
 if __name__ == "__main__":