refactor: Add labels/rd parameters to Label/IPVPN.from_cidr()

Phase 0 of packed-bytes-first pattern for INET/Label/IPVPN chain.

- Label.from_cidr() now accepts optional `labels` parameter
- IPVPN.from_cidr() now accepts optional `labels` and `rd` parameters
- Updated ~44 tests to use parameter pattern instead of setters
- Prepares codebase for immutable NLRI construction in Phase 1-3

This change is backward compatible - existing code using setters
still works, but tests now demonstrate the preferred pattern.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: thomas-mangin

src/exabgp/bgp/message/update/nlri/ipvpn.py

@@ -177,6 +177,8 @@ def from_cidr(
         safi: SAFI = SAFI.mpls_vpn,  # Default to class SAFI; parameter kept for API compat
         action: Action = Action.UNSET,
         path_info: PathInfo = PathInfo.DISABLED,
+        labels: Labels | None = None,
+        rd: RouteDistinguisher | None = None,
     ) -> 'IPVPN':
         """Factory method to create IPVPN from a CIDR object.
 
@@ -186,6 +188,8 @@ def from_cidr(
             safi: Ignored - IPVPN always uses mpls_vpn (kept for API compatibility)
             action: Route action (ANNOUNCE/WITHDRAW)
             path_info: AddPath path identifier
+            labels: MPLS label stack (optional, defaults to NOLABEL)
+            rd: Route Distinguisher (optional, defaults to NORD)
 
         Returns:
             New IPVPN instance with SAFI=mpls_vpn
@@ -196,8 +200,8 @@ def from_cidr(
         instance._packed = cidr.pack_nlri()
         instance.path_info = path_info
         instance.nexthop = IP.NoNextHop
-        instance._labels_packed = b''  # NOLABEL
-        instance._rd_packed = b''  # NORD
+        instance._labels_packed = labels.pack_labels() if labels is not None else b''
+        instance._rd_packed = rd.pack_rd() if rd is not None else b''
         return instance
 
     @classmethod

src/exabgp/bgp/message/update/nlri/label.py

@@ -148,6 +148,7 @@ def from_cidr(
         safi: SAFI = SAFI.nlri_mpls,  # Default to class SAFI; parameter kept for API compat
         action: Action = Action.UNSET,
         path_info: PathInfo = PathInfo.DISABLED,
+        labels: Labels | None = None,
     ) -> 'Label':
         """Factory method to create Label from a CIDR object.
 
@@ -157,6 +158,7 @@ def from_cidr(
             safi: Ignored - Label always uses nlri_mpls (kept for API compatibility)
             action: Route action (ANNOUNCE/WITHDRAW)
             path_info: AddPath path identifier
+            labels: MPLS label stack (optional, defaults to NOLABEL)
 
         Returns:
             New Label instance with SAFI=nlri_mpls
@@ -167,7 +169,7 @@ def from_cidr(
         instance._packed = cidr.pack_nlri()
         instance.path_info = path_info
         instance.nexthop = IP.NoNextHop
-        instance._labels_packed = b''  # NOLABEL
+        instance._labels_packed = labels.pack_labels() if labels is not None else b''
         instance.rd = None
         return instance
 

tests/unit/test_ipvpn.py

@@ -614,58 +614,60 @@ def test_from_cidr_defaults_no_labels_no_rd(self) -> None:
         assert nlri.rd == RouteDistinguisher.NORD
         assert nlri.cidr.prefix() == '192.168.1.0/24'
 
-    def test_from_cidr_then_set_rd_only(self) -> None:
-        """Test from_cidr then setting RD (no labels)"""
+    def test_from_cidr_with_rd_only(self) -> None:
+        """Test from_cidr with RD parameter (no labels)"""
         cidr = CIDR.make_cidr(IP.pton('10.0.0.0'), 24)
-        nlri = IPVPN.from_cidr(cidr, AFI.ipv4, SAFI.mpls_vpn)
-        nlri.rd = RouteDistinguisher.make_from_elements('10.0.0.1', 100)
+        nlri = IPVPN.from_cidr(cidr, AFI.ipv4, SAFI.mpls_vpn, rd=RouteDistinguisher.make_from_elements('10.0.0.1', 100))
 
         assert nlri.labels == Labels.NOLABEL
         assert nlri.rd._str() == '10.0.0.1:100'
         assert nlri.cidr.prefix() == '10.0.0.0/24'
 
-    def test_from_cidr_then_set_labels_only(self) -> None:
-        """Test from_cidr then setting labels (no RD)"""
+    def test_from_cidr_with_labels_only(self) -> None:
+        """Test from_cidr with labels parameter (no RD)"""
         cidr = CIDR.make_cidr(IP.pton('10.0.0.0'), 24)
-        nlri = IPVPN.from_cidr(cidr, AFI.ipv4, SAFI.mpls_vpn)
-        nlri.labels = Labels.make_labels([42], True)
+        nlri = IPVPN.from_cidr(cidr, AFI.ipv4, SAFI.mpls_vpn, labels=Labels.make_labels([42], True))
 
         assert nlri.labels.labels == [42]
         assert nlri.rd == RouteDistinguisher.NORD
         assert nlri.cidr.prefix() == '10.0.0.0/24'
 
-    def test_from_cidr_set_rd_before_labels(self) -> None:
-        """Test from_cidr with RD set BEFORE labels (config parser order)
+    def test_from_cidr_with_labels_and_rd(self) -> None:
+        """Test from_cidr with both labels and RD parameters
 
-        The configuration parser often sets RD before labels. Verify this
-        order works correctly.
+        Verifies that both parameters can be set at construction time.
         """
         cidr = CIDR.make_cidr(IP.pton('192.168.0.0'), 16)
-        nlri = IPVPN.from_cidr(cidr, AFI.ipv4, SAFI.mpls_vpn)
+        nlri = IPVPN.from_cidr(
+            cidr,
+            AFI.ipv4,
+            SAFI.mpls_vpn,
+            labels=Labels.make_labels([100, 200], True),
+            rd=RouteDistinguisher.make_from_elements('172.16.0.1', 50),
+        )
 
-        # Set RD first (like config parser does)
-        nlri.rd = RouteDistinguisher.make_from_elements('172.16.0.1', 50)
+        assert nlri.labels.labels == [100, 200]
         assert nlri.rd._str() == '172.16.0.1:50'
         assert nlri.cidr.prefix() == '192.168.0.0/16'
 
-        # Then set labels
-        nlri.labels = Labels.make_labels([100, 200], True)
-        assert nlri.labels.labels == [100, 200]
-        assert nlri.rd._str() == '172.16.0.1:50'  # RD should be preserved
-        assert nlri.cidr.prefix() == '192.168.0.0/16'  # CIDR should be preserved
+    def test_from_cidr_with_all_parameters(self) -> None:
+        """Test from_cidr with all optional parameters"""
+        from exabgp.bgp.message.update.nlri.qualifier import PathInfo
 
-    def test_from_cidr_set_labels_before_rd(self) -> None:
-        """Test from_cidr with labels set BEFORE RD"""
         cidr = CIDR.make_cidr(IP.pton('192.168.0.0'), 16)
-        nlri = IPVPN.from_cidr(cidr, AFI.ipv4, SAFI.mpls_vpn)
+        nlri = IPVPN.from_cidr(
+            cidr,
+            AFI.ipv4,
+            SAFI.mpls_vpn,
+            action=Action.ANNOUNCE,
+            path_info=PathInfo.NOPATH,
+            labels=Labels.make_labels([100], True),
+            rd=RouteDistinguisher.make_from_elements('172.16.0.1', 50),
+        )
 
-        # Set labels first
-        nlri.labels = Labels.make_labels([100], True)
+        assert nlri.action == Action.ANNOUNCE
+        assert nlri.path_info == PathInfo.NOPATH
         assert nlri.labels.labels == [100]
-
-        # Then set RD
-        nlri.rd = RouteDistinguisher.make_from_elements('172.16.0.1', 50)
-        assert nlri.labels.labels == [100]  # Labels should be preserved
         assert nlri.rd._str() == '172.16.0.1:50'
         assert nlri.cidr.prefix() == '192.168.0.0/16'
 
@@ -872,17 +874,17 @@ def test_single_label_vs_no_labels(self) -> None:
         """Compare behavior of NOLABEL vs single label"""
         # With NOLABEL
         cidr = CIDR.make_cidr(IP.pton('10.0.0.0'), 24)
-        nlri_no_label = IPVPN.from_cidr(cidr, AFI.ipv4, SAFI.mpls_vpn)
-        nlri_no_label.rd = RouteDistinguisher.make_from_elements('10.0.0.1', 1)
+        nlri_no_label = IPVPN.from_cidr(
+            cidr, AFI.ipv4, SAFI.mpls_vpn, rd=RouteDistinguisher.make_from_elements('10.0.0.1', 1)
+        )
 
         # With single label
-        nlri_with_label = IPVPN.make_vpn_route(
+        nlri_with_label = IPVPN.from_cidr(
+            cidr,
             AFI.ipv4,
             SAFI.mpls_vpn,
-            IP.pton('10.0.0.0'),
-            24,
-            Labels.make_labels([42], True),
-            RouteDistinguisher.make_from_elements('10.0.0.1', 1),
+            labels=Labels.make_labels([42], True),
+            rd=RouteDistinguisher.make_from_elements('10.0.0.1', 1),
         )
 
         # Both should have same RD and CIDR