From: Levente Kálé <levente.kale@nokia.com>
Date: Tue, 16 Jul 2019 14:20:13 +0000 (+0000)
Subject: Merge "FIX: Allow configuration of IPMI privilege level"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fconfig-manager.git;a=commitdiff_plain;h=dfc396b6d56b9856d2688e39a2708adcb9cbffff;hp=c3bc257650a437d095bb85e7320d2e9405391a30

Merge "FIX: Allow configuration of IPMI privilege level"
---

diff --git a/cmdatahandlers/src/cmdatahandlers/caas/config.py b/cmdatahandlers/src/cmdatahandlers/caas/config.py
index 8ef8081..ed5c236 100644
--- a/cmdatahandlers/src/cmdatahandlers/caas/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/caas/config.py
@@ -18,6 +18,8 @@ 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"
@@ -26,6 +28,8 @@ 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 = 'remote_syslog'
 
 
 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,20 @@ 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())
+        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', [])
 
     def set_static_config(self):
         try:
@@ -75,25 +80,35 @@ 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()
@@ -159,6 +174,14 @@ 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
+
+    @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', ''))