Skip to content

Commit 3ee64bc

Browse files
pandafypandafy
committed
[qa] Formatted code
1 parent 6eebe6d commit 3ee64bc

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
@@ -518,20 +518,20 @@ def test_org_admin_create_template_with_shared_vpn(self):
518518
vpn = self._create_vpn(organization=None)
519519
org = self._create_org()
520520
administrator = self._create_administrator(organizations=[org])
521-
path = reverse(f'admin:{self.app_label}_template_add')
521+
path = reverse(f"admin:{self.app_label}_template_add")
522522
payload = {
523-
'organization': '',
524-
'name': 'Test',
525-
'type': 'vpn',
526-
'vpn': str(vpn.id),
527-
'backend': 'netjsonconfig.OpenWrt',
528-
'config': '',
529-
'default_values': '',
530-
'tags': '',
523+
"organization": "",
524+
"name": "Test",
525+
"type": "vpn",
526+
"vpn": str(vpn.id),
527+
"backend": "netjsonconfig.OpenWrt",
528+
"config": "",
529+
"default_values": "",
530+
"tags": "",
531531
}
532532
self.assertEqual(Template.objects.count(), 2)
533533

534-
with self.subTest('Should not allow creating shared template'):
534+
with self.subTest("Should not allow creating shared template"):
535535
self._test_org_admin_create_shareable_object(
536536
path=path,
537537
payload=payload,
@@ -540,8 +540,8 @@ def test_org_admin_create_template_with_shared_vpn(self):
540540
user=administrator,
541541
)
542542

543-
with self.subTest('Should allow creating non-shared template'):
544-
payload['organization'] = str(org.pk)
543+
with self.subTest("Should allow creating non-shared template"):
544+
payload["organization"] = str(org.pk)
545545
self._test_org_admin_create_shareable_object(
546546
path=path,
547547
payload=payload,
@@ -553,25 +553,25 @@ def test_org_admin_create_template_with_shared_vpn(self):
553553

554554
def test_org_admin_view_shared_template(self):
555555
vpn = self._create_vpn(organization=None)
556-
template = self._create_template(type='vpn', vpn=vpn)
556+
template = self._create_template(type="vpn", vpn=vpn)
557557
self._test_org_admin_view_shareable_object(
558-
path=reverse(f'admin:{self.app_label}_template_change', args=[template.pk]),
558+
path=reverse(f"admin:{self.app_label}_template_change", args=[template.pk]),
559559
)
560560

561561
def test_vpn_queryset(self):
562562
data = self._create_multitenancy_test_env(vpn=True)
563563
self._test_multitenant_admin(
564-
url=reverse(f'admin:{self.app_label}_vpn_changelist'),
564+
url=reverse(f"admin:{self.app_label}_vpn_changelist"),
565565
visible=[
566-
data['org1'].name,
567-
data['vpn1'].name,
568-
data['vpn_shared'].name,
566+
data["org1"].name,
567+
data["vpn1"].name,
568+
data["vpn_shared"].name,
569569
],
570570
hidden=[
571-
data['org2'].name,
572-
data['inactive'],
573-
data['vpn2'].name,
574-
data['vpn_inactive'].name,
571+
data["org2"].name,
572+
data["inactive"],
573+
data["vpn2"].name,
574+
data["vpn_inactive"].name,
575575
],
576576
)
577577

@@ -620,23 +620,23 @@ def test_org_admin_create_shared_vpn(self):
620620
org = self._get_org()
621621
ca = self._create_ca(organization=org)
622622
self._test_org_admin_create_shareable_object(
623-
path=reverse(f'admin:{self.app_label}_vpn_add'),
623+
path=reverse(f"admin:{self.app_label}_vpn_add"),
624624
model=Vpn,
625625
payload={
626-
'organization': '',
627-
'name': 'Test',
628-
'host': 'vpn1.test.com',
629-
'key': 'vZFUV5FqYt4WW9nerc23BofQH51gHNNy',
630-
'backend': 'openwisp_controller.vpn_backends.OpenVPN',
631-
'ca': ca.pk,
632-
'config': {
633-
'openvpn': [
626+
"organization": "",
627+
"name": "Test",
628+
"host": "vpn1.test.com",
629+
"key": "vZFUV5FqYt4WW9nerc23BofQH51gHNNy",
630+
"backend": "openwisp_controller.vpn_backends.OpenVPN",
631+
"ca": ca.pk,
632+
"config": {
633+
"openvpn": [
634634
{
635-
'server_bridge': '10.8.0.0 255.255.255.0',
636-
'name': 'tun0',
637-
'mode': 'server',
638-
'proto': 'udp',
639-
'dev': 'tun0',
635+
"server_bridge": "10.8.0.0 255.255.255.0",
636+
"name": "tun0",
637+
"mode": "server",
638+
"proto": "udp",
639+
"dev": "tun0",
640640
}
641641
]
642642
},
@@ -646,7 +646,7 @@ def test_org_admin_create_shared_vpn(self):
646646
def test_org_admin_view_shared_vpn(self):
647647
vpn = self._create_vpn(organization=None)
648648
self._test_org_admin_view_shareable_object(
649-
path=reverse(f'admin:{self.app_label}_vpn_change', args=[vpn.pk]),
649+
path=reverse(f"admin:{self.app_label}_vpn_change", args=[vpn.pk]),
650650
)
651651

652652
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
@@ -652,10 +652,10 @@ def test_operator_access_shared_template(self):
652652
token = self._obtain_auth_token(test_user)
653653
self._create_template(organization=None)
654654
self._test_org_user_access_shared_object(
655-
listview_name='config_api:template_list',
656-
detailview_name='config_api:template_detail',
657-
create_payload={'name': 'test', 'organization': ''},
658-
update_payload={'name': 'updated-test'},
655+
listview_name="config_api:template_list",
656+
detailview_name="config_api:template_detail",
657+
create_payload={"name": "test", "organization": ""},
658+
update_payload={"name": "updated-test"},
659659
expected_count=1,
660660
token=token,
661661
)
@@ -666,30 +666,30 @@ def test_org_admin_create_template_with_shared_vpn(self):
666666
create_payload = self._template_data
667667
create_payload.update(
668668
{
669-
'organization': org.pk,
670-
'type': 'vpn',
671-
'vpn': vpn.pk,
669+
"organization": org.pk,
670+
"type": "vpn",
671+
"vpn": vpn.pk,
672672
}
673673
)
674674
update_payload = create_payload.copy()
675-
update_payload['name'] = 'updated-test'
675+
update_payload["name"] = "updated-test"
676676
test_user = self._create_operator(organizations=[org])
677677
self._test_org_user_access_shared_object(
678-
listview_name='config_api:template_list',
679-
detailview_name='config_api:template_detail',
678+
listview_name="config_api:template_list",
679+
detailview_name="config_api:template_detail",
680680
create_payload=create_payload,
681681
update_payload=update_payload,
682682
expected_count=1,
683683
token=self._obtain_auth_token(test_user),
684684
expected_status_codes={
685-
'create': 201,
686-
'list': 200,
687-
'retrieve': 200,
688-
'update': 200,
689-
'delete': 204,
690-
'head': 200,
691-
'option': 200,
692-
}
685+
"create": 201,
686+
"list": 200,
687+
"retrieve": 200,
688+
"update": 200,
689+
"delete": 204,
690+
"head": 200,
691+
"option": 200,
692+
},
693693
)
694694

695695
def test_template_create_with_empty_config(self):
@@ -854,45 +854,45 @@ def test_vpn_create_api(self):
854854

855855
def test_org_admin_access_vpn_with_shared_objects(self):
856856
org = self._get_org()
857-
shared_ca = self._create_ca(name='shared_ca', organization=None)
857+
shared_ca = self._create_ca(name="shared_ca", organization=None)
858858
create_payload = self._vpn_data
859859
create_payload.update(
860860
{
861-
'organization': org.pk,
862-
'ca': shared_ca.pk,
861+
"organization": org.pk,
862+
"ca": shared_ca.pk,
863863
}
864864
)
865865
update_payload = create_payload.copy()
866-
update_payload['name'] = 'updated-test-vpn'
866+
update_payload["name"] = "updated-test-vpn"
867867
administrator = self._create_administrator(organizations=[org])
868868
self._test_access_shared_object(
869-
listview_name='config_api:vpn_list',
870-
detailview_name='config_api:vpn_detail',
869+
listview_name="config_api:vpn_list",
870+
detailview_name="config_api:vpn_detail",
871871
create_payload=create_payload,
872872
update_payload=update_payload,
873873
expected_count=1,
874874
expected_status_codes={
875-
'create': 201,
876-
'list': 200,
877-
'retrieve': 200,
878-
'update': 200,
879-
'delete': 204,
880-
'head': 200,
881-
'option': 200,
875+
"create": 201,
876+
"list": 200,
877+
"retrieve": 200,
878+
"update": 200,
879+
"delete": 204,
880+
"head": 200,
881+
"option": 200,
882882
},
883883
token=self._obtain_auth_token(administrator),
884884
)
885885

886886
def test_org_admin_create_shared_vpn(self):
887-
shared_ca = self._create_ca(name='shared_ca', organization=None)
887+
shared_ca = self._create_ca(name="shared_ca", organization=None)
888888
data = self._vpn_data
889-
data['ca'] = shared_ca.pk
889+
data["ca"] = shared_ca.pk
890890
# API does not allow creating shared VPN by org admin,
891891
# therefore we create an object to test the detail view.
892892
self._create_vpn(organization=None, ca=shared_ca)
893893
self._test_org_user_access_shared_object(
894-
listview_name='config_api:vpn_list',
895-
detailview_name='config_api:vpn_detail',
894+
listview_name="config_api:vpn_list",
895+
detailview_name="config_api:vpn_detail",
896896
create_payload=data,
897897
expected_count=1,
898898
)

‎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)