From 00d876aea1a92c8aaf2be2a2e95bd42d3985335a Mon Sep 17 00:00:00 2001
From: meow <ahmedbilal96@gmail.com>
Date: Fri, 10 Jan 2020 16:39:40 +0500
Subject: [PATCH] Do not break if client section/or OTP creds missing from conf
 file

---
 scripts/uncloud            |  2 --
 uncloud/cli/helper.py      | 17 +++++++++++++----
 uncloud/cli/main.py        | 10 +++++-----
 uncloud/common/settings.py |  6 ++----
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/scripts/uncloud b/scripts/uncloud
index 3690ad9..8aac240 100755
--- a/scripts/uncloud
+++ b/scripts/uncloud
@@ -73,8 +73,6 @@ if __name__ == '__main__':
         except UncloudException as err:
             logger.error(err)
             sys.exit(1)
-        except etcd3.exceptions.ConnectionFailedError as err:
-            logger.error("Cannot connect to etcd")
         except Exception as err:
             logger.exception(err)
             sys.exit(1)
diff --git a/uncloud/cli/helper.py b/uncloud/cli/helper.py
index 0495fac..3c63073 100644
--- a/uncloud/cli/helper.py
+++ b/uncloud/cli/helper.py
@@ -10,10 +10,19 @@ from uncloud.common.settings import settings
 
 def get_otp_parser():
     otp_parser = argparse.ArgumentParser('otp')
-    otp_parser.add_argument('--name', default=settings['client']['name'])
-    otp_parser.add_argument('--realm', default=settings['client']['realm'])
-    otp_parser.add_argument('--seed', type=get_token, default=settings['client']['seed'],
-                            dest='token', metavar='SEED')
+    try:
+        name = settings['client']['name']
+        realm = settings['client']['realm']
+        seed = settings['client']['seed']
+    except Exception:
+        otp_parser.add_argument('--name', required=True)
+        otp_parser.add_argument('--realm', required=True)
+        otp_parser.add_argument('--seed', required=True, type=get_token, dest='token', metavar='SEED')
+    else:
+        otp_parser.add_argument('--name', default=name)
+        otp_parser.add_argument('--realm', default=realm)
+        otp_parser.add_argument('--seed', default=seed, type=get_token, dest='token', metavar='SEED')
+
     return otp_parser
 
 
diff --git a/uncloud/cli/main.py b/uncloud/cli/main.py
index 7f5e367..9a42497 100644
--- a/uncloud/cli/main.py
+++ b/uncloud/cli/main.py
@@ -12,12 +12,12 @@ for component in ['user', 'host', 'image', 'network', 'vm']:
     subparser.add_parser(name=parser.prog, parents=[parser])
 
 
-def main(**kwargs):
-    if not kwargs['subcommand']:
+def main(arguments):
+    if not arguments['subcommand']:
         arg_parser.print_help()
     else:
-        name = kwargs.pop('subcommand')
-        kwargs.pop('debug')
+        name = arguments.pop('subcommand')
+        arguments.pop('debug')
         mod = importlib.import_module('uncloud.cli.{}'.format(name))
         _main = getattr(mod, 'main')
-        _main(**kwargs)
+        _main(**arguments)
diff --git a/uncloud/common/settings.py b/uncloud/common/settings.py
index 47ad5a7..0d524a7 100644
--- a/uncloud/common/settings.py
+++ b/uncloud/common/settings.py
@@ -99,12 +99,10 @@ class Settings(object):
     def read_config_file_values(self, config_file):
         try:
             # Trying to read configuration file
-            with open(config_file, 'r') as config_file_handle:
+            with open(config_file) as config_file_handle:
                 self.config_parser.read_file(config_file_handle)
         except FileNotFoundError:
-            sys.exit(
-                'Configuration file {} not found!'.format(config_file)
-            )
+            sys.exit('Configuration file {} not found!'.format(config_file))
         except Exception as err:
             logger.exception(err)
             sys.exit('Error occurred while reading configuration file')