adminpw handling modification

Change-Id: I737b521c2e7a61dceede12059f99c9a0a1ab0206
Signed-off-by: Tamas Laczko <tamas.laczko@nokia.com>

diff --git a/cmdatahandlers/src/cmdatahandlers/caas/config.py b/cmdatahandlers/src/cmdatahandlers/caas/config.py
index e5275c5..5cd0b9c 100644 (file)
--- a/cmdatahandlers/src/cmdatahandlers/caas/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/caas/config.py
@@ -61,6 +61,9 @@ 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())
+        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'):
@@ -179,6 +182,9 @@ class Config(config.Config):
     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

diff --git a/cmdatahandlers/src/cmdatahandlers/users/config.py b/cmdatahandlers/src/cmdatahandlers/users/config.py
index 3aebbbf..9607194 100644 (file)
--- a/cmdatahandlers/src/cmdatahandlers/users/config.py
+++ b/cmdatahandlers/src/cmdatahandlers/users/config.py
@@ -110,16 +110,3 @@ class Config(config.Config):
         self.config[self.ROOT]['admin_user_password'] = self.MASK
         self.config[self.ROOT]['initial_user_password'] = self.MASK
 
-    def get_admin_password(self):
-        """ get the admin password
-
-            Return:
-
-            The admin password
-
-            Raise:
-
-            ConfigError in-case of an error
-        """
-        return self.config[self.ROOT]['admin_password']
-