X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=cmdatahandlers%2Fsrc%2Fcmdatahandlers%2Fcaas%2Fconfig.py;h=811dec051a62297e85950eceec5b3332fc6a8f9b;hb=50807e67d08c5154d54241d0a93cd9f8455793f1;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..811dec0 100644
--- a/cmdatahandlers/src/cmdatahandlers/caas/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/caas/config.py
@@ -22,10 +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_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"
+DEFAULT_CAAS_INFRA_LOG_TYPE = 'remote_syslog'
 
 
 class Config(config.Config):
@@ -62,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:
@@ -96,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',
@@ -165,13 +170,12 @@ class Config(config.Config):
 
     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