X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmdatahandlers%2Fsrc%2Fcmdatahandlers%2Fcaas%2Fconfig.py;h=7a2afb2e41e2264eaa95b5908aff82be3da6c3e6;hb=fa06747c17ef39c108972f2efb24596960dd8243;hp=9bfa280ffeb0debec23406cdd5285909939fdfaa;hpb=07e2d272a64f764a4d9d61c886b9b21f24b30f07;p=ta%2Fconfig-manager.git

diff --git a/cmdatahandlers/src/cmdatahandlers/caas/config.py b/cmdatahandlers/src/cmdatahandlers/caas/config.py
index 9bfa280..7a2afb2 100644
--- a/cmdatahandlers/src/cmdatahandlers/caas/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/caas/config.py
@@ -30,6 +30,10 @@ VNF_EMBEDDED_HARD_EVICTION_THRESHOLD = "200Mi"
 BM_HARD_EVICTION_THRESHOLD = "2Gi"
 ADMIN_PWD_LENGTH = 20
 DEFAULT_CAAS_INFRA_LOG_TYPE = 'elasticsearch'
+AUDIT_DISK_LIMIT = 0.87
+CAAS_AUDIT_DISK_RATIO = 0.25
+DEFAULT_VALUES_MAP = { "docker0_cidr": "127.17.0.1/16",
+                       "oam_cidr": "10.244.0.0/16" }
 
 
 class Config(config.Config):
@@ -54,6 +58,12 @@ class Config(config.Config):
             if 'caas_master' in hostsconf.get_service_profiles(host):
                 caas_masters.append(host)
         return "multi" if len(caas_masters) > 1 else "single"
+ 
+    def get_caas_max_audit_size(self):
+        if self.is_caas_deployment():
+            return self.get_audit_disk_limit()*self.get_audit_disk_ratio()
+        else:
+            return 0
 
     def set_dynamic_config(self):
         if utils.is_virtualized():
@@ -61,6 +71,7 @@ class Config(config.Config):
         user_conf = self.confman.get_users_config_handler()
         self.set_caas_parameter('helm_home', "/home/{}/.helm".format(user_conf.get_admin_user()))
         self.set_caas_parameter('flavour', self.flavour_set())
+        self.config[self.ROOT]['caas_max_audit_size'] = self.get_caas_max_audit_size()
         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)
@@ -95,6 +106,11 @@ class Config(config.Config):
                 password=self.generate_pwd(ADMIN_PWD_LENGTH)
             )
 
+    def set_default_values_to_optional_params(self):
+        for parameter_name, default_value in DEFAULT_VALUES_MAP.iteritems():
+            if self.config[self.ROOT].get(parameter_name, '') == '':
+                self.config[self.ROOT][parameter_name] = default_value
+
     @staticmethod
     def _template_config(template, base_config, initial_data):
         config_data = initial_data.copy()
@@ -113,6 +129,7 @@ class Config(config.Config):
             return
         self.set_dynamic_config()
         self.set_static_config()
+        self.set_default_values_to_optional_params()
         self.set_post_config()
 
     def is_vnf_embedded_deployment(self):
@@ -205,3 +222,9 @@ class Config(config.Config):
             return VNF_EMBEDDED_HARD_EVICTION_THRESHOLD
         else:
             return BM_HARD_EVICTION_THRESHOLD
+
+    def get_audit_disk_ratio(self):
+        return CAAS_AUDIT_DISK_RATIO
+
+    def get_audit_disk_limit(self):
+        return AUDIT_DISK_LIMIT