X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fro%2Fsrc%2Fcharm.py;h=028dc0a4f0c1afd6cd7758fa2c88952fa35cacab;hb=f0cb2ddc6c4e9ca6b9a2fb3b859ecea447878763;hp=b196b19541a0bcfc9fadacb08d3f75974f427943;hpb=4a0db7c233b71d100e3db32bb15e8aa720c9034c;p=osm%2Fdevops.git diff --git a/installers/charm/ro/src/charm.py b/installers/charm/ro/src/charm.py index b196b195..028dc0a4 100755 --- a/installers/charm/ro/src/charm.py +++ b/installers/charm/ro/src/charm.py @@ -81,6 +81,7 @@ class ConfigModel(ModelValidator): image_pull_policy: str debug_mode: bool security_context: bool + period_refresh_active: Optional[int] @validator("log_level") def validate_log_level(cls, v): @@ -122,6 +123,14 @@ class ConfigModel(ModelValidator): def certificates_dict(cls): return _extract_certificates(cls.certificates) if cls.certificates else {} + @validator("period_refresh_active") + def validate_vim_refresh_period(cls, v): + if v and v < 60 and v != -1: + raise ValueError( + "Refresh Period is too tight, insert >= 60 seconds or disable using -1" + ) + return v + class RoCharm(CharmedOsmBase): """GrafanaCharm Charm.""" @@ -271,7 +280,12 @@ class RoCharm(CharmedOsmBase): "OSMRO_LOG_LEVEL": config.log_level, } ) - + if config.period_refresh_active: + container_builder.add_envs( + { + "OSMRO_PERIOD_REFRESH_ACTIVE": config.period_refresh_active, + } + ) if config.enable_ng_ro: # Add secrets to the pod mongodb_secret_name = f"{self.app.name}-mongodb-secret" @@ -349,8 +363,6 @@ VSCODE_WORKSPACE = { {"path": "/usr/lib/python3/dist-packages/osm_rovim_aws"}, {"path": "/usr/lib/python3/dist-packages/osm_rovim_azure"}, {"path": "/usr/lib/python3/dist-packages/osm_rovim_gcp"}, - {"path": "/usr/lib/python3/dist-packages/osm_rovim_fos"}, - # {"path": "/usr/lib/python3/dist-packages/osm_rovim_opennebula"}, {"path": "/usr/lib/python3/dist-packages/osm_rovim_openstack"}, {"path": "/usr/lib/python3/dist-packages/osm_rovim_openvim"}, {"path": "/usr/lib/python3/dist-packages/osm_rovim_vmware"}, @@ -431,14 +443,6 @@ def _get_ro_host_paths(ro_host_path: str) -> Dict: "hostpath": f"{ro_host_path}/RO-VIM-gcp", "container-path": "/usr/lib/python3/dist-packages/osm_rovim_gcp", }, - "RO-VIM-fos": { - "hostpath": f"{ro_host_path}/RO-VIM-fos", - "container-path": "/usr/lib/python3/dist-packages/osm_rovim_fos", - }, - "RO-VIM-opennebula": { - "hostpath": f"{ro_host_path}/RO-VIM-opennebula", - "container-path": "/usr/lib/python3/dist-packages/osm_rovim_opennebula", - }, "RO-VIM-openstack": { "hostpath": f"{ro_host_path}/RO-VIM-openstack", "container-path": "/usr/lib/python3/dist-packages/osm_rovim_openstack",