Skip to content

Commit cddf54b

Browse files
committed
Linter fix
1 parent e0fe178 commit cddf54b

6 files changed

Lines changed: 106 additions & 51 deletions

File tree

test/integration/conftest.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -735,14 +735,15 @@ def create_reserved_ip(test_linode_client):
735735
client = test_linode_client
736736
region = get_region(client, {"Linodes", "Cloud Firewall"}, site_type="core")
737737
reserved_ip = client.networking.reserved_ip_create(
738-
region=region,
739-
tags=["test"]
738+
region=region, tags=["test"]
740739
)
741740

742741
yield reserved_ip
743742

744743
# Delete only if IP exists (some tests delete it earlier)
745-
if client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address):
744+
if client.networking.reserved_ips(
745+
ReservedIPAddress.address == reserved_ip.address
746+
):
746747
reserved_ip.delete()
747748

748749

@@ -760,10 +761,14 @@ def create_reserved_ip_assigned(test_linode_client, create_linode):
760761
region=linode.region,
761762
)
762763

763-
reserved_ip = test_linode_client.load(ReservedIPAddress, reserved_ip.address)
764+
reserved_ip = test_linode_client.load(
765+
ReservedIPAddress, reserved_ip.address
766+
)
764767

765768
yield linode, reserved_ip
766769

767770
# Delete only if IP exists (some tests delete it earlier)
768-
if client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address):
771+
if client.networking.reserved_ips(
772+
ReservedIPAddress.address == reserved_ip.address
773+
):
769774
reserved_ip.delete()

test/integration/models/linode/interfaces/test_interfaces.py

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -383,11 +383,13 @@ def test_linode_interface_firewalls(e2e_test_firewall, linode_interface_public):
383383
assert firewall.label == e2e_test_firewall.label
384384

385385

386-
@pytest.mark.parametrize("iface_type", [
387-
InterfaceGeneration.LEGACY_CONFIG,
388-
InterfaceGeneration.LINODE
389-
])
390-
def test_linode_interfaces_with_reserved_ips(test_linode_client, e2e_test_firewall, create_reserved_ip, iface_type):
386+
@pytest.mark.parametrize(
387+
"iface_type",
388+
[InterfaceGeneration.LEGACY_CONFIG, InterfaceGeneration.LINODE],
389+
)
390+
def test_linode_interfaces_with_reserved_ips(
391+
test_linode_client, e2e_test_firewall, create_reserved_ip, iface_type
392+
):
391393
client = test_linode_client
392394
reserved_ip = create_reserved_ip
393395
label = get_test_label(length=8)
@@ -400,10 +402,12 @@ def test_linode_interfaces_with_reserved_ips(test_linode_client, e2e_test_firewa
400402
label=label,
401403
firewall=e2e_test_firewall,
402404
interface_generation=iface_type,
403-
ipv4=[reserved_ip.address]
405+
ipv4=[reserved_ip.address],
404406
)
405407
else:
406-
interface = build_interface_public_ipv4(e2e_test_firewall.id, reserved_ip.address)
408+
interface = build_interface_public_ipv4(
409+
e2e_test_firewall.id, reserved_ip.address
410+
)
407411
linode, _ = client.linode.instance_create(
408412
"g6-nanode-1",
409413
reserved_ip.region,
@@ -422,10 +426,14 @@ def test_linode_interfaces_with_reserved_ips(test_linode_client, e2e_test_firewa
422426
assert linode_ips[0].assigned_entity.id == linode.id
423427
assert linode_ips[0].assigned_entity.type == "linode"
424428
assert linode_ips[0].assigned_entity.label == linode.label
425-
assert linode_ips[0].assigned_entity.url == f"/v4/linode/instances/{linode.id}"
429+
assert (
430+
linode_ips[0].assigned_entity.url == f"/v4/linode/instances/{linode.id}"
431+
)
426432

427433
linode.delete()
428-
reserved_ips_list = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)
434+
reserved_ips_list = client.networking.reserved_ips(
435+
ReservedIPAddress.address == reserved_ip.address
436+
)
429437
assert len(reserved_ips_list) == 1
430438
assert reserved_ips_list[0].reserved == True
431439
# assert linode_ips[0].tags == ["test"] # TODO Does not work at the moment - during clarifications with API Team

test/integration/models/linode/test_linode.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,9 @@ def test_update_linode_maintenance_policy(create_linode, test_linode_client):
11591159
assert linode.maintenance_policy_id == non_default_policy.slug
11601160

11611161

1162-
def test_update_linode_with_reserved_ip_in_address(test_linode_client, e2e_test_firewall, create_reserved_ip):
1162+
def test_update_linode_with_reserved_ip_in_address(
1163+
test_linode_client, e2e_test_firewall, create_reserved_ip
1164+
):
11631165
label = get_test_label(length=8)
11641166
client = test_linode_client
11651167
reserved_ip = create_reserved_ip
@@ -1182,11 +1184,15 @@ def test_update_linode_with_reserved_ip_in_address(test_linode_client, e2e_test_
11821184
assert len(linode_ips) == 2
11831185
assert reserved_ip.address in [ip.address for ip in linode_ips]
11841186

1185-
reserved_ip = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)[0]
1187+
reserved_ip = client.networking.reserved_ips(
1188+
ReservedIPAddress.address == reserved_ip.address
1189+
)[0]
11861190
assert reserved_ip.linode_id == linode.id
11871191
assert reserved_ip.assigned_entity.id == linode.id
11881192
assert reserved_ip.assigned_entity.type == "linode"
11891193
assert reserved_ip.assigned_entity.label == linode.label
1190-
assert reserved_ip.assigned_entity.url == f"/v4/linode/instances/{linode.id}"
1194+
assert (
1195+
reserved_ip.assigned_entity.url == f"/v4/linode/instances/{linode.id}"
1196+
)
11911197

11921198
linode.delete()

test/integration/models/networking/test_networking.py

Lines changed: 52 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,9 @@ def test_ip_info(test_linode_client, create_linode):
366366

367367

368368
def verify_reserved_ip(reserved_ip):
369-
assert isinstance(ipaddress.ip_address(reserved_ip.address), ipaddress.IPv4Address)
369+
assert isinstance(
370+
ipaddress.ip_address(reserved_ip.address), ipaddress.IPv4Address
371+
)
370372
assert reserved_ip.type == "ipv4"
371373
assert reserved_ip.public == True
372374
assert reserved_ip.reserved == True
@@ -375,7 +377,9 @@ def verify_reserved_ip(reserved_ip):
375377

376378

377379
def verify_reserved_ip_assigned(reserved_ip, resource):
378-
assert isinstance(ipaddress.ip_address(reserved_ip.address), ipaddress.IPv4Address)
380+
assert isinstance(
381+
ipaddress.ip_address(reserved_ip.address), ipaddress.IPv4Address
382+
)
379383
assert reserved_ip.type == "ipv4"
380384
assert reserved_ip.public == True
381385
assert reserved_ip.reserved == True
@@ -384,20 +388,22 @@ def verify_reserved_ip_assigned(reserved_ip, resource):
384388
assert reserved_ip.assigned_entity.id == resource.id
385389
assert reserved_ip.assigned_entity.type == "linode"
386390
assert reserved_ip.assigned_entity.label == resource.label
387-
assert reserved_ip.assigned_entity.url == f"/v4/linode/instances/{resource.id}"
391+
assert (
392+
reserved_ip.assigned_entity.url == f"/v4/linode/instances/{resource.id}"
393+
)
388394

389395

390396
@pytest.mark.smoke
391-
@pytest.mark.parametrize("region, tags", [
392-
(TEST_REGION, ["test"]),
393-
(TEST_REGION, None),
394-
])
397+
@pytest.mark.parametrize(
398+
"region, tags",
399+
[
400+
(TEST_REGION, ["test"]),
401+
(TEST_REGION, None),
402+
],
403+
)
395404
def test_create_reserved_ip(request, test_linode_client, region, tags):
396405
client = test_linode_client
397-
reserved_ip = client.networking.reserved_ip_create(
398-
region=region,
399-
tags=tags
400-
)
406+
reserved_ip = client.networking.reserved_ip_create(region=region, tags=tags)
401407
request.addfinalizer(reserved_ip.delete)
402408

403409
verify_reserved_ip(reserved_ip)
@@ -408,10 +414,7 @@ def test_create_reserved_ip_wo_region_fail(test_linode_client):
408414
client = test_linode_client
409415

410416
with pytest.raises(ApiError) as exc_info:
411-
client.networking.reserved_ip_create(
412-
region=None,
413-
tags=["test"]
414-
)
417+
client.networking.reserved_ip_create(region=None, tags=["test"])
415418

416419
error_msg = str(exc_info.value.json)
417420
assert exc_info.value.status == 400
@@ -426,12 +429,16 @@ def test_update_reserved_ip_tags(test_linode_client, create_reserved_ip):
426429

427430
reserved_ip.tags = ["updated"]
428431
reserved_ip.save()
429-
reserved_ip = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)[0]
432+
reserved_ip = client.networking.reserved_ips(
433+
ReservedIPAddress.address == reserved_ip.address
434+
)[0]
430435
verify_reserved_ip(reserved_ip)
431436
assert reserved_ip.tags == ["updated"]
432437

433438

434-
def test_create_reserved_ip_assigned(test_linode_client, create_reserved_ip_assigned):
439+
def test_create_reserved_ip_assigned(
440+
test_linode_client, create_reserved_ip_assigned
441+
):
435442
client = test_linode_client
436443
linode, reserved_ip = create_reserved_ip_assigned
437444
verify_reserved_ip_assigned(reserved_ip, linode)
@@ -451,7 +458,9 @@ def test_create_reserved_ip_assigned(test_linode_client, create_reserved_ip_assi
451458
reserved_ips_list = client.networking.reserved_ips()
452459
assert reserved_ip.address not in [ip.address for ip in reserved_ips_list]
453460

454-
reserved_ips_list = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)
461+
reserved_ips_list = client.networking.reserved_ips(
462+
ReservedIPAddress.address == reserved_ip.address
463+
)
455464
assert len(reserved_ips_list) == 0
456465

457466
delattr(linode, "_ips")
@@ -464,7 +473,9 @@ def test_create_reserved_ip_assigned(test_linode_client, create_reserved_ip_assi
464473
def test_get_reserved_ip_types(test_linode_client, create_reserved_ip):
465474
client = test_linode_client
466475
endpoint = client.base_url + "/networking/reserved/ips/types"
467-
types = requests.get(endpoint).json()["data"] # Pricing should be publicly available
476+
types = requests.get(endpoint).json()[
477+
"data"
478+
] # Pricing should be publicly available
468479

469480
assert isinstance(types, list)
470481
assert types[0]["id"] == "reserved-ipv4"
@@ -476,19 +487,28 @@ def test_get_reserved_ip_types(test_linode_client, create_reserved_ip):
476487

477488

478489
@pytest.mark.smoke
479-
@pytest.mark.parametrize("reserved, region", [
480-
(True, TEST_REGION),
481-
(True, None),
482-
])
483-
def test_create_reserved_ip_with_allocate(test_linode_client, create_linode, reserved, region):
490+
@pytest.mark.parametrize(
491+
"reserved, region",
492+
[
493+
(True, TEST_REGION),
494+
(True, None),
495+
],
496+
)
497+
def test_create_reserved_ip_with_allocate(
498+
test_linode_client, create_linode, reserved, region
499+
):
484500
client = test_linode_client
485501
linode = create_linode
486502

487503
if region:
488-
reserved_ip = client.networking.ip_allocate(reserved=reserved, region=TEST_REGION)
504+
reserved_ip = client.networking.ip_allocate(
505+
reserved=reserved, region=TEST_REGION
506+
)
489507
verify_reserved_ip(reserved_ip)
490508
else:
491-
reserved_ip = client.networking.ip_allocate(reserved=reserved, linode=linode.id)
509+
reserved_ip = client.networking.ip_allocate(
510+
reserved=reserved, linode=linode.id
511+
)
492512
verify_reserved_ip_assigned(reserved_ip, linode)
493513

494514
assert reserved_ip.tags == []
@@ -515,7 +535,9 @@ def test_reserve_ephemeral_ip(test_linode_client, create_linode):
515535
assert ip_address.reserved == False
516536

517537

518-
def test_convert_unassigned_reserved_ip_to_ephemeral(test_linode_client, create_reserved_ip):
538+
def test_convert_unassigned_reserved_ip_to_ephemeral(
539+
test_linode_client, create_reserved_ip
540+
):
519541
client = test_linode_client
520542
reserved_ip = create_reserved_ip
521543
verify_reserved_ip(reserved_ip)
@@ -524,5 +546,7 @@ def test_convert_unassigned_reserved_ip_to_ephemeral(test_linode_client, create_
524546
ip_address.reserved = False
525547
ip_address.save()
526548

527-
reserved_ips_list = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)
549+
reserved_ips_list = client.networking.reserved_ips(
550+
ReservedIPAddress.address == reserved_ip.address
551+
)
528552
assert len(reserved_ips_list) == 0

test/integration/models/nodebalancer/test_nodebalancer.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ def test_create_nb(test_linode_client, e2e_test_firewall):
114114
nb.delete()
115115

116116

117-
def test_create_nb_with_reserved_ip(test_linode_client, e2e_test_firewall, create_reserved_ip):
117+
def test_create_nb_with_reserved_ip(
118+
test_linode_client, e2e_test_firewall, create_reserved_ip
119+
):
118120
client = test_linode_client
119121
reserved_ip = create_reserved_ip
120122
label = get_test_label(8)
@@ -134,7 +136,9 @@ def test_create_nb_with_reserved_ip(test_linode_client, e2e_test_firewall, creat
134136
assert nb.ipv4.reserved == True
135137

136138
nb.delete()
137-
reserved_ip = client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)[0]
139+
reserved_ip = client.networking.reserved_ips(
140+
ReservedIPAddress.address == reserved_ip.address
141+
)[0]
138142
assert reserved_ip.assigned_entity is None
139143

140144

test/integration/models/tag/test_tag.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ def create_tag_with_reserved_ip(test_linode_client, create_reserved_ip):
2020
unique_tag = get_test_label() + "_tag"
2121
reserved_ip = create_reserved_ip
2222

23-
tag = test_linode_client.tags.create(unique_tag, reserved_ipv4_addresses=[reserved_ip.address])
24-
reserved_ip = test_linode_client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)[0]
23+
tag = test_linode_client.tags.create(
24+
unique_tag, reserved_ipv4_addresses=[reserved_ip.address]
25+
)
26+
reserved_ip = test_linode_client.networking.reserved_ips(
27+
ReservedIPAddress.address == reserved_ip.address
28+
)[0]
2529

2630
yield tag, reserved_ip
2731

@@ -35,7 +39,9 @@ def test_get_tag(test_linode_client, test_tag):
3539
assert tag.id == test_tag.id
3640

3741

38-
def test_get_tag_with_reserved_ip(test_linode_client, create_tag_with_reserved_ip):
42+
def test_get_tag_with_reserved_ip(
43+
test_linode_client, create_tag_with_reserved_ip
44+
):
3945
tag, reserved_ip = create_tag_with_reserved_ip
4046
tag = test_linode_client.load(Tag, tag.id).objects[0]
4147

@@ -45,5 +51,7 @@ def test_get_tag_with_reserved_ip(test_linode_client, create_tag_with_reserved_i
4551
assert tag.tags == reserved_ip.tags
4652

4753
tag.delete()
48-
reserved_ip = test_linode_client.networking.reserved_ips(ReservedIPAddress.address==reserved_ip.address)
54+
reserved_ip = test_linode_client.networking.reserved_ips(
55+
ReservedIPAddress.address == reserved_ip.address
56+
)
4957
assert len(reserved_ip) == 0

0 commit comments

Comments
 (0)