Skip to content

Commit 53330f0

Browse files
pandafypandafy
committed
[qa] Formatted code
1 parent 30470ca commit 53330f0

File tree

7 files changed

+156
-156
lines changed

7 files changed

+156
-156
lines changed

‎openwisp_controller/config/migrations/__init__.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ def update_vpn_dhparam_length(apps, schema_editor):
2525

2626
def assign_permissions_to_groups(apps, schema_editor):
2727
create_default_permissions(apps, schema_editor)
28-
operators_and_admins_can_change = ['device', 'config', 'template']
29-
operators_read_only_admins_manage = ['vpn']
30-
manage_operations = ['add', 'change', 'view', 'delete']
31-
Group = get_swapped_model(apps, 'openwisp_users', 'Group')
28+
operators_and_admins_can_change = ["device", "config", "template"]
29+
operators_read_only_admins_manage = ["vpn"]
30+
manage_operations = ["add", "change", "view", "delete"]
31+
Group = get_swapped_model(apps, "openwisp_users", "Group")
3232

3333
try:
3434
admin = Group.objects.get(name="Administrator")

‎openwisp_controller/config/tests/test_admin.py‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -510,20 +510,20 @@ def test_org_admin_create_template_with_shared_vpn(self):
510510
vpn = self._create_vpn(organization=None)
511511
org = self._create_org()
512512
administrator = self._create_administrator(organizations=[org])
513-
path = reverse(f'admin:{self.app_label}_template_add')
513+
path = reverse(f"admin:{self.app_label}_template_add")
514514
payload = {
515-
'organization': '',
516-
'name': 'Test',
517-
'type': 'vpn',
518-
'vpn': str(vpn.id),
519-
'backend': 'netjsonconfig.OpenWrt',
520-
'config': '',
521-
'default_values': '',
522-
'tags': '',
515+
"organization": "",
516+
"name": "Test",
517+
"type": "vpn",
518+
"vpn": str(vpn.id),
519+
"backend": "netjsonconfig.OpenWrt",
520+
"config": "",
521+
"default_values": "",
522+
"tags": "",
523523
}
524524
self.assertEqual(Template.objects.count(), 2)
525525

526-
with self.subTest('Should not allow creating shared template'):
526+
with self.subTest("Should not allow creating shared template"):
527527
self._test_org_admin_create_shareable_object(
528528
path=path,
529529
payload=payload,
@@ -532,8 +532,8 @@ def test_org_admin_create_template_with_shared_vpn(self):
532532
user=administrator,
533533
)
534534

535-
with self.subTest('Should allow creating non-shared template'):
536-
payload['organization'] = str(org.pk)
535+
with self.subTest("Should allow creating non-shared template"):
536+
payload["organization"] = str(org.pk)
537537
self._test_org_admin_create_shareable_object(
538538
path=path,
539539
payload=payload,
@@ -545,25 +545,25 @@ def test_org_admin_create_template_with_shared_vpn(self):
545545

546546
def test_org_admin_view_shared_template(self):
547547
vpn = self._create_vpn(organization=None)
548-
template = self._create_template(type='vpn', vpn=vpn)
548+
template = self._create_template(type="vpn", vpn=vpn)
549549
self._test_org_admin_view_shareable_object(
550-
path=reverse(f'admin:{self.app_label}_template_change', args=[template.pk]),
550+
path=reverse(f"admin:{self.app_label}_template_change", args=[template.pk]),
551551
)
552552

553553
def test_vpn_queryset(self):
554554
data = self._create_multitenancy_test_env(vpn=True)
555555
self._test_multitenant_admin(
556-
url=reverse(f'admin:{self.app_label}_vpn_changelist'),
556+
url=reverse(f"admin:{self.app_label}_vpn_changelist"),
557557
visible=[
558-
data['org1'].name,
559-
data['vpn1'].name,
560-
data['vpn_shared'].name,
558+
data["org1"].name,
559+
data["vpn1"].name,
560+
data["vpn_shared"].name,
561561
],
562562
hidden=[
563-
data['org2'].name,
564-
data['inactive'],
565-
data['vpn2'].name,
566-
data['vpn_inactive'].name,
563+
data["org2"].name,
564+
data["inactive"],
565+
data["vpn2"].name,
566+
data["vpn_inactive"].name,
567567
],
568568
)
569569

@@ -612,23 +612,23 @@ def test_org_admin_create_shared_vpn(self):
612612
org = self._get_org()
613613
ca = self._create_ca(organization=org)
614614
self._test_org_admin_create_shareable_object(
615-
path=reverse(f'admin:{self.app_label}_vpn_add'),
615+
path=reverse(f"admin:{self.app_label}_vpn_add"),
616616
model=Vpn,
617617
payload={
618-
'organization': '',
619-
'name': 'Test',
620-
'host': 'vpn1.test.com',
621-
'key': 'vZFUV5FqYt4WW9nerc23BofQH51gHNNy',
622-
'backend': 'openwisp_controller.vpn_backends.OpenVPN',
623-
'ca': ca.pk,
624-
'config': {
625-
'openvpn': [
618+
"organization": "",
619+
"name": "Test",
620+
"host": "vpn1.test.com",
621+
"key": "vZFUV5FqYt4WW9nerc23BofQH51gHNNy",
622+
"backend": "openwisp_controller.vpn_backends.OpenVPN",
623+
"ca": ca.pk,
624+
"config": {
625+
"openvpn": [
626626
{
627-
'server_bridge': '10.8.0.0 255.255.255.0',
628-
'name': 'tun0',
629-
'mode': 'server',
630-
'proto': 'udp',
631-
'dev': 'tun0',
627+
"server_bridge": "10.8.0.0 255.255.255.0",
628+
"name": "tun0",
629+
"mode": "server",
630+
"proto": "udp",
631+
"dev": "tun0",
632632
}
633633
]
634634
},
@@ -638,7 +638,7 @@ def test_org_admin_create_shared_vpn(self):
638638
def test_org_admin_view_shared_vpn(self):
639639
vpn = self._create_vpn(organization=None)
640640
self._test_org_admin_view_shareable_object(
641-
path=reverse(f'admin:{self.app_label}_vpn_change', args=[vpn.pk]),
641+
path=reverse(f"admin:{self.app_label}_vpn_change", args=[vpn.pk]),
642642
)
643643

644644
def test_device_template_filter(self):

‎openwisp_controller/config/tests/test_api.py‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -675,10 +675,10 @@ def test_operator_access_shared_template(self):
675675
token = self._obtain_auth_token(test_user)
676676
self._create_template(organization=None)
677677
self._test_org_user_access_shared_object(
678-
listview_name='config_api:template_list',
679-
detailview_name='config_api:template_detail',
680-
create_payload={'name': 'test', 'organization': ''},
681-
update_payload={'name': 'updated-test'},
678+
listview_name="config_api:template_list",
679+
detailview_name="config_api:template_detail",
680+
create_payload={"name": "test", "organization": ""},
681+
update_payload={"name": "updated-test"},
682682
expected_count=1,
683683
token=token,
684684
)
@@ -689,30 +689,30 @@ def test_org_admin_create_template_with_shared_vpn(self):
689689
create_payload = self._template_data
690690
create_payload.update(
691691
{
692-
'organization': org.pk,
693-
'type': 'vpn',
694-
'vpn': vpn.pk,
692+
"organization": org.pk,
693+
"type": "vpn",
694+
"vpn": vpn.pk,
695695
}
696696
)
697697
update_payload = create_payload.copy()
698-
update_payload['name'] = 'updated-test'
698+
update_payload["name"] = "updated-test"
699699
test_user = self._create_operator(organizations=[org])
700700
self._test_org_user_access_shared_object(
701-
listview_name='config_api:template_list',
702-
detailview_name='config_api:template_detail',
701+
listview_name="config_api:template_list",
702+
detailview_name="config_api:template_detail",
703703
create_payload=create_payload,
704704
update_payload=update_payload,
705705
expected_count=1,
706706
token=self._obtain_auth_token(test_user),
707707
expected_status_codes={
708-
'create': 201,
709-
'list': 200,
710-
'retrieve': 200,
711-
'update': 200,
712-
'delete': 204,
713-
'head': 200,
714-
'option': 200,
715-
}
708+
"create": 201,
709+
"list": 200,
710+
"retrieve": 200,
711+
"update": 200,
712+
"delete": 204,
713+
"head": 200,
714+
"option": 200,
715+
},
716716
)
717717

718718
def test_template_create_with_empty_config(self):
@@ -877,45 +877,45 @@ def test_vpn_create_api(self):
877877

878878
def test_org_admin_access_vpn_with_shared_objects(self):
879879
org = self._get_org()
880-
shared_ca = self._create_ca(name='shared_ca', organization=None)
880+
shared_ca = self._create_ca(name="shared_ca", organization=None)
881881
create_payload = self._vpn_data
882882
create_payload.update(
883883
{
884-
'organization': org.pk,
885-
'ca': shared_ca.pk,
884+
"organization": org.pk,
885+
"ca": shared_ca.pk,
886886
}
887887
)
888888
update_payload = create_payload.copy()
889-
update_payload['name'] = 'updated-test-vpn'
889+
update_payload["name"] = "updated-test-vpn"
890890
administrator = self._create_administrator(organizations=[org])
891891
self._test_access_shared_object(
892-
listview_name='config_api:vpn_list',
893-
detailview_name='config_api:vpn_detail',
892+
listview_name="config_api:vpn_list",
893+
detailview_name="config_api:vpn_detail",
894894
create_payload=create_payload,
895895
update_payload=update_payload,
896896
expected_count=1,
897897
expected_status_codes={
898-
'create': 201,
899-
'list': 200,
900-
'retrieve': 200,
901-
'update': 200,
902-
'delete': 204,
903-
'head': 200,
904-
'option': 200,
898+
"create": 201,
899+
"list": 200,
900+
"retrieve": 200,
901+
"update": 200,
902+
"delete": 204,
903+
"head": 200,
904+
"option": 200,
905905
},
906906
token=self._obtain_auth_token(administrator),
907907
)
908908

909909
def test_org_admin_create_shared_vpn(self):
910-
shared_ca = self._create_ca(name='shared_ca', organization=None)
910+
shared_ca = self._create_ca(name="shared_ca", organization=None)
911911
data = self._vpn_data
912-
data['ca'] = shared_ca.pk
912+
data["ca"] = shared_ca.pk
913913
# API does not allow creating shared VPN by org admin,
914914
# therefore we create an object to test the detail view.
915915
self._create_vpn(organization=None, ca=shared_ca)
916916
self._test_org_user_access_shared_object(
917-
listview_name='config_api:vpn_list',
918-
detailview_name='config_api:vpn_detail',
917+
listview_name="config_api:vpn_list",
918+
detailview_name="config_api:vpn_detail",
919919
create_payload=data,
920920
expected_count=1,
921921
)

‎openwisp_controller/geo/migrations/__init__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
def assign_permissions_to_groups(apps, schema_editor):
77
create_default_permissions(apps, schema_editor)
8-
operators_and_admins_can_change = ['location', 'floorplan', 'devicelocation']
9-
manage_operations = ['add', 'change', 'view', 'delete']
10-
Group = get_swapped_model(apps, 'openwisp_users', 'Group')
8+
operators_and_admins_can_change = ["location", "floorplan", "devicelocation"]
9+
manage_operations = ["add", "change", "view", "delete"]
10+
Group = get_swapped_model(apps, "openwisp_users", "Group")
1111

1212
try:
1313
admin = Group.objects.get(name="Administrator")

‎openwisp_controller/pki/api/serializers.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ class Meta:
7878
# Setting the default to `serializers.empty` ensures DRF does not treat
7979
# these fields as both required and having a default value, avoiding
8080
# conflicts.
81-
'organization': {'required': True, 'default': serializers.empty},
82-
'common_name': {'default': '', 'required': False},
83-
'key_length': {'initial': '2048'},
84-
'digest': {'initial': 'sha256'},
85-
'passphrase': {'write_only': True},
86-
'validity_start': {'default': default_validity_start()},
87-
'validity_end': {'default': default_ca_validity_end()},
81+
"organization": {"required": True, "default": serializers.empty},
82+
"common_name": {"default": "", "required": False},
83+
"key_length": {"initial": "2048"},
84+
"digest": {"initial": "sha256"},
85+
"passphrase": {"write_only": True},
86+
"validity_start": {"default": default_validity_start()},
87+
"validity_end": {"default": default_ca_validity_end()},
8888
}
8989

9090

0 commit comments

Comments
 (0)