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 validate access type method to file level function

Browse Source 
More reusable across the entire file and made private, shrinking
the public surface area of the type.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2022-04-21 15:27:40 -04:00
parent 2587c29c8a
commit 3d17b9ee74
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,15 @@ def _validate_squash(squash: str) -> None:
)
def _validate_access_type(access_type: str) -> None:
valid_access_types = ['rw', 'ro', 'none']
if not isinstance(access_type, str) or access_type.lower() not in valid_access_types:
raise NFSInvalidOperation(
f'{access_type} is invalid, valid access type are'
f'{valid_access_types}'
)
class RawBlock():
def __init__(self, block_name: str, blocks: List['RawBlock'] = [], values: Dict[str, Any] = {}):
if not values: # workaround mutable default argument
@ -440,15 +449,6 @@ class Export:
'clients': [client.to_dict() for client in self.clients]
}
@staticmethod
def validate_access_type(access_type: str) -> None:
valid_access_types = ['rw', 'ro', 'none']
if not isinstance(access_type, str) or access_type.lower() not in valid_access_types:
raise NFSInvalidOperation(
f'{access_type} is invalid, valid access type are'
f'{valid_access_types}'
)
def validate(self, mgr: 'Module') -> None:
if not isabs(self.pseudo) or self.pseudo == "/":
raise NFSInvalidOperation(
@ -457,7 +457,7 @@ class Export:
)
_validate_squash(self.squash)
self.validate_access_type(self.access_type)
_validate_access_type(self.access_type)
if not isinstance(self.security_label, bool):
raise NFSInvalidOperation('security_label must be a boolean value')
@ -475,7 +475,7 @@ class Export:
if client.squash:
_validate_squash(client.squash)
if client.access_type:
self.validate_access_type(client.access_type)
_validate_access_type(client.access_type)
if self.fsal.name == NFS_GANESHA_SUPPORTED_FSALS[0]:
fs = cast(CephFSFSAL, self.fsal)