X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmdatahandlers%2Fsrc%2Fcmdatahandlers%2Fcaas%2Fconfig.py;h=811dec051a62297e85950eceec5b3332fc6a8f9b;hb=refs%2Fchanges%2F73%2F1073%2F2;hp=e8975582cb1a6c6bb0312518ec0a195dba977751;hpb=6ec88afabb201adbd3e02490b3cac283a6e43842;p=ta%2Fconfig-manager.git

diff --git a/cmdatahandlers/src/cmdatahandlers/caas/config.py b/cmdatahandlers/src/cmdatahandlers/caas/config.py
index e897558..811dec0 100644
--- a/cmdatahandlers/src/cmdatahandlers/caas/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/caas/config.py
@@ -22,6 +22,11 @@ import jinja2
 CAAS_CONFIG_FILE_PATH = "/etc/cmframework/config/"
 CAAS_CONFIG_FILE = "caas.yaml"
 DEFAULT_CAAS_DNS_DOMAIN = "rec.io"
+VNF_EMBEDDED_SOFT_EVICTION_THRESHOLD = "300Mi"
+BM_SOFT_EVICTION_THRESHOLD = "4Gi"
+VNF_EMBEDDED_HARD_EVICTION_THRESHOLD = "200Mi"
+BM_HARD_EVICTION_THRESHOLD = "2Gi"
+DEFAULT_CAAS_INFRA_LOG_TYPE = 'remote_syslog'
 
 
 class Config(config.Config):
@@ -58,6 +63,10 @@ class Config(config.Config):
         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
+        if not self.get_caas_parameter('infra_log_store'):
+            self.config[self.ROOT]['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:
@@ -92,7 +101,7 @@ class Config(config.Config):
         self.set_static_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',
@@ -158,3 +167,15 @@ class Config(config.Config):
     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_THRESHOLD
+        else:
+            return BM_SOFT_EVICTION_THRESHOLD
+
+    def get_caas_hard_eviction_threshold(self):
+        if self.is_vnf_embedded_deployment():
+            return VNF_EMBEDDED_HARD_EVICTION_THRESHOLD
+        else:
+            return BM_HARD_EVICTION_THRESHOLD