X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=blobdiff_plain;f=installers%2Fcharm%2Fro%2Fsrc%2Fcharm.py;h=951f281be542702e69ecdc06bea93fd14487edc4;hp=5b40c1606f2e6197002cb6554f84a890591563d4;hb=996a5604c7d31f3758503b08a426f1f40619b17b;hpb=69bc1abc5bd0131df7df6bbb49653b892be94374 diff --git a/installers/charm/ro/src/charm.py b/installers/charm/ro/src/charm.py index 5b40c160..951f281b 100755 --- a/installers/charm/ro/src/charm.py +++ b/installers/charm/ro/src/charm.py @@ -62,7 +62,13 @@ def decode(content: str): class ConfigModel(ModelValidator): enable_ng_ro: bool database_commonkey: str + mongodb_uri: Optional[str] log_level: str + mysql_host: Optional[str] + mysql_port: Optional[int] + mysql_user: Optional[str] + mysql_password: Optional[str] + mysql_root_password: Optional[str] vim_database: str ro_database: str openmano_tenant: str @@ -80,6 +86,18 @@ class ConfigModel(ModelValidator): _extract_certificates(v) return v + @validator("mongodb_uri") + def validate_mongodb_uri(cls, v): + if v and not v.startswith("mongodb://"): + raise ValueError("mongodb_uri is not properly formed") + return v + + @validator("mysql_port") + def validate_mysql_port(cls, v): + if v and (v <= 0 or v >= 65535): + raise ValueError("Mysql port out of range") + return v + @property def certificates_dict(cls): return _extract_certificates(cls.certificates) if cls.certificates else {} @@ -126,14 +144,26 @@ class RoCharm(CharmedOsmBase): if config.enable_ng_ro: if self.kafka_client.is_missing_data_in_unit(): missing_relations.append("kafka") - if self.mongodb_client.is_missing_data_in_unit(): + if not config.mongodb_uri and self.mongodb_client.is_missing_data_in_unit(): missing_relations.append("mongodb") else: - if self.mysql_client.is_missing_data_in_unit(): + if not config.mysql_host and self.mysql_client.is_missing_data_in_unit(): missing_relations.append("mysql") if missing_relations: raise RelationsMissing(missing_relations) + def _validate_mysql_config(self, config: ConfigModel): + invalid_values = [] + if not config.mysql_user: + invalid_values.append("Mysql user is empty") + if not config.mysql_password: + invalid_values.append("Mysql password is empty") + if not config.mysql_root_password: + invalid_values.append("Mysql root password empty") + + if invalid_values: + raise ValueError("Invalid values: " + ", ".join(invalid_values)) + def _build_cert_files( self, config: ConfigModel, @@ -146,15 +176,32 @@ class RoCharm(CharmedOsmBase): def build_pod_spec(self, image_info): # Validate config config = ConfigModel(**dict(self.config)) + + if config.enable_ng_ro: + if config.mongodb_uri and not self.mongodb_client.is_missing_data_in_unit(): + raise Exception( + "Mongodb data cannot be provided via config and relation" + ) + else: + if config.mysql_host and not self.mysql_client.is_missing_data_in_unit(): + raise Exception("Mysql data cannot be provided via config and relation") + + if config.mysql_host: + self._validate_mysql_config(config) + # Check relations self._check_missing_dependencies(config) + # Create Builder for the PodSpec 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_http_readiness_probe( "/ro/" if config.enable_ng_ro else "/openmano/tenants", @@ -177,6 +224,7 @@ class RoCharm(CharmedOsmBase): "OSMRO_LOG_LEVEL": config.log_level, } ) + if config.enable_ng_ro: container_builder.add_envs( { @@ -185,7 +233,8 @@ class RoCharm(CharmedOsmBase): "OSMRO_MESSAGE_PORT": self.kafka_client.port, # MongoDB configuration "OSMRO_DATABASE_DRIVER": "mongo", - "OSMRO_DATABASE_URI": self.mongodb_client.connection_string, + "OSMRO_DATABASE_URI": config.mongodb_uri + or self.mongodb_client.connection_string, "OSMRO_DATABASE_COMMONKEY": config.database_commonkey, } ) @@ -193,24 +242,30 @@ class RoCharm(CharmedOsmBase): else: container_builder.add_envs( { - "RO_DB_HOST": self.mysql_client.host, - "RO_DB_OVIM_HOST": self.mysql_client.host, - "RO_DB_PORT": self.mysql_client.port, - "RO_DB_OVIM_PORT": self.mysql_client.port, - "RO_DB_USER": self.mysql_client.user, - "RO_DB_OVIM_USER": self.mysql_client.user, - "RO_DB_PASSWORD": self.mysql_client.password, - "RO_DB_OVIM_PASSWORD": self.mysql_client.password, - "RO_DB_ROOT_PASSWORD": self.mysql_client.root_password, - "RO_DB_OVIM_ROOT_PASSWORD": self.mysql_client.root_password, + "RO_DB_HOST": config.mysql_host or self.mysql_client.host, + "RO_DB_OVIM_HOST": config.mysql_host or self.mysql_client.host, + "RO_DB_PORT": config.mysql_port or self.mysql_client.port, + "RO_DB_OVIM_PORT": config.mysql_port or self.mysql_client.port, + "RO_DB_USER": config.mysql_user or self.mysql_client.user, + "RO_DB_OVIM_USER": config.mysql_user or self.mysql_client.user, + "RO_DB_PASSWORD": config.mysql_password + or self.mysql_client.password, + "RO_DB_OVIM_PASSWORD": config.mysql_password + or self.mysql_client.password, + "RO_DB_ROOT_PASSWORD": config.mysql_root_password + or self.mysql_client.root_password, + "RO_DB_OVIM_ROOT_PASSWORD": config.mysql_root_password + or self.mysql_client.root_password, "RO_DB_NAME": config.ro_database, "RO_DB_OVIM_NAME": config.vim_database, "OPENMANO_TENANT": config.openmano_tenant, } ) container = container_builder.build() + # Add container to pod spec pod_spec_builder.add_container(container) + return pod_spec_builder.build()