Minimal fix for audit storage config. (#13686)

Fix divide by zero issue.
Fix typo and flake8 issue.
Update CI tests to include disable of quota and reservation.

src/middlewared/middlewared/plugins/audit/audit.py

@@ -382,9 +382,10 @@ def cleanup_reports(self):
 
     @private
     async def validate_local_storage(self, new, old, verrors):
-        new_volsize = new['quota'] * _GIB
-        used = new['space']['used_by_dataset'] + new['space']['used_by_snapshots']
-        if old['quota'] != new['quota']:
+        # A quota of `0` == `disable`
+        if new['quota'] and (old['quota'] != new['quota']):
+            new_volsize = new['quota'] * _GIB
+            used = new['space']['used_by_dataset'] + new['space']['used_by_snapshots']
             if used / new_volsize > new['quota_fill_warning'] / 100:
                 verrors.add(
                     'audit_update.quota',
@@ -410,10 +411,12 @@ async def update_audit_dataset(self, new):
 
         payload = {}
         if new['quota'] != old_quota / _GIB:
-            payload['refquota'] = {'parsed': f'{new["quota"]}G'}
+            quota_val = "none" if new['quota'] == 0 else f'{new["quota"]}G'
+            payload['refquota'] = {'parsed': quota_val}
 
         if new['reservation'] != old_reservation / _GIB:
-            payload['refreservation'] = {'parsed': f'{new["reservation"]}G'}
+            reservation_val = "none" if new['reservation'] == 0 else f'{new["reservation"]}G'
+            payload['refreservation'] = {'parsed': reservation_val}
 
         if new["quota_fill_warning"] != old_warn:
             payload[QUOTA_WARN] = {'parsed': str(new['quota_fill_warning'])}

src/middlewared/middlewared/plugins/audit/utils.py

@@ -118,7 +118,7 @@ def parse_query_filters(
             if not services_to_check:
                 # These filters are guaranteed to have no results. Bail
                 # early and let caller handle it.
-                break;
+                break
 
         if skip_sql_filters:
             # User has manually specified to pass all these filters to datastore
@@ -159,7 +159,7 @@ def requires_python_filtering(
         # Field is being selected that may not be safe for SQL select
         for entry in to_investigate:
             # Selecting subkey in entry is not currently supported
-            if '.' in entry or isiinstance(entry, tuple):
+            if '.' in entry or isinstance(entry, tuple):
                 return True
 
     if len(services) > 1:

tests/api2/test_audit_basic.py

@@ -36,6 +36,21 @@ def initialize_for_smb_tests(request):
                 yield {'dataset': ds, 'share': s, 'user': u}
 
 
+@pytest.fixture(scope='module')
+def audit_config(request):
+    defaults = {
+        'retention': 7,
+        'quota': 0,
+        'reservation': 0,
+        'quota_fill_warning': 80,
+        'quota_fill_critical': 95
+    }
+    try:
+        yield defaults
+    finally:
+        call('audit.update', defaults)
+
+
 def test_audit_config_defaults(request):
     config = call('audit.config')
     for key in [
@@ -61,7 +76,7 @@ def test_audit_config_defaults(request):
     assert 'SMB' in config['enabled_services']
 
 
-def test_audit_config_updates(request):
+def test_audit_config_updates(audit_config):
     """
     This test just validates that setting values has expected results.
     """
@@ -87,6 +102,16 @@ def test_audit_config_updates(request):
     assert new_config['quota_fill_warning'] == 70
     assert new_config['quota_fill_critical'] == 80
 
+    # Test disable reservation
+    new_config = call('audit.update', {'reservation': 0})
+    assert new_config['reservation'] == 0
+
+    # Test disable quota
+    new_config = call('audit.update', {'quota': 0})
+    assert new_config['quota'] == 0
+
+    # TODO: Get values from zfs.dataset.query
+
 
 @pytest.mark.dependency(name="AUDIT_OPS_PERFORMED")
 def test_audit_query(initialize_for_smb_tests):