From: Ricardo Dias <rdias@suse.com>
Date: Mon, 28 Jan 2019 17:06:44 +0000 (+0000)
Subject: mgr/dashboard: ganesha: add 'att_expiration_time' support
X-Git-Tag: v14.1.0~199^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e6a9adc3e4033a6b2602a64b53321e986c276dbe;p=ceph.git

mgr/dashboard: ganesha: add 'att_expiration_time' support

Signed-off-by: Ricardo Dias <rdias@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/services/ganesha.py b/src/pybind/mgr/dashboard/services/ganesha.py
index 4b3ac966f0be..46206e026a09 100644
--- a/src/pybind/mgr/dashboard/services/ganesha.py
+++ b/src/pybind/mgr/dashboard/services/ganesha.py
@@ -548,8 +548,9 @@ class Client(object):
 class Export(object):
     # pylint: disable=R0902
     def __init__(self, export_id, path, fsal, cluster_id, daemons, pseudo=None,
-                 tag=None, access_type=None, squash=None, protocols=None,
-                 transports=None, clients=None):
+                 tag=None, access_type=None, squash=None,
+                 attr_expiration_time=None,
+                 protocols=None, transports=None, clients=None):
         self.export_id = export_id
         self.path = GaneshaConf.format_path(path)
         self.fsal = fsal
@@ -559,6 +560,10 @@ class Export(object):
         self.tag = tag
         self.access_type = access_type
         self.squash = GaneshaConf.format_squash(squash)
+        if attr_expiration_time is None:
+            self.attr_expiration_time = 0
+        else:
+            self.attr_expiration_time = attr_expiration_time
         self.protocols = set([GaneshaConf.format_protocol(p) for p in protocols])
         self.transports = set(transports)
         self.clients = clients
@@ -636,12 +641,15 @@ class Export(object):
                    export_block.get('tag', None),
                    export_block.get('access_type', defaults['access_type']),
                    export_block.get('squash', defaults['squash']),
+                   export_block.get('attr_expiration_time', None),
+                   export_block.get('security_label', False),
                    protocols,
                    transports,
                    [Client.from_client_block(client)
                     for client in client_blocks])
 
     def to_export_block(self, defaults):
+        # pylint: disable=too-many-branches
         result = {
             'block_name': 'EXPORT',
             'export_id': self.export_id,
@@ -656,6 +664,8 @@ class Export(object):
             result['access_type'] = self.access_type
         if 'squash' not in defaults or self.squash != defaults['squash']:
             result['squash'] = self.squash
+        if self.fsal.name == 'CEPH':
+            result['attr_expiration_time'] = self.attr_expiration_time
         if 'protocols' not in defaults:
             result['protocols'] = [p for p in self.protocols]
         else:
@@ -679,7 +689,7 @@ class Export(object):
         return result
 
     @classmethod
-    def from_dict(cls, export_id, ex_dict):
+    def from_dict(cls, export_id, ex_dict, old_export=None):
         return cls(export_id,
                    ex_dict['path'],
                    FSal.from_dict(ex_dict['fsal']),
@@ -689,6 +699,7 @@ class Export(object):
                    ex_dict['tag'],
                    ex_dict['access_type'],
                    ex_dict['squash'],
+                   old_export.attr_expiration_time if old_export else None,
                    ex_dict['protocols'],
                    ex_dict['transports'],
                    [Client.from_dict(client) for client in ex_dict['clients']])
@@ -929,7 +940,7 @@ class GaneshaConf(object):
             return None
         old_export = self.exports[ex_dict['export_id']]
         del self.exports[ex_dict['export_id']]
-        export = Export.from_dict(ex_dict['export_id'], ex_dict)
+        export = Export.from_dict(ex_dict['export_id'], ex_dict, old_export)
         self._save_export(export)
         self.exports[export.export_id] = export
         return old_export
diff --git a/src/pybind/mgr/dashboard/tests/test_ganesha.py b/src/pybind/mgr/dashboard/tests/test_ganesha.py
index 3a677af1cb7e..f8b95ea817dc 100644
--- a/src/pybind/mgr/dashboard/tests/test_ganesha.py
+++ b/src/pybind/mgr/dashboard/tests/test_ganesha.py
@@ -172,6 +172,7 @@ EXPORT
         self.assertEqual(export.clients[1].squash, "all_squash")
         self.assertEqual(export.clients[1].access_type, "RO")
         self.assertEqual(export.cluster_id, '_default_')
+        self.assertEqual(export.attr_expiration_time, 0)
 
     def test_export_parser_2(self):
         blocks = GaneshaConfParser(self.export_2).parse()
@@ -240,6 +241,7 @@ EXPORT
         self.assertEqual(export.clients[1].addresses, ["192.168.0.0/16"])
         self.assertEqual(export.clients[1].squash, "all_squash")
         self.assertEqual(export.clients[1].access_type, "RO")
+        self.assertEqual(export.attr_expiration_time, 0)
 
         # export_id = 2 asserts
         export = exports[2]
@@ -357,6 +359,7 @@ EXPORT
         self.assertEqual(export.clients[1].access_type, "RO")
         self.assertEqual(export.daemons, {"nodeb", "nodea"})
         self.assertEqual(export.cluster_id, '_default_')
+        self.assertEqual(export.attr_expiration_time, 0)
 
         export = Export.from_dict(2, {
             'daemons': ['nodea'],
@@ -427,6 +430,7 @@ EXPORT
         self.assertEqual(export.clients[1].access_type, "RO")
         self.assertEqual(export.daemons, {"nodeb", "nodea"})
         self.assertEqual(export.cluster_id, '_default_')
+        self.assertEqual(export.attr_expiration_time, 0)
 
         # export_id = 2 asserts
         export = exports[2]
@@ -622,3 +626,4 @@ EXPORT
         self.assertEqual(len(export.clients), 0)
         self.assertEqual(export.daemons, {"nodeb", "nodea"})
         self.assertEqual(export.cluster_id, '_default_')
+        self.assertEqual(export.attr_expiration_time, 0)