chore(limits): modify limits unit verification

Author: duanhongyi

rootfs/api/serializers.py

@@ -23,15 +23,12 @@
 
 PROCTYPE_MATCH = re.compile(r'^(?P<type>[a-z0-9]+(\-[a-z0-9]+)*)$')
 PROCTYPE_MISMATCH_MSG = "Process types can only contain lowercase alphanumeric characters"
-MEMLIMIT_MATCH = re.compile(
-    r'^(?P<mem>([0-9]+(MB|KB|GB|[BKMG])|0))$', re.IGNORECASE)
-CPUSHARE_MATCH = re.compile(
-    r'^(?P<cpu>([-+]?[0-9]*\.?[0-9]+[m]?))$')
+MEMLIMIT_MATCH = re.compile(r'^(?P<mem>([1-9][0-9]*[mgMG]))$', re.IGNORECASE)
+CPUSHARE_MATCH = re.compile(r'^(?P<cpu>([-+]?[1-9][0-9]*[m]?))$')
 TAGVAL_MATCH = re.compile(r'^(?:[a-zA-Z\d][-\.\w]{0,61})?[a-zA-Z\d]$')
 CONFIGKEY_MATCH = re.compile(r'^[a-z_]+[a-z0-9_]*$', re.IGNORECASE)
 TERMINATION_GRACE_PERIOD_MATCH = re.compile(r'^[0-9]*$')
-VOLUME_SIZE_MATCH = re.compile(
-    r'^(?P<mem>([0-9]+(MB|KB|GB|[BKMG])|0))$', re.IGNORECASE)
+VOLUME_SIZE_MATCH = re.compile(r'^(?P<volume>([1-9][0-9]*[mgMG]))$', re.IGNORECASE)
 VOLUME_PATH = re.compile(r'^\/(\w+\/?)+$', re.IGNORECASE)
 
 PROBE_SCHEMA = {
@@ -292,7 +289,7 @@ def validate_memory(data):
             if not re.match(MEMLIMIT_MATCH, str(value)):
                 raise serializers.ValidationError(
                     "Memory limit format: <number><unit>, "
-                    "where unit = B, K, M or G")
+                    "where unit = M or G")
 
         return data
 

rootfs/api/tests/test_limits.py

@@ -27,25 +27,30 @@ def tearDown(self):
 
     def test_memlimit_regex(self, mock_requests):
         """Tests the regex for unit format used by "drycc limits:set --memory=<limit>"."""
-        self.assertTrue(MEMLIMIT_MATCH.match("0"))
-        self.assertTrue(MEMLIMIT_MATCH.match("200GB"))
-        self.assertTrue(MEMLIMIT_MATCH.match("20MB"))
-        self.assertTrue(MEMLIMIT_MATCH.match("20gb"))
-        self.assertTrue(MEMLIMIT_MATCH.match("0m"))
+        self.assertTrue(MEMLIMIT_MATCH.match("2G"))
+        self.assertTrue(MEMLIMIT_MATCH.match("2M"))
+        self.assertTrue(MEMLIMIT_MATCH.match("20G"))
+        self.assertTrue(MEMLIMIT_MATCH.match("20M"))
+        self.assertTrue(MEMLIMIT_MATCH.match("2g"))
+        self.assertTrue(MEMLIMIT_MATCH.match("2m"))
+        self.assertTrue(MEMLIMIT_MATCH.match("20g"))
+        self.assertTrue(MEMLIMIT_MATCH.match("20m"))
+        self.assertFalse(MEMLIMIT_MATCH.match("0m"))
         self.assertFalse(MEMLIMIT_MATCH.match("20MK"))
         self.assertFalse(MEMLIMIT_MATCH.match("10"))
         self.assertFalse(MEMLIMIT_MATCH.match("20gK"))
         self.assertFalse(MEMLIMIT_MATCH.match("mb"))
+        self.assertFalse(MEMLIMIT_MATCH.match("0"))
 
     def test_cpushare_regex(self, mock_requests):
         """Tests the regex for unit format used by "drycc limits:set --cpu=<limit>"."""
-        self.assertTrue(CPUSHARE_MATCH.match("0"))
         self.assertTrue(CPUSHARE_MATCH.match("500m"))
-        self.assertTrue(CPUSHARE_MATCH.match("0.5"))
-        self.assertTrue(CPUSHARE_MATCH.match(".123"))
-        self.assertTrue(CPUSHARE_MATCH.match("1.123"))
-        self.assertTrue(CPUSHARE_MATCH.match("200m"))
-        self.assertTrue(CPUSHARE_MATCH.match("0"))
+        self.assertTrue(CPUSHARE_MATCH.match("2"))
+        self.assertTrue(CPUSHARE_MATCH.match("12"))
+        self.assertFalse(CPUSHARE_MATCH.match("0.5"))
+        self.assertFalse(CPUSHARE_MATCH.match(".123"))
+        self.assertFalse(CPUSHARE_MATCH.match("1.123"))
+        self.assertFalse(CPUSHARE_MATCH.match("0"))
         self.assertFalse(CPUSHARE_MATCH.match("20MK"))
         self.assertFalse(CPUSHARE_MATCH.match("20gK"))
         self.assertFalse(CPUSHARE_MATCH.match("m"))