Update vlan regex to allow more vlans or vlanranges separated by commas (#49)

* Update vlan regex to allow more vlans or vlanranges separated by commas

* Bumpversion to 1.10.3

* Fix code formatting

Author: tjeerddie

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.10.2
+current_version = 1.10.3
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?

nwastdlib/__init__.py

@@ -13,7 +13,7 @@
 #
 """The NWA-stdlib module."""
 
-__version__ = "1.10.2"
+__version__ = "1.10.3"
 
 from nwastdlib.f import const, identity
 

nwastdlib/vlans.py

@@ -25,7 +25,7 @@
 from pydantic.json_schema import JsonSchemaValue
 from pydantic_core import CoreSchema, SchemaSerializer, core_schema
 
-VLAN_RANGE_JSON_SCHEMA_REGEX = r"^(?:([1-9]|[1-9]\d{1,2}|[1-4]\d{3})(?:-(?:[1-9]|[1-9]\d{1,2}|[1-4]\d{3}))?)$"
+VLAN_RANGE_JSON_SCHEMA_REGEX = r"^(?:[1-9]\d{0,2}|[1-4]\d{3})(?:-(?:[1-9]\d{0,2}|[1-4]\d{3}))?(?:\s*,\s*(?:[1-9]\d{0,2}|[1-4]\d{3})(?:-(?:[1-9]\d{0,2}|[1-4]\d{3}))?)*$"
 
 
 def to_ranges(i: Iterable[int]) -> Iterable[range]:

tests/test_vlans.py

@@ -317,13 +317,17 @@ def test_vlan_rejected_by_schema(vlan, vr_schema):
         jsonschema.validate({"vr": str(vlan)}, vr_schema)
 
 
-@pytest.mark.parametrize("vlanrange", ["1-1", "9-9", "49-59", "99-300", "999-1001", "3999-4999"])
+@pytest.mark.parametrize(
+    "vlanrange", ["1-1", "9-9", "49-59", "99-300", "999-1001", "3999-4999", "10,20,50-100", "10, 20, 50-100"]
+)
 def test_vlan_ranges_allowed_by_schema(vlanrange, vr_schema):
     """Test vlan ranges which should be allowed by the JSON Schema."""
     assert jsonschema.validate({"vr": vlanrange}, vr_schema) is None
 
 
-@pytest.mark.parametrize("vlanrange", ["-1", "-10-0", "0-1", "4999-5000", "5000-5002"])
+@pytest.mark.parametrize(
+    "vlanrange", ["-1", "-10-0", "0-1", "4999-5000", "5000-5002", "10,20,5000-5002", "10, 20, 5000-5002"]
+)
 def test_vlan_ranges_rejected_by_schema(vlanrange, vr_schema):
     """Test vlan ranges which should be rejected by the JSON Schema."""
     with pytest.raises(jsonschema.ValidationError):