github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-01 15:37:19 +00:00
Code Issues Projects Releases Wiki Activity

perf(project): 优化命名的风格 (#5693)

Browse Source 
perf: 修改错误的地

perf: 优化写错的几个

Co-authored-by: ibuler <ibuler@qq.com>
This commit is contained in:
fit2bot
2021-03-08 10:08:51 +08:00
committed by GitHub
parent 935947c97a
commit 0aa2c2016f
40 changed files with 272 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/generate_fake_data/resources/assets.py
View File

@@ -57,16 +57,16 @@ class NodesGenerator(FakeDataGenerator):
class AssetsGenerator(FakeDataGenerator):
resource = 'asset'
admin_users_id: list
nodes_id: list
admin_user_ids: list
node_ids: list
def pre_generate(self):
self.admin_users_id = list(AdminUser.objects.all().values_list('id', flat=True))
self.nodes_id = list(Node.objects.all().values_list('id', flat=True))
self.admin_user_ids = list(AdminUser.objects.all().values_list('id', flat=True))
self.node_ids = list(Node.objects.all().values_list('id', flat=True))
def set_assets_nodes(self, assets):
for asset in assets:
nodes_id_add_to = random.sample(self.nodes_id, 3)
nodes_id_add_to = random.sample(self.node_ids, 3)
asset.nodes.add(*nodes_id_add_to)
def do_generate(self, batch, batch_size):
@@ -79,7 +79,7 @@ class AssetsGenerator(FakeDataGenerator):
data = dict(
ip=ip,
hostname=hostname,
admin_user_id=choice(self.admin_users_id),
admin_user_id=choice(self.admin_user_ids),
created_by='Fake',
org_id=self.org.id
)

34
utils/generate_fake_data/resources/perms.py
View File

@@ -10,46 +10,46 @@ from perms.models import *
class AssetPermissionGenerator(FakeDataGenerator):
resource = 'asset_permission'
users_id: list
user_groups_id: list
assets_id: list
nodes_id: list
system_users_id: list
user_ids: list
user_group_ids: list
asset_ids: list
node_ids: list
system_user_ids: list
def pre_generate(self):
self.nodes_id = list(Node.objects.all().values_list('id', flat=True))
self.assets_id = list(Asset.objects.all().values_list('id', flat=True))
self.system_users_id = list(SystemUser.objects.all().values_list('id', flat=True))
self.users_id = list(User.objects.all().values_list('id', flat=True))
self.user_groups_id = list(UserGroup.objects.all().values_list('id', flat=True))
self.node_ids = list(Node.objects.all().values_list('id', flat=True))
self.asset_ids = list(Asset.objects.all().values_list('id', flat=True))
self.system_user_ids = list(SystemUser.objects.all().values_list('id', flat=True))
self.user_ids = list(User.objects.all().values_list('id', flat=True))
self.user_group_ids = list(UserGroup.objects.all().values_list('id', flat=True))
def set_users(self, perms):
through = AssetPermission.users.through
choices = self.users_id
choices = self.user_ids
relation_name = 'user_id'
self.set_relations(perms, through, relation_name, choices)
def set_user_groups(self, perms):
through = AssetPermission.user_groups.through
choices = self.user_groups_id
choices = self.user_group_ids
relation_name = 'usergroup_id'
self.set_relations(perms, through, relation_name, choices)
def set_assets(self, perms):
through = AssetPermission.assets.through
choices = self.assets_id
choices = self.asset_ids
relation_name = 'asset_id'
self.set_relations(perms, through, relation_name, choices)
def set_nodes(self, perms):
through = AssetPermission.nodes.through
choices = self.nodes_id
choices = self.node_ids
relation_name = 'node_id'
self.set_relations(perms, through, relation_name, choices)
def set_system_users(self, perms):
through = AssetPermission.system_users.through
choices = self.system_users_id
choices = self.system_user_ids
relation_name = 'systemuser_id'
self.set_relations(perms, through, relation_name, choices)
@@ -59,8 +59,8 @@ class AssetPermissionGenerator(FakeDataGenerator):
for perm in perms:
if choice_count is None:
choice_count = choice(range(8))
resources_id = sample(choices, choice_count)
for rid in resources_id:
resource_ids = sample(choices, choice_count)
for rid in resource_ids:
data = {'assetpermission_id': perm.id}
data[relation_name] = rid
relations.append(through(**data))

6
utils/generate_fake_data/resources/users.py
View File

@@ -21,11 +21,11 @@ class UserGroupGenerator(FakeDataGenerator):
class UserGenerator(FakeDataGenerator):
resource = 'user'
roles: list
groups_id: list
group_ids: list
def pre_generate(self):
self.roles = list(dict(User.ROLE.choices).keys())
self.groups_id = list(UserGroup.objects.all().values_list('id', flat=True))
self.group_ids = list(UserGroup.objects.all().values_list('id', flat=True))
def set_org(self, users):
relations = []
@@ -39,7 +39,7 @@ class UserGenerator(FakeDataGenerator):
def set_groups(self, users):
relations = []
for i in users:
groups_to_join = sample(self.groups_id, 3)
groups_to_join = sample(self.group_ids, 3)
_relations = [User.groups.through(user_id=i.id, usergroup_id=gid) for gid in groups_to_join]
relations.extend(_relations)
User.groups.through.objects.bulk_create(relations, ignore_conflicts=True)