diff options
Diffstat (limited to 'testapi/testapi-client/testapiclient/main.py')
| -rw-r--r-- | testapi/testapi-client/testapiclient/main.py | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/testapi/testapi-client/testapiclient/main.py b/testapi/testapi-client/testapiclient/main.py index dfa6284..22a8fbd 100644 --- a/testapi/testapi-client/testapiclient/main.py +++ b/testapi/testapi-client/testapiclient/main.py @@ -2,9 +2,8 @@ import sys from cliff import app from cliff import commandmanager -import requests -from testapiclient.utils import user +from testapiclient.utils import clientmanager class TestAPIClient(app.App): @@ -16,13 +15,29 @@ class TestAPIClient(app.App): command_manager=commandmanager.CommandManager('testapi'), deferred_help=True, ) - user.User.session = requests.Session() + + def build_option_parser(self, description, version, argparse_kwargs=None): + self.LOG.debug('build_option_parser') + parser = super(TestAPIClient, self).build_option_parser( + description, + version, + argparse_kwargs) + parser.add_argument('-u', + type=str, + help='Username for authentication') + parser.add_argument('-p', + type=str, + help='Password for authentication') + return parser def initialize_app(self, argv): self.LOG.debug('initialize_app') + self.client_manager = clientmanager.ClientManager(self.options) def prepare_to_run_command(self, cmd): self.LOG.debug('prepare_to_run_command %s', cmd.__class__.__name__) + if self.options.u: + self.client_manager.auth() def clean_up(self, cmd, result, err): self.LOG.debug('clean_up %s', cmd.__class__.__name__) @@ -31,8 +46,8 @@ class TestAPIClient(app.App): def main(argv=sys.argv[1:]): - myapp = TestAPIClient() - return myapp.run(argv) + client = TestAPIClient() + return client.run(argv) if __name__ == '__main__': |