X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Flcm%2Fsrc%2Fcharm.py;h=01ac0bf5c4c94b6115a9653c8c60eec4f07bb03b;hb=refs%2Fchanges%2F27%2F11127%2F2;hp=e9552fd194f887085f9d7c3c87c0d6484ea7875f;hpb=c753dc5f89180d11c1049f6398d74a4f99d7acd5;p=osm%2Fdevops.git diff --git a/installers/charm/lcm/src/charm.py b/installers/charm/lcm/src/charm.py index e9552fd1..01ac0bf5 100755 --- a/installers/charm/lcm/src/charm.py +++ b/installers/charm/lcm/src/charm.py @@ -42,15 +42,16 @@ PORT = 9999 class ConfigModel(ModelValidator): - vca_host: str - vca_port: int - vca_user: str - vca_secret: str - vca_pubkey: str - vca_cacert: str - vca_cloud: str - vca_k8s_cloud: str + vca_host: Optional[str] + vca_port: Optional[int] + vca_user: Optional[str] + vca_secret: Optional[str] + vca_pubkey: Optional[str] + vca_cacert: Optional[str] + vca_cloud: Optional[str] + vca_k8s_cloud: Optional[str] database_commonkey: str + mongodb_uri: Optional[str] log_level: str vca_apiproxy: Optional[str] # Model-config options @@ -107,6 +108,9 @@ class ConfigModel(ModelValidator): vca_model_config_test_mode: Optional[bool] vca_model_config_transmit_vendor_metrics: Optional[bool] vca_model_config_update_status_hook_interval: Optional[str] + vca_stablerepourl: Optional[str] + vca_helm_ca_certs: Optional[str] + image_pull_policy: str @validator("log_level") def validate_log_level(cls, v): @@ -114,11 +118,34 @@ class ConfigModel(ModelValidator): raise ValueError("value must be INFO or DEBUG") 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("image_pull_policy") + def validate_image_pull_policy(cls, v): + values = { + "always": "Always", + "ifnotpresent": "IfNotPresent", + "never": "Never", + } + v = v.lower() + if v not in values.keys(): + raise ValueError("value must be always, ifnotpresent or never") + return values[v] + class LcmCharm(CharmedOsmBase): def __init__(self, *args) -> NoReturn: - super().__init__(*args, oci_image="image") - + super().__init__( + *args, + oci_image="image", + debug_mode_config_key="debug_mode", + debug_pubkey_config_key="debug_pubkey", + vscode_workspace=VSCODE_WORKSPACE, + ) self.kafka_client = KafkaClient(self, "kafka") self.framework.observe(self.on["kafka"].relation_changed, self.configure_pod) self.framework.observe(self.on["kafka"].relation_broken, self.configure_pod) @@ -136,7 +163,7 @@ class LcmCharm(CharmedOsmBase): 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") if self.ro_client.is_missing_data_in_app(): missing_relations.append("ro") @@ -147,12 +174,20 @@ class LcmCharm(CharmedOsmBase): def build_pod_spec(self, image_info): # Validate config config = ConfigModel(**dict(self.config)) + + 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") + # 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) + container_builder = ContainerV3Builder( + self.app.name, image_info, config.image_pull_policy + ) container_builder.add_port(name=self.app.name, port=PORT) container_builder.add_envs( { @@ -169,40 +204,73 @@ class LcmCharm(CharmedOsmBase): "OSMLCM_MESSAGE_PORT": self.kafka_client.port, # Database configuration "OSMLCM_DATABASE_DRIVER": "mongo", - "OSMLCM_DATABASE_URI": self.mongodb_client.connection_string, + "OSMLCM_DATABASE_URI": config.mongodb_uri + or self.mongodb_client.connection_string, "OSMLCM_DATABASE_COMMONKEY": config.database_commonkey, # Storage configuration "OSMLCM_STORAGE_DRIVER": "mongo", "OSMLCM_STORAGE_PATH": "/app/storage", "OSMLCM_STORAGE_COLLECTION": "files", - "OSMLCM_STORAGE_URI": self.mongodb_client.connection_string, - # VCA configuration - "OSMLCM_VCA_HOST": config.vca_host, - "OSMLCM_VCA_PORT": config.vca_port, - "OSMLCM_VCA_USER": config.vca_user, - "OSMLCM_VCA_PUBKEY": config.vca_pubkey, - "OSMLCM_VCA_SECRET": config.vca_secret, - "OSMLCM_VCA_CACERT": config.vca_cacert, - "OSMLCM_VCA_CLOUD": config.vca_cloud, - "OSMLCM_VCA_K8S_CLOUD": config.vca_k8s_cloud, + "OSMLCM_STORAGE_URI": config.mongodb_uri + or self.mongodb_client.connection_string, + "OSMLCM_VCA_STABLEREPOURL": config.vca_stablerepourl, + "OSMLCM_VCA_HELM_CA_CERTS": config.vca_helm_ca_certs, } ) - if config.vca_apiproxy: - container_builder.add_env("OSMLCM_VCA_APIPROXY", config.vca_apiproxy) - - model_config_envs = { - f"OSMLCM_{k.upper()}": v - for k, v in self.config.items() - if k.startswith("vca_model_config") - } - if model_config_envs: - container_builder.add_envs(model_config_envs) + if config.vca_host: + container_builder.add_envs( + { + # VCA configuration + "OSMLCM_VCA_HOST": config.vca_host, + "OSMLCM_VCA_PORT": config.vca_port, + "OSMLCM_VCA_USER": config.vca_user, + "OSMLCM_VCA_PUBKEY": config.vca_pubkey, + "OSMLCM_VCA_SECRET": config.vca_secret, + "OSMLCM_VCA_CACERT": config.vca_cacert, + "OSMLCM_VCA_CLOUD": config.vca_cloud, + "OSMLCM_VCA_K8S_CLOUD": config.vca_k8s_cloud, + } + ) + if config.vca_apiproxy: + container_builder.add_env("OSMLCM_VCA_APIPROXY", config.vca_apiproxy) + + model_config_envs = { + f"OSMLCM_{k.upper()}": v + for k, v in self.config.items() + if k.startswith("vca_model_config") + } + if model_config_envs: + container_builder.add_envs(model_config_envs) container = container_builder.build() + # Add container to pod spec pod_spec_builder.add_container(container) + return pod_spec_builder.build() +VSCODE_WORKSPACE = { + "folders": [ + {"path": "/usr/lib/python3/dist-packages/osm_lcm"}, + {"path": "/usr/lib/python3/dist-packages/osm_n2vc"}, + {"path": "/usr/lib/python3/dist-packages/osm_common"}, + ], + "settings": {}, + "launch": { + "version": "0.2.0", + "configurations": [ + { + "name": "LCM", + "type": "python", + "request": "launch", + "module": "osm_lcm.lcm", + "justMyCode": False, + } + ], + }, +} + + if __name__ == "__main__": main(LcmCharm)