RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/nfs: lift generic indentation function to file level

Browse Source 
Tucking a private method away as a staticmethod makes it harder to reuse
and less obvious that it can be resused.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2022-03-04 14:40:33 -05:00
parent bc895b6a7f
commit d791d5c229
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pybind/mgr/nfs/ganesha_conf.py
View File

@ -10,6 +10,13 @@ if TYPE_CHECKING:
from nfs.module import Module
def _indentation(depth: int, size: int = 4) -> str:
conf_str = ""
for _ in range(0, depth * size):
conf_str += " "
return conf_str
class RawBlock():
def __init__(self, block_name: str, blocks: List['RawBlock'] = [], values: Dict[str, Any] = {}):
if not values: # workaround mutable default argument
@ -134,13 +141,6 @@ class GaneshaConfParser:
blocks.append(self.parse_block_or_section())
return blocks
@staticmethod
def _indentation(depth: int, size: int = 4) -> str:
conf_str = ""
for _ in range(0, depth * size):
conf_str += " "
return conf_str
@staticmethod
def write_block_body(block: RawBlock, depth: int = 0) -> str:
def format_val(key: str, val: str) -> str:
@ -159,7 +159,7 @@ class GaneshaConfParser:
for key, val in block.values.items():
if val is not None:
conf_str += GaneshaConfParser._indentation(depth)
conf_str += _indentation(depth)
conf_str += '{} = {};\n'.format(key, format_val(key, val))
return conf_str
@ -169,11 +169,11 @@ class GaneshaConfParser:
return '%url "{}"\n\n'.format(block.values['value'])
conf_str = ""
conf_str += GaneshaConfParser._indentation(depth)
conf_str += _indentation(depth)
conf_str += format(block.block_name)
conf_str += " {\n"
conf_str += GaneshaConfParser.write_block_body(block, depth + 1)
conf_str += GaneshaConfParser._indentation(depth)
conf_str += _indentation(depth)
conf_str += "}\n"
return conf_str