From: Stephan Müller Date: Wed, 25 Apr 2018 12:25:06 +0000 (+0200) Subject: mgr/dashboard: Pool API: app_metadata is now a str list X-Git-Tag: v14.0.1~716^2~7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b04699c61296fc4d0f8c5661b3880da38e50ca0;p=ceph.git mgr/dashboard: Pool API: app_metadata is now a str list Signed-off-by: Stephan Müller --- diff --git a/qa/tasks/mgr/dashboard/test_pool.py b/qa/tasks/mgr/dashboard/test_pool.py index 729519bbf1d7..a8b71ea2921a 100644 --- a/qa/tasks/mgr/dashboard/test_pool.py +++ b/qa/tasks/mgr/dashboard/test_pool.py @@ -108,7 +108,7 @@ class PoolTest(DashboardTestCase): elif k == 'application_metadata': self.assertIsInstance(pool[k], list) self.assertEqual(pool[k], - data['application_metadata'].split(',')) + data['application_metadata']) elif k == 'pool': self.assertEqual(pool['pool_name'], v) elif k in ['compression_mode', 'compression_algorithm']: @@ -138,7 +138,7 @@ class PoolTest(DashboardTestCase): 'pool': 'dashboard_pool1', 'pg_num': '10', 'pool_type': 'replicated', - 'application_metadata': 'rbd', + 'application_metadata': ['rbd', 'sth'], }, { 'pool': 'dashboard_pool2', 'pg_num': '10', diff --git a/src/pybind/mgr/dashboard/controllers/pool.py b/src/pybind/mgr/dashboard/controllers/pool.py index 6dd3d3618207..81cb26b8793c 100644 --- a/src/pybind/mgr/dashboard/controllers/pool.py +++ b/src/pybind/mgr/dashboard/controllers/pool.py @@ -77,8 +77,9 @@ class Pool(RESTController): val='true') if application_metadata: - for app in application_metadata.split(','): - CephService.send_command('mon', 'osd pool application enable', pool=pool, app=app) + for app in application_metadata: + CephService.send_command('mon', 'osd pool application enable', pool=pool, app=app, + force='--yes-i-really-mean-it') for key, value in kwargs.items(): CephService.send_command('mon', 'osd pool set', pool=pool, var=key, val=value)