diff options
| author | Valerii Ponomarov <vponomar@redhat.com> | 2018-02-13 21:48:53 +0200 |
|---|---|---|
| committer | Valerii Ponomarov <vponomar@redhat.com> | 2018-02-20 13:50:56 +0200 |
| commit | 647efcde43e289f66dbb30941002b4637f092cc8 (patch) | |
| tree | 3707657b0484d29d816974e09c37a413afe78db7 /cns-libs/cnslibs/common/heketi_libs.py | |
| parent | f9ac904f60e4116dedd2fa03359e1a8fa5912589 (diff) | |
Add support of heketi_cli_user and heketi_cli_key
Just define following config options:
cns:
heketi_config:
heketi_cli_user: 'admin'
heketi_cli_key: 'some_secret_admin_key'
To make heketi tests use specific creds for auth.
Change-Id: I60f6d6e3922de6602d8fd39656132a23f18ffc8c
Diffstat (limited to 'cns-libs/cnslibs/common/heketi_libs.py')
| -rw-r--r-- | cns-libs/cnslibs/common/heketi_libs.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/cns-libs/cnslibs/common/heketi_libs.py b/cns-libs/cnslibs/common/heketi_libs.py index 79fcd69a..5101ae25 100644 --- a/cns-libs/cnslibs/common/heketi_libs.py +++ b/cns-libs/cnslibs/common/heketi_libs.py @@ -43,16 +43,17 @@ class HeketiBaseClass(unittest.TestCase): cls.executor = g.config['cns']['executor'] cls.executor_user = g.config['cns']['executor_user'] cls.executor_port = g.config['cns']['executor_port'] - cls.heketi_client_node = (g.config['cns']['heketi_config'] - ['heketi_client_node']) - cls.heketi_server_url = (g.config['cns']['heketi_config'] - ['heketi_server_url']) + + heketi_config = g.config['cns']['heketi_config'] + cls.heketi_client_node = heketi_config['heketi_client_node'] + cls.heketi_server_url = heketi_config['heketi_server_url'] + cls.heketi_cli_user = heketi_config['heketi_cli_user'] + cls.heketi_cli_key = heketi_config['heketi_cli_key'] cls.gluster_servers = g.config['gluster_servers'].keys() cls.gluster_servers_info = g.config['gluster_servers'] cls.topo_info = g.config['cns']['trusted_storage_pool_list'] - cls.heketi_ssh_key = g.config['cns']['heketi_config']['heketi_ssh_key'] - cls.heketi_config_file = (g.config['cns']['heketi_config'] - ['heketi_config_file']) + cls.heketi_ssh_key = heketi_config['heketi_ssh_key'] + cls.heketi_config_file = heketi_config['heketi_config_file'] cls.heketi_volume = { 'size': g.config['cns']['heketi_volume']['size'], 'name': g.config['cns']['heketi_volume']['name'], @@ -181,7 +182,10 @@ class HeketiClientSetupBaseClass(HeketiBaseClass): # Exports heketi cli server heketi_url = cls.heketi_server_url - if not export_heketi_cli_server(cls.heketi_client_node, - heketi_cli_server=heketi_url): + if not export_heketi_cli_server( + cls.heketi_client_node, + heketi_cli_server=heketi_url, + heketi_cli_user=cls.heketi_cli_user, + heketi_cli_key=cls.heketi_cli_key): raise ExecutionError("Failed to export heketi cli server on %s" % cls.heketi_client_node) |