From 1d5f63ecc5e047eac548f85b819d3ea3f5b2215c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 28 Jun 2021 15:51:05 -0400 Subject: [PATCH] mgr/nfs: allow 'nfs export apply' to take a list of exports Signed-off-by: Sage Weil --- src/pybind/mgr/nfs/export.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/nfs/export.py b/src/pybind/mgr/nfs/export.py index 497756895ca..fe557551195 100644 --- a/src/pybind/mgr/nfs/export.py +++ b/src/pybind/mgr/nfs/export.py @@ -392,9 +392,24 @@ class ExportMgr: try: if not export_config: raise NFSInvalidOperation("Empty Config!!") - new_export = json.loads(export_config) + j = json.loads(export_config) # check export type - return self._apply_export(cluster_id, new_export) + if isinstance(j, list): + ret, out, err = (0, '', '') + for export in j: + try: + r, o, e = self._apply_export(cluster_id, export) + except Exception as e: + r, o, e = exception_handler(e, f'Failed to apply export: {e}') + if r: + ret = r + if o: + out += o + '\n' + if e: + err += e + '\n' + return ret, out, err + else: + return self._apply_export(cluster_id, j) except NotImplementedError: return 0, " Manual Restart of NFS PODS required for successful update of exports", "" except Exception as e: -- 2.39.5