sts-sponsors team mailing list archive

[Alberto Donato <mp+437438@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:lxdaddress-fix-type into maas:master.

Commit message:
fix type for LXDAddress.netmask to be int rather than str



Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/437438
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~ack/maas:lxdaddress-fix-type into maas:master.

diff --git a/src/maasserver/testing/commissioning.py b/src/maasserver/testing/commissioning.py
index b24c9d6..5f712db 100644
--- a/src/maasserver/testing/commissioning.py
+++ b/src/maasserver/testing/commissioning.py
@@ -51,7 +51,7 @@ class LXDBond:
 @dataclasses.dataclass
 class LXDAddress:
     address: str
-    netmask: str
+    netmask: int
     family: str = "inet"
     scope: str = "global"
 
diff --git a/src/maasserver/testing/sampledata/network.py b/src/maasserver/testing/sampledata/network.py
index d835efe..a148ccf 100644
--- a/src/maasserver/testing/sampledata/network.py
+++ b/src/maasserver/testing/sampledata/network.py
@@ -49,7 +49,7 @@ def make_network_interfaces(
     def make_network_ip(vlan: VLAN, network: LXDNetwork):
         ip_network = ip_networks[vlan]
         ip = factory.pick_ip_in_network(ip_network)
-        network.addresses = [LXDAddress(str(ip), str(ip_network.prefixlen))]
+        network.addresses = [LXDAddress(str(ip), ip_network.prefixlen)]
         return ip
 
     for fabric_vlans in vlans.values():
diff --git a/src/metadataserver/builtin_scripts/tests/test_network.py b/src/metadataserver/builtin_scripts/tests/test_network.py
index 832e918..a1853b4 100644
--- a/src/metadataserver/builtin_scripts/tests/test_network.py
+++ b/src/metadataserver/builtin_scripts/tests/test_network.py
@@ -1998,7 +1998,7 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
             vlan_network = data1.create_vlan_network(
                 f"ens5.{vid}", parent=ens5_network
             )
-            vlan_network.addresses = [LXDAddress(f"10.{vid}.0.2", "20")]
+            vlan_network.addresses = [LXDAddress(f"10.{vid}.0.2", 20)]
 
         data2 = FakeCommissioningData()
         ens3_network = data2.create_physical_network(
@@ -2020,7 +2020,7 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
             vlan_network = data2.create_vlan_network(
                 f"ens5.{vid}", parent=ens5_network
             )
-            vlan_network.addresses = [LXDAddress(f"10.{vid}.0.3", "20")]
+            vlan_network.addresses = [LXDAddress(f"10.{vid}.0.3", 20)]
 
         controller1 = self.create_empty_controller()
         controller2 = self.create_empty_controller()