Update env vars dict
Change-Id: Ia1e6e06787bc12af0aeb5a6f78bab112906f95e2
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/ffdc/ffdc_collector.py b/ffdc/ffdc_collector.py
index c717e2d..4e11529 100644
--- a/ffdc/ffdc_collector.py
+++ b/ffdc/ffdc_collector.py
@@ -96,19 +96,27 @@
sys.exit(-1)
# Load ENV vars from user.
+ self.logger.info("\n\tENV: User define input YAML variables")
+ self.env_dict = {}
+
try:
if env_vars:
- env_dict = json.loads(env_vars)
- self.logger.info("\n\tENV: User define input YAML variables")
- self.logger.info(json.dumps(env_dict, indent=8, sort_keys=True))
+ self.env_dict = json.loads(env_vars)
# Export ENV vars default.
- for key, value in env_dict.items():
+ for key, value in self.env_dict.items():
os.environ[key] = value
+
except json.decoder.JSONDecodeError as e:
self.logger.error("\n\tERROR: %s " % e)
sys.exit(-1)
+ # Append default Env.
+ self.env_dict['hostname'] = self.hostname
+ self.env_dict['username'] = self.username
+ self.env_dict['password'] = self.password
+ self.logger.info(json.dumps(self.env_dict, indent=8, sort_keys=True))
+
def verify_script_env(self):
# Import to log version