X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fosm-ro%2Fsrc%2Fcharm.py;h=84c0ee3090a847f4a684392c193bae6e84029c03;hb=be1ab182ee509d5b458fcd1379a9101a7d2a09b1;hp=8b45191448f35f563280737348daef1fc0202e13;hpb=ffab0f160cc41788046aa1320f0c4f37ad60f32e;p=osm%2Fdevops.git diff --git a/installers/charm/osm-ro/src/charm.py b/installers/charm/osm-ro/src/charm.py index 8b451914..84c0ee30 100755 --- a/installers/charm/osm-ro/src/charm.py +++ b/installers/charm/osm-ro/src/charm.py @@ -31,6 +31,7 @@ import base64 import logging from typing import Any, Dict +from charms.data_platform_libs.v0.data_interfaces import DatabaseRequires from charms.kafka_k8s.v0.kafka import KafkaEvents, KafkaRequires from charms.observability_libs.v1.kubernetes_service_patch import KubernetesServicePatch from charms.osm_libs.v0.utils import ( @@ -47,12 +48,30 @@ from ops.framework import StoredState from ops.main import main from ops.model import ActiveStatus, Container -from legacy_interfaces import MongoClient - +ro_host_paths = { + "NG-RO": "/usr/lib/python3/dist-packages/osm_ng_ro", + "RO-plugin": "/usr/lib/python3/dist-packages/osm_ro_plugin", + "RO-SDN-arista_cloudvision": "/usr/lib/python3/dist-packages/osm_rosdn_arista_cloudvision", + "RO-SDN-dpb": "/usr/lib/python3/dist-packages/osm_rosdn_dpb", + "RO-SDN-dynpac": "/usr/lib/python3/dist-packages/osm_rosdn_dynpac", + "RO-SDN-floodlight_openflow": "/usr/lib/python3/dist-packages/osm_rosdn_floodlightof", + "RO-SDN-ietfl2vpn": "/usr/lib/python3/dist-packages/osm_rosdn_ietfl2vpn", + "RO-SDN-juniper_contrail": "/usr/lib/python3/dist-packages/osm_rosdn_juniper_contrail", + "RO-SDN-odl_openflow": "/usr/lib/python3/dist-packages/osm_rosdn_odlof", + "RO-SDN-onos_openflow": "/usr/lib/python3/dist-packages/osm_rosdn_onosof", + "RO-SDN-onos_vpls": "/usr/lib/python3/dist-packages/osm_rosdn_onos_vpls", + "RO-VIM-aws": "/usr/lib/python3/dist-packages/osm_rovim_aws", + "RO-VIM-azure": "/usr/lib/python3/dist-packages/osm_rovim_azure", + "RO-VIM-gcp": "/usr/lib/python3/dist-packages/osm_rovim_gcp", + "RO-VIM-openstack": "/usr/lib/python3/dist-packages/osm_rovim_openstack", + "RO-VIM-openvim": "/usr/lib/python3/dist-packages/osm_rovim_openvim", + "RO-VIM-vmware": "/usr/lib/python3/dist-packages/osm_rovim_vmware", +} HOSTPATHS = [ HostPath( config="ro-hostpath", - container_path="/usr/lib/python3/dist-packages/osm_ro", + container_path="/usr/lib/python3/dist-packages/", + submodules=ro_host_paths, ), HostPath( config="common-hostpath", @@ -81,7 +100,7 @@ class OsmRoCharm(CharmBase): super().__init__(*args) self._stored.set_default(certificates=set()) self.kafka = KafkaRequires(self) - self.mongodb_client = MongoClient(self, "mongodb") + self.mongodb_client = DatabaseRequires(self, "mongodb", database_name="osm") self._observe_charm_events() self._patch_k8s_service() self.ro = RoProvides(self) @@ -102,7 +121,8 @@ class OsmRoCharm(CharmBase): check_container_ready(self.container) self._configure_certificates() - self._configure_service() + if not self.debug_mode.started: + self._configure_service() self._update_ro_relation() # Update charm status @@ -176,7 +196,7 @@ class OsmRoCharm(CharmBase): # Relation events self.on.kafka_available: self._on_config_changed, self.on["kafka"].relation_broken: self._on_required_relation_broken, - self.on["mongodb"].relation_changed: self._on_config_changed, + self.mongodb_client.on.database_created: self._on_config_changed, self.on["mongodb"].relation_broken: self._on_required_relation_broken, self.on.ro_relation_joined: self._update_ro_relation, # Action events @@ -186,6 +206,12 @@ class OsmRoCharm(CharmBase): for event, handler in event_handler_mapping.items(): self.framework.observe(event, handler) + def _is_database_available(self) -> bool: + try: + return self.mongodb_client.is_resource_created() + except KeyError: + return False + def _validate_config(self) -> None: """Validate charm configuration. @@ -203,6 +229,12 @@ class OsmRoCharm(CharmBase): ]: raise CharmError("invalid value for log-level option") + refresh_period = self.config.get("period_refresh_active") + if refresh_period and refresh_period < 60 and refresh_period != -1: + raise ValueError( + "Refresh Period is too tight, insert >= 60 seconds or disable using -1" + ) + def _check_relations(self) -> None: """Validate charm relations. @@ -214,7 +246,7 @@ class OsmRoCharm(CharmBase): if not self.kafka.host or not self.kafka.port: missing_relations.append("kafka") - if self.mongodb_client.is_missing_data_in_unit(): + if not self._is_database_available(): missing_relations.append("mongodb") if missing_relations: @@ -283,18 +315,23 @@ class OsmRoCharm(CharmBase): "OSMRO_MESSAGE_DRIVER": "kafka", # Database configuration "OSMRO_DATABASE_DRIVER": "mongo", - "OSMRO_DATABASE_URI": self.mongodb_client.connection_string, + "OSMRO_DATABASE_URI": self._get_mongodb_uri(), "OSMRO_DATABASE_COMMONKEY": self.config["database-commonkey"], # Storage configuration "OSMRO_STORAGE_DRIVER": "mongo", "OSMRO_STORAGE_PATH": "/app/storage", "OSMRO_STORAGE_COLLECTION": "files", - "OSMRO_STORAGE_URI": self.mongodb_client.connection_string, + "OSMRO_STORAGE_URI": self._get_mongodb_uri(), + "OSMRO_PERIOD_REFRESH_ACTIVE": self.config.get("period_refresh_active") + or 60, }, } }, } + def _get_mongodb_uri(self): + return list(self.mongodb_client.fetch_relation_data().values())[0]["uris"] + if __name__ == "__main__": # pragma: no cover main(OsmRoCharm)