Skip to content

Commit 5a9348d

Browse files
Fix NodeBalancerVPCConfig struct and address copilot suggestions
1 parent 40e8879 commit 5a9348d

File tree

6 files changed

+19
-11
lines changed

6 files changed

+19
-11
lines changed

linode_api4/objects/nodebalancer.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,11 @@ class NodeBalancerVPCConfig(DerivedBase):
243243
properties = {
244244
"id": Property(identifier=True),
245245
"nodebalancer_id": Property(identifier=True),
246-
"ipv4_range": Property(mutable=True),
247-
"ipv4_range_auto_assign": Property(mutable=True),
248-
"subnet_id": Property(mutable=True),
249-
"vpc_id": Property(mutable=True),
250-
"purpose": Property(mutable=True),
246+
"ipv4_range": Property(),
247+
"ipv6_range": Property(),
248+
"subnet_id": Property(),
249+
"vpc_id": Property(),
250+
"purpose": Property(),
251251
}
252252

253253

@@ -413,7 +413,10 @@ def vpc(self, id):
413413
:rtype: NodeBalancerVPCConfig
414414
"""
415415
result = self._client.get(
416-
"{}/vpcs/{}".format(NodeBalancer.api_endpoint, id), model=self
416+
"{}/vpcs/{}".format(
417+
NodeBalancer.api_endpoint, parse.quote(str(id))
418+
),
419+
model=self,
417420
)
418421

419422
return NodeBalancerVPCConfig(

test/fixtures/nodebalancers_12345_backend__vpcs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"subnet_id": 6666,
77
"vpc_id": 222,
88
"ipv4_range": "10.200.1.0/24",
9-
"ipv4_range_auto_assign": false,
9+
"ipv6_range": "2001:db8:2::/64",
1010
"purpose": "backend"
1111
}
1212
],

test/fixtures/nodebalancers_12345_frontend__vpcs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"subnet_id": 5555,
77
"vpc_id": 111,
88
"ipv4_range": "10.100.5.0/24",
9-
"ipv4_range_auto_assign": false,
9+
"ipv6_range": "2001:db8::/64",
1010
"purpose": "frontend"
1111
}
1212
],

test/fixtures/nodebalancers_12345_vpcs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"subnet_id": 5555,
77
"vpc_id": 111,
88
"ipv4_range": "10.100.5.0/24",
9-
"ipv4_range_auto_assign": false,
9+
"ipv6_range": "2001:db8::/64",
1010
"purpose": "frontend"
1111
},
1212
{
@@ -15,7 +15,7 @@
1515
"subnet_id": 5556,
1616
"vpc_id": 112,
1717
"ipv4_range": "10.100.6.0/24",
18-
"ipv4_range_auto_assign": false,
18+
"ipv6_range": "2001:db8:1::/64",
1919
"purpose": "backend"
2020
}
2121
],

test/fixtures/nodebalancers_12345_vpcs_99.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"subnet_id": 5555,
55
"vpc_id": 111,
66
"ipv4_range": "10.100.5.0/24",
7-
"ipv4_range_auto_assign": false,
7+
"ipv6_range": "2001:db8::/64",
88
"purpose": "frontend"
99
}

test/unit/objects/nodebalancers_test.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,13 +317,15 @@ def test_vpcs(self):
317317
self.assertEqual(result[0].subnet_id, 5555)
318318
self.assertEqual(result[0].vpc_id, 111)
319319
self.assertEqual(result[0].ipv4_range, "10.100.5.0/24")
320+
self.assertEqual(result[0].ipv6_range, "2001:db8::/64")
320321
self.assertEqual(result[0].purpose, "frontend")
321322

322323
self.assertIsInstance(result[1], NodeBalancerVPCConfig)
323324
self.assertEqual(result[1].id, 100)
324325
self.assertEqual(result[1].subnet_id, 5556)
325326
self.assertEqual(result[1].vpc_id, 112)
326327
self.assertEqual(result[1].ipv4_range, "10.100.6.0/24")
328+
self.assertEqual(result[1].ipv6_range, "2001:db8:1::/64")
327329
self.assertEqual(result[1].purpose, "backend")
328330

329331
def test_vpc(self):
@@ -341,6 +343,7 @@ def test_vpc(self):
341343
self.assertEqual(result.subnet_id, 5555)
342344
self.assertEqual(result.vpc_id, 111)
343345
self.assertEqual(result.ipv4_range, "10.100.5.0/24")
346+
self.assertEqual(result.ipv6_range, "2001:db8::/64")
344347
self.assertEqual(result.purpose, "frontend")
345348

346349
def test_backend_vpcs(self):
@@ -359,6 +362,7 @@ def test_backend_vpcs(self):
359362
self.assertEqual(result[0].subnet_id, 6666)
360363
self.assertEqual(result[0].vpc_id, 222)
361364
self.assertEqual(result[0].ipv4_range, "10.200.1.0/24")
365+
self.assertEqual(result[0].ipv6_range, "2001:db8:2::/64")
362366
self.assertEqual(result[0].purpose, "backend")
363367

364368
def test_frontend_vpcs(self):
@@ -377,4 +381,5 @@ def test_frontend_vpcs(self):
377381
self.assertEqual(result[0].subnet_id, 5555)
378382
self.assertEqual(result[0].vpc_id, 111)
379383
self.assertEqual(result[0].ipv4_range, "10.100.5.0/24")
384+
self.assertEqual(result[0].ipv6_range, "2001:db8::/64")
380385
self.assertEqual(result[0].purpose, "frontend")

0 commit comments

Comments
 (0)