mgr/dashboard: Pool API: app_metadata is now a str list

Signed-off-by: Stephan Müller <smueller@suse.com>

diff --git a/qa/tasks/mgr/dashboard/test_pool.py b/qa/tasks/mgr/dashboard/test_pool.py
index 729519bbf1d76095ff58f009034e2cd312f76008..a8b71ea2921a9d025255324c67eaf30ad32d90e6 100644 (file)
--- 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 6dd3d3618207bd4cf432f6f11c2397deb6e04d4a..81cb26b8793c3d5fecfcfa6134ff4758e2ae0a25 100644 (file)
--- 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)