X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmdatahandlers%2Fsrc%2Fcmdatahandlers%2Fcaas%2Fconfig.py;h=9bfa280ffeb0debec23406cdd5285909939fdfaa;hb=07e2d272a64f764a4d9d61c886b9b21f24b30f07;hp=69b831df7e25c84c3ffbc5bc0fd3194b52db9cf6;hpb=1f9487772ca902e5928dbd0ef2585b9f75f2b70f;p=ta%2Fconfig-manager.git diff --git a/cmdatahandlers/src/cmdatahandlers/caas/config.py b/cmdatahandlers/src/cmdatahandlers/caas/config.py index 69b831d..9bfa280 100644 --- a/cmdatahandlers/src/cmdatahandlers/caas/config.py +++ b/cmdatahandlers/src/cmdatahandlers/caas/config.py @@ -18,14 +18,18 @@ from cmdatahandlers.api import configerror from serviceprofiles import profiles import yaml import jinja2 +import string +from random import choice CAAS_CONFIG_FILE_PATH = "/etc/cmframework/config/" CAAS_CONFIG_FILE = "caas.yaml" DEFAULT_CAAS_DNS_DOMAIN = "rec.io" -VNF_EMBEDDED_SOFT_EVICTION_TRESHOLD = "300Mi" -BM_SOFT_EVICTION_TRESHOLD = "4Gi" -VNF_EMBEDDED_HARD_EVICTION_TRESHOLD = "200Mi" -BM_HARD_EVICTION_TRESHOLD = "2Gi" +VNF_EMBEDDED_SOFT_EVICTION_THRESHOLD = "300Mi" +BM_SOFT_EVICTION_THRESHOLD = "4Gi" +VNF_EMBEDDED_HARD_EVICTION_THRESHOLD = "200Mi" +BM_HARD_EVICTION_THRESHOLD = "2Gi" +ADMIN_PWD_LENGTH = 20 +DEFAULT_CAAS_INFRA_LOG_TYPE = 'elasticsearch' class Config(config.Config): @@ -39,7 +43,8 @@ class Config(config.Config): def init(self): pass - def validate(self): + @staticmethod + def validate(): print("validate") def flavour_set(self): @@ -48,20 +53,25 @@ class Config(config.Config): for host in hostsconf.get_hosts(): if 'caas_master' in hostsconf.get_service_profiles(host): caas_masters.append(host) - - if len(caas_masters) > 1: - return "multi" - else: - return "single" + return "multi" if len(caas_masters) > 1 else "single" def set_dynamic_config(self): if utils.is_virtualized(): self.config[self.ROOT]['vnf_embedded_deployment'] = self.get_vnf_flag() user_conf = self.confman.get_users_config_handler() - self.config[self.ROOT]['helm_home'] = "/home/" + user_conf.get_admin_user() + "/.helm" - self.config[self.ROOT]['flavour'] = self.flavour_set() - if not self.config[self.ROOT].get('dns_domain', ""): - self.config[self.ROOT]['dns_domain'] = DEFAULT_CAAS_DNS_DOMAIN + self.set_caas_parameter('helm_home', "/home/{}/.helm".format(user_conf.get_admin_user())) + self.set_caas_parameter('flavour', self.flavour_set()) + admin_pwd = self.get_caas_parameter('admin_password') + self.config[self.ROOT]['admin_password'] = \ + admin_pwd if admin_pwd != '' else self.generate_pwd(ADMIN_PWD_LENGTH) + if not self.get_caas_parameter('dns_domain'): + self.set_caas_parameter('dns_domain', DEFAULT_CAAS_DNS_DOMAIN) + if not self.get_caas_parameter('infra_log_store'): + self.set_caas_parameter('infra_log_store', DEFAULT_CAAS_INFRA_LOG_TYPE) + if not self.get_caas_parameter('log_forwarding'): + self.set_caas_parameter('log_forwarding', []) + hostsconf = self.confman.get_hosts_config_handler() + hostsconf.set_nodeindex() def set_static_config(self): try: @@ -75,28 +85,38 @@ class Config(config.Config): except jinja2.exceptions.TemplateNotFound: return except Exception: - raise configerror.ConfigError("Unexpected issue occured!") - - def _template_config(self, template, base_config, initial_data): + raise configerror.ConfigError("Unexpected issue has occured!") + + def set_post_config(self): + self.config[self.ROOT]['swift_credential'] = \ + dict( + user=self.get_caas_parameter('swift_credential').get('user'), + tenant=self.get_caas_parameter('swift_credential').get('tenant'), + password=self.generate_pwd(ADMIN_PWD_LENGTH) + ) + + @staticmethod + def _template_config(template, base_config, initial_data): config_data = initial_data.copy() config_data.update(base_config) - outputText = template.render(config_data) - previousOutputText = "" - while outputText != previousOutputText: - config_data = yaml.load(outputText) + output_text = template.render(config_data) + previous_output_text = "" + while output_text != previous_output_text: + config_data = yaml.load(output_text) config_data.update(base_config) - outputText = template.render(config_data) - previousOutputText = outputText - return yaml.load(outputText) + output_text = template.render(config_data) + previous_output_text = output_text + return yaml.load(output_text) def add_defaults(self): if not self.config.get('cloud.caas', ''): return self.set_dynamic_config() self.set_static_config() + self.set_post_config() def is_vnf_embedded_deployment(self): - return (self.get_caas_only() and self.get_vnf_flag()) + return self.get_caas_only() and self.get_vnf_flag() def get_vnf_flag(self): return bool(self.config.get(self.ROOT, {}).get('vnf_embedded_deployment', @@ -159,19 +179,29 @@ class Config(config.Config): def get_caas_parameter(self, parameter): return self.config.get(self.ROOT, {}).get(parameter, '') + def set_caas_parameter(self, parameter, value): + self.config[self.ROOT][parameter] = value + + def get_admin_password(self): + return self.config.get(self.ROOT, {}).get('admin_password') + + @staticmethod + def generate_pwd(pwd_length): + character_pool = string.ascii_letters + string.digits + return ''.join(choice(character_pool) for i in range(pwd_length)) + def get_kubernetes_domain(self): return 'kubernetes.default.svc.{}'.format( self.config.get(self.ROOT, {}).get('dns_domain', '')) def get_caas_soft_eviction_threshold(self): if self.is_vnf_embedded_deployment(): - return VNF_EMBEDDED_SOFT_EVICTION_TRESHOLD + return VNF_EMBEDDED_SOFT_EVICTION_THRESHOLD else: - return BM_SOFT_EVICTION_TRESHOLD + return BM_SOFT_EVICTION_THRESHOLD def get_caas_hard_eviction_threshold(self): if self.is_vnf_embedded_deployment(): - return VNF_EMBEDDED_HARD_EVICTION_TRESHOLD + return VNF_EMBEDDED_HARD_EVICTION_THRESHOLD else: - return BM_HARD_EVICTION_TRESHOLD - + return BM_HARD_EVICTION_THRESHOLD