From: Sage Weil <sage@newdream.net>
Date: Mon, 28 Jun 2021 19:51:05 +0000 (-0400)
Subject: mgr/nfs: allow 'nfs export apply' to take a list of exports
X-Git-Tag: v16.2.7~116^2~51
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f09f2b3b4a359b5b43ef44b5fc11cbc0a5bb75b9;p=ceph.git

mgr/nfs: allow 'nfs export apply' to take a list of exports

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 1d5f63ecc5e047eac548f85b819d3ea3f5b2215c)
---

diff --git a/src/pybind/mgr/nfs/export.py b/src/pybind/mgr/nfs/export.py
index 497756895ca2..fe5575511951 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: