RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 17:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

cephadm: consolidate default image logic

Browse Source 
Merge the _parse_args() logic into @default_image.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2020-03-18 15:04:01 -05:00
parent 8d8e09a5f1
commit a8d7f871b1
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cephadm/cephadm
View File

@ -952,7 +952,14 @@ def default_image(func):
@wraps(func)
def _default_image():
if not args.image:
args.image = DEFAULT_IMAGE
if 'name' in args and args.name:
type_ = args.name.split('.', 1)[0]
if type_ in Monitoring.components:
args.image = Monitoring.components[type_]['image']
if not args.image:
args.image = os.environ.get('CEPHADM_IMAGE')
if not args.image:
args.image = DEFAULT_IMAGE
return func()
return _default_image
@ -2445,6 +2452,7 @@ def extract_uid_gid_monitoring(daemon_type):
return uid, gid
@default_image
def command_deploy():
# type: () -> None
(daemon_type, daemon_id) = args.name.split('.', 1)
@ -4208,17 +4216,7 @@ def _get_parser():
def _parse_args(av):
parser = _get_parser()
args = parser.parse_args(av)
if not args.image:
if 'name' in args and args.name:
type_ = args.name.split('.', 1)[0]
if type_ in Monitoring.components:
args.image = Monitoring.components[type_]['image']
if not args.image:
args.image = os.environ.get('CEPHADM_IMAGE')
return args
return parser.parse_args(av)
if __name__ == "__main__":
# allow argv to be injected

5
src/cephadm/tests/test_cephadm.py
View File

@ -21,11 +21,6 @@ class TestCephAdm(object):
args = cd._parse_args(['--image', 'foo', 'version'])
assert args.image == 'foo'
@mock.patch.dict(os.environ,{'CEPHADM_IMAGE':'bar'})
def test__get_parser_image_with_envvar(self):
args = cd._parse_args(['version'])
assert args.image == 'bar'
def test_CustomValidation(self):
assert cd._parse_args(['deploy', '--name', 'mon.a', '--fsid', 'fsid'])