From cfb92a9a3473f2d163ec8f6453a55d32d113221e Mon Sep 17 00:00:00 2001 From: Vitalii Koriakov Date: Wed, 30 Jan 2019 11:02:05 +0200 Subject: Delete quorum method from old file. Added fixes for flake8 Change-Id: I2acf835a4cf7301c64c4c8a9423f78672cdf9aa4 Signed-off-by: Vitalii Koriakov --- .../glustolibs/gluster/gluster_base_class.py | 148 ++++++++++----------- .../glustolibs/gluster/nfs_ganesha_libs.py | 2 +- 2 files changed, 75 insertions(+), 75 deletions(-) (limited to 'glustolibs-gluster/glustolibs/gluster') diff --git a/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py b/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py index d5864c0b1..73a6c4c1e 100644 --- a/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py +++ b/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py @@ -1202,83 +1202,83 @@ class GlusterBlockBaseClass(GlusterBaseClass): """ # Get gluster block info from config file if g.config.get('gluster_block_args_info'): - cls.gluster_block_args_info = {} - blocks_count = 0 - each_block_info = g.config['gluster_block_args_info'] + cls.gluster_block_args_info = {} + blocks_count = 0 + each_block_info = g.config['gluster_block_args_info'] # for i, each_block_info in enumerate( # g.config['gluster_block_args_info']): # volname - block_on_volume = cls.volname - if each_block_info.get('volname'): - block_on_volume = each_block_info['volname'] - - # Block name - block_base_name = "gluster_block" - if each_block_info.get('blockname'): - block_base_name = each_block_info['blockname'] - - # servers - block_servers = cls.servers - if each_block_info.get('servers'): - block_servers = each_block_info['servers'] - if not filter(None, block_servers): - block_servers = cls.servers - - # Block size - block_size = "1GiB" - if each_block_info.get('size'): - block_size = each_block_info['size'] - - # HA - block_ha = 3 - if each_block_info.get('ha'): - block_ha = each_block_info['ha'] - - # auth - block_auth = None - if each_block_info.get('auth'): - block_auth = each_block_info['auth'] - - # prealloc - block_prealloc = None - if each_block_info.get('prealloc'): - block_prealloc = each_block_info['prealloc'] - - # ring-buffer - block_ring_buffer = None - if each_block_info.get('ring-buffer'): - block_ring_buffer = each_block_info['ring-buffer'] - - # Number of blocks - num_of_blocks = 1 - if each_block_info.get('num_of_blocks'): - num_of_blocks = int(each_block_info['num_of_blocks']) - - # for count in range(blocks_count,num_of_blocks +blocks_count): - for count in range(blocks_count, num_of_blocks): - # blocks_count = int(count) + i - - if block_ha: - selected_block_servers = random.sample(block_servers, - block_ha) - else: - selected_block_servers = random.choice(block_servers) - - block_name = "_".join([block_base_name, - str(count + 1)]) - - cls.gluster_block_args_info[block_name] = ( - {'volname': block_on_volume, - 'blockname': block_name, - 'servers': cls.get_ip_from_hostname( - selected_block_servers), - 'size': block_size, - 'ha': block_ha, - 'auth': block_auth, - 'prealloc': block_prealloc, - 'storage': None, - 'ring-buffer': block_ring_buffer} - ) + block_on_volume = cls.volname + if each_block_info.get('volname'): + block_on_volume = each_block_info['volname'] + + # Block name + block_base_name = "gluster_block" + if each_block_info.get('blockname'): + block_base_name = each_block_info['blockname'] + + # servers + block_servers = cls.servers + if each_block_info.get('servers'): + block_servers = each_block_info['servers'] + if not filter(None, block_servers): + block_servers = cls.servers + + # Block size + block_size = "1GiB" + if each_block_info.get('size'): + block_size = each_block_info['size'] + + # HA + block_ha = 3 + if each_block_info.get('ha'): + block_ha = each_block_info['ha'] + + # auth + block_auth = None + if each_block_info.get('auth'): + block_auth = each_block_info['auth'] + + # prealloc + block_prealloc = None + if each_block_info.get('prealloc'): + block_prealloc = each_block_info['prealloc'] + + # ring-buffer + block_ring_buffer = None + if each_block_info.get('ring-buffer'): + block_ring_buffer = each_block_info['ring-buffer'] + + # Number of blocks + num_of_blocks = 1 + if each_block_info.get('num_of_blocks'): + num_of_blocks = int(each_block_info['num_of_blocks']) + + # for count in range(blocks_count,num_of_blocks +blocks_count): + for count in range(blocks_count, num_of_blocks): + # blocks_count = int(count) + i + + if block_ha: + selected_block_servers = random.sample(block_servers, + block_ha) + else: + selected_block_servers = random.choice(block_servers) + + block_name = "_".join([block_base_name, + str(count + 1)]) + + cls.gluster_block_args_info[block_name] = ( + {'volname': block_on_volume, + 'blockname': block_name, + 'servers': cls.get_ip_from_hostname( + selected_block_servers), + 'size': block_size, + 'ha': block_ha, + 'auth': block_auth, + 'prealloc': block_prealloc, + 'storage': None, + 'ring-buffer': block_ring_buffer} + ) for key in cls.gluster_block_args_info.keys(): value = cls.gluster_block_args_info[key] diff --git a/glustolibs-gluster/glustolibs/gluster/nfs_ganesha_libs.py b/glustolibs-gluster/glustolibs/gluster/nfs_ganesha_libs.py index fd7d8f4a5..863ba40d7 100644 --- a/glustolibs-gluster/glustolibs/gluster/nfs_ganesha_libs.py +++ b/glustolibs-gluster/glustolibs/gluster/nfs_ganesha_libs.py @@ -142,7 +142,7 @@ class NfsGaneshaClusterSetupClass(GlusterBaseClass): if is_nfs_ganesha_cluster_in_healthy_state( cls.servers_in_nfs_ganesha_cluster[0]): - g.log.info("Nfs-ganesha Cluster exists is in healthy state") + g.log.info("Nfs-ganesha Cluster exists is in healthy state") else: raise ExecutionError("Nfs-ganesha Cluster setup Failed") -- cgit