diff --git a/appStore/errorList/views.py b/appStore/errorList/views.py index 32a280c0d2700cbec59456bf86dc8910c205aa99..8c35f25570f9742e832ef14063609983bea200ea 100644 --- a/appStore/errorList/views.py +++ b/appStore/errorList/views.py @@ -51,13 +51,13 @@ class ErrorListViewSet(viewsets.ModelViewSet): error_data['error_log_excerpt'] = request.data.get('error_log_excerpt') error_data['error_log_path'] = request.data.get('error_log_path') error_data['solution'] = request.data.get('solution') - config_serializer = ErroirListSerializer(data=error_data) - if config_serializer.is_valid(): - self.perform_create(config_serializer) - return json_response(config_serializer.data, status.HTTP_200_OK, '创建成功！') - log.info('errorList数据存储错误 ：%s，', config_serializer.errors) + serializer_error = ErroirListSerializer(data=error_data) + if serializer_error.is_valid(): + self.perform_create(serializer_error) + return json_response(serializer_error.data, status.HTTP_200_OK, '创建成功！') + log.info('errorList数据存储错误 ：%s，', serializer_error.errors) log.info('errorList存储数据为 ：%s，', error_data) - return json_response(config_serializer.errors, status.HTTP_400_BAD_REQUEST, config_serializer.errors) + return json_response(serializer_error.errors, status.HTTP_400_BAD_REQUEST, serializer_error.errors) def put(self, request, *args, **kwargs): id = request.data.get('id') diff --git a/appStore/lmbench/views.py b/appStore/lmbench/views.py index 3cff51b631cc7bd59448648b4c20550e8903bb80..272766b27b052289694d8ac235fb41149ffe7b07 100644 --- a/appStore/lmbench/views.py +++ b/appStore/lmbench/views.py @@ -567,105 +567,105 @@ class LmbenchViewSet(viewsets.ModelViewSet): lmbench_keys = sorted([key for key in request.__dict__['data_lmbench'].keys() if key.startswith('lmbench')])[-1] for lmbench_json in request.__dict__['data_lmbench'][lmbench_keys]['items']: # 每一条lmbench数据 - lmbench = {} - lmbench['env_id'] = request.__dict__['data_lmbench']['env_id'] - lmbench['execute_cmd'] = request.__dict__['data_lmbench'][lmbench_keys].get('execute_cmd') - lmbench['modify_parameters'] = request.__dict__['data_lmbench'][lmbench_keys].get('modify_parameters') + data_lmbench = {} + data_lmbench['env_id'] = request.__dict__['data_lmbench']['env_id'] + data_lmbench['execute_cmd'] = request.__dict__['data_lmbench'][lmbench_keys].get('execute_cmd') + data_lmbench['modify_parameters'] = request.__dict__['data_lmbench'][lmbench_keys].get('modify_parameters') # 处理数据，原始数据每个一级标就是一个json，把所有以及字段放到一个json中 new_lmbench = {} for i in lmbench_json: new_lmbench.update(i) for key, value in new_lmbench.items(): if key == "Basic system parameters": - lmbench['basic_Mhz'] = value['Mhz'] - lmbench['basic_tlb_pages'] = value['tlb pages'] - lmbench['basic_cache_line_bytes'] = value['cache line bytes'] - lmbench['basic_mem_par'] = value['mem par'] - lmbench['basic_scal_load'] = value['scal load'] + data_lmbench['basic_Mhz'] = value['Mhz'] + data_lmbench['basic_tlb_pages'] = value['tlb pages'] + data_lmbench['basic_cache_line_bytes'] = value['cache line bytes'] + data_lmbench['basic_mem_par'] = value['mem par'] + data_lmbench['basic_scal_load'] = value['scal load'] elif key == "Processor": - lmbench['processor_null_call'] = value['Mhz'] - lmbench['processor_null_I_O'] = value['null call'] - lmbench['processor_stat'] = value['null I/O'] - lmbench['processor_open_close'] = value['stat'] - lmbench['processor_slct_TCP'] = value['open close'] - lmbench['processor_sig_inst'] = value['slct TCP'] - lmbench['processor_sig_hndl'] = value['sig inst'] - lmbench['processor_fork_proc'] = value['sig hndl'] - lmbench['processor_exec_proc'] = value['fork proc'] - lmbench['processor_sh_proc'] = value['exec proc'] - lmbench['processor_Mhz'] = value['sh proc'] + data_lmbench['processor_null_call'] = value['Mhz'] + data_lmbench['processor_null_I_O'] = value['null call'] + data_lmbench['processor_stat'] = value['null I/O'] + data_lmbench['processor_open_close'] = value['stat'] + data_lmbench['processor_slct_TCP'] = value['open close'] + data_lmbench['processor_sig_inst'] = value['slct TCP'] + data_lmbench['processor_sig_hndl'] = value['sig inst'] + data_lmbench['processor_fork_proc'] = value['sig hndl'] + data_lmbench['processor_exec_proc'] = value['fork proc'] + data_lmbench['processor_sh_proc'] = value['exec proc'] + data_lmbench['processor_Mhz'] = value['sh proc'] elif key == "Basic integer operations": - lmbench['basic_intgr_bit'] = value['intgr bit'] - lmbench['basic_intgr_add'] = value['intgr add'] - lmbench['basic_intgr_mul'] = value['intgr mul'] - lmbench['basic_intgr_div'] = value['intgr div'] - lmbench['basic_intgr_mod'] = value['intgr mod'] + data_lmbench['basic_intgr_bit'] = value['intgr bit'] + data_lmbench['basic_intgr_add'] = value['intgr add'] + data_lmbench['basic_intgr_mul'] = value['intgr mul'] + data_lmbench['basic_intgr_div'] = value['intgr div'] + data_lmbench['basic_intgr_mod'] = value['intgr mod'] elif key == "Basic uint64 operations": - lmbench['basic_int64_bit'] = value['int64 bit'] - lmbench['basic_int64_add'] = value['int64 add'] - lmbench['basic_int64_mul'] = value['int64 mul'] - lmbench['basic_int64_div'] = value['int64 div'] - lmbench['basic_int64_mod'] = value['int64 mod'] + data_lmbench['basic_int64_bit'] = value['int64 bit'] + data_lmbench['basic_int64_add'] = value['int64 add'] + data_lmbench['basic_int64_mul'] = value['int64 mul'] + data_lmbench['basic_int64_div'] = value['int64 div'] + data_lmbench['basic_int64_mod'] = value['int64 mod'] elif key == "Basic float operations": - lmbench['basic_float_add'] = value['float add'] - lmbench['basic_float_mul'] = value['float mul'] - lmbench['basic_float_div'] = value['float div'] - lmbench['basic_float_bogo'] = value['float bogo'] + data_lmbench['basic_float_add'] = value['float add'] + data_lmbench['basic_float_mul'] = value['float mul'] + data_lmbench['basic_float_div'] = value['float div'] + data_lmbench['basic_float_bogo'] = value['float bogo'] elif key == "Basic double operations": - lmbench['basic_double_add'] = value['double add'] - lmbench['basic_double_mul'] = value['double mul'] - lmbench['basic_double_div'] = value['double div'] - lmbench['basic_double_bogo'] = value['double bogo'] + data_lmbench['basic_double_add'] = value['double add'] + data_lmbench['basic_double_mul'] = value['double mul'] + data_lmbench['basic_double_div'] = value['double div'] + data_lmbench['basic_double_bogo'] = value['double bogo'] elif key == "Context switching": - lmbench['context_2p_0K'] = value['2p/0K'] - lmbench['context_2p_16K'] = value['2p/16K'] - lmbench['context_2p_64K'] = value['2p/64K'] - lmbench['context_8p_16K'] = value['8p/16K'] - lmbench['context_8p_64K'] = value['8p/64K'] - lmbench['context_16p_16K'] = value['16p/16K'] - lmbench['context_16p_64K'] = value['16p/64K'] + data_lmbench['context_2p_0K'] = value['2p/0K'] + data_lmbench['context_2p_16K'] = value['2p/16K'] + data_lmbench['context_2p_64K'] = value['2p/64K'] + data_lmbench['context_8p_16K'] = value['8p/16K'] + data_lmbench['context_8p_64K'] = value['8p/64K'] + data_lmbench['context_16p_16K'] = value['16p/16K'] + data_lmbench['context_16p_64K'] = value['16p/64K'] elif key == "*Local* Communication latencies": - lmbench['local_2p_0K'] = value['2p/0K'] - lmbench['local_Pipe'] = value['Pipe'] - lmbench['local_AF_UNIX'] = value['AF UNIX'] - lmbench['local_UDP'] = value['UDP'] - lmbench['local_TCP'] = value['TCP'] - lmbench['local_TCP_conn'] = value['TCP conn'] - lmbench['local_RPC_TCP'] = value['RPC/TCP'] - lmbench['local_RPC_UDP'] = value['RPC/UDP'] + data_lmbench['local_2p_0K'] = value['2p/0K'] + data_lmbench['local_Pipe'] = value['Pipe'] + data_lmbench['local_AF_UNIX'] = value['AF UNIX'] + data_lmbench['local_UDP'] = value['UDP'] + data_lmbench['local_TCP'] = value['TCP'] + data_lmbench['local_TCP_conn'] = value['TCP conn'] + data_lmbench['local_RPC_TCP'] = value['RPC/TCP'] + data_lmbench['local_RPC_UDP'] = value['RPC/UDP'] elif key == "File & VM system latencies in microseconds": - lmbench['file_and_system_0K_File_create'] = value['0K File create'] - lmbench['file_and_system_0K_File_delete'] = value['0K File delete'] - lmbench['file_and_system_10K_File_create'] = value['10K File create'] - lmbench['file_and_system_10K_File_delete'] = value['10K File delete'] - lmbench['file_and_system_Mmap_Latency'] = value['Mmap Latency'] - lmbench['file_and_system_Prot_Fault'] = value['Prot Fault'] - lmbench['file_and_system_Page_Fault'] = value['Page Fault'] - lmbench['file_and_system_100fd_selct'] = value['100fd selct'] + data_lmbench['file_and_system_0K_File_create'] = value['0K File create'] + data_lmbench['file_and_system_0K_File_delete'] = value['0K File delete'] + data_lmbench['file_and_system_10K_File_create'] = value['10K File create'] + data_lmbench['file_and_system_10K_File_delete'] = value['10K File delete'] + data_lmbench['file_and_system_Mmap_Latency'] = value['Mmap Latency'] + data_lmbench['file_and_system_Prot_Fault'] = value['Prot Fault'] + data_lmbench['file_and_system_Page_Fault'] = value['Page Fault'] + data_lmbench['file_and_system_100fd_selct'] = value['100fd selct'] elif key == "*Local* Communication bandwidths in MB/s - bigger is better": - lmbench['local_bigger_Pipe'] = value['Pipe'] - lmbench['local_bigger_AF_UNIX'] = value['AF UNIX'] - lmbench['local_bigger_TCP'] = value['TCP'] - lmbench['local_bigger_File_reread'] = value['File reread'] - lmbench['local_bigger_Mmap_reread'] = value['Mmap reread'] - lmbench['local_bigger_Bcopy_libc'] = value['Bcopy(libc)'] - lmbench['local_bigger_Bcopy_hand'] = value['Bcopy(hand)'] - lmbench['local_bigger_Mem_read'] = value['Mem read'] - lmbench['local_bigger_Mem_write'] = value['Mem write'] + data_lmbench['local_bigger_Pipe'] = value['Pipe'] + data_lmbench['local_bigger_AF_UNIX'] = value['AF UNIX'] + data_lmbench['local_bigger_TCP'] = value['TCP'] + data_lmbench['local_bigger_File_reread'] = value['File reread'] + data_lmbench['local_bigger_Mmap_reread'] = value['Mmap reread'] + data_lmbench['local_bigger_Bcopy_libc'] = value['Bcopy(libc)'] + data_lmbench['local_bigger_Bcopy_hand'] = value['Bcopy(hand)'] + data_lmbench['local_bigger_Mem_read'] = value['Mem read'] + data_lmbench['local_bigger_Mem_write'] = value['Mem write'] elif key == "Memory latencies in nanoseconds": - lmbench['memory_Mhz'] = value['Mhz'] - lmbench['memory_L1'] = value['L1 $'] - lmbench['memory_L2'] = value['L2 $'] - lmbench['memory_Main_mem'] = value['Main mem'] - lmbench['memory_Rand_mem'] = value['Rand mem'] - lmbench = {key: value if not isinstance(value, str) or value != '' else None for key, value in - lmbench.items()} - serializer_lmbench = LmbenchSerializer(data=lmbench) + data_lmbench['memory_Mhz'] = value['Mhz'] + data_lmbench['memory_L1'] = value['L1 $'] + data_lmbench['memory_L2'] = value['L2 $'] + data_lmbench['memory_Main_mem'] = value['Main mem'] + data_lmbench['memory_Rand_mem'] = value['Rand mem'] + data_lmbench = {key: value if not isinstance(value, str) or value != '' else None for key, value in + data_lmbench.items()} + serializer_lmbench = LmbenchSerializer(data=data_lmbench) if serializer_lmbench.is_valid(): self.perform_create(serializer_lmbench) else: log.info('lmbench数据存储错误 ：%s，', serializer_lmbench.errors) - log.info('lmbench存储数据为 ：%s，', lmbench) + log.info('lmbench存储数据为 ：%s，', data_lmbench) serializer_lmbench_error.append(serializer_lmbench.errors) error_message.append(get_error_message(serializer_lmbench)) if serializer_lmbench_error: diff --git a/appStore/testMachine/views.py b/appStore/testMachine/views.py index e12de155409912d26b07cf05b3f7ae5eed46dc5e..5c12769a6a01ad9a6022352ec460743b25aa31f5 100644 --- a/appStore/testMachine/views.py +++ b/appStore/testMachine/views.py @@ -27,20 +27,20 @@ class TestMachineViewSet(viewsets.ModelViewSet): return json_response(serializer.data, status.HTTP_200_OK, '查询完成') def create(self, request, *args, **kwargs): - machine_data = {} - machine_data['owner'] = request.user.chinese_name - machine_data['machine_name'] = request.data.get('machine_name') - machine_data['arch_name'] = request.data.get('arch_name') - machine_data['cpu_module_name'] = request.data.get('cpu_module_name') - machine_data['BMC_IP'] = request.data.get('BMC_IP') - machine_data['BMC_user_name'] = request.data.get('BMC_user_name') - machine_data['BMC_password'] = request.data.get('BMC_password') - config_serializer = TestMachineSerializer(data=machine_data) + data_machine = {} + data_machine['owner'] = request.user.chinese_name + data_machine['machine_name'] = request.data.get('machine_name') + data_machine['arch_name'] = request.data.get('arch_name') + data_machine['cpu_module_name'] = request.data.get('cpu_module_name') + data_machine['BMC_IP'] = request.data.get('BMC_IP') + data_machine['BMC_user_name'] = request.data.get('BMC_user_name') + data_machine['BMC_password'] = request.data.get('BMC_password') + config_serializer = TestMachineSerializer(data=data_machine) if config_serializer.is_valid(): self.perform_create(config_serializer) return json_response(config_serializer.data, status.HTTP_200_OK, '创建成功！') log.info('Machine数据存储错误 ：%s，', config_serializer.errors) - log.info('Machine存储数据为 ：%s，', machine_data) + log.info('Machine存储数据为 ：%s，', data_machine) return json_response(config_serializer.errors, status.HTTP_400_BAD_REQUEST, config_serializer.errors) def put(self, request, *args, **kwargs): diff --git a/appStore/userConfig/views.py b/appStore/userConfig/views.py index fd3908865e3e29d3f14cc5d7ee63a4716708ab5f..0a32597abbe9046a5a569a50f66505bb038e165a 100644 --- a/appStore/userConfig/views.py +++ b/appStore/userConfig/views.py @@ -34,42 +34,42 @@ class UserConfigViewSet(viewsets.ModelViewSet): return json_response(serializer.data, status.HTTP_200_OK, '测试完成') def create(self, request, *args, **kwargs): - user_config_data = {} - user_config_data['user_name'] = request.user.chinese_name + data_user_config = {} + data_user_config['user_name'] = request.user.chinese_name # user_config_data['user_password'] = request.data.get('user_password') - user_config_data['config_name'] = request.data.get('config_name') - user_config_data['project_name'] = request.data.get('project_name') - user_config_data['test_ip'] = request.data.get('test_ip') - user_config_data['test_password'] = request.data.get('test_password') - user_config_data['stream_number'] = request.data.get('stream') - user_config_data['lmbench_number'] = request.data.get('lmbench') - user_config_data['unixbench_number'] = request.data.get('unixbench') - user_config_data['fio_number'] = request.data.get('fio') - user_config_data['iozone_number'] = request.data.get('iozone') - user_config_data['jvm2008_number'] = request.data.get('jvm2008') - user_config_data['cpu2006_number'] = request.data.get('cpu2006') - user_config_data['cpu2017_number'] = request.data.get('cpu2017') - user_config_data['stream_config'] = request.data.get('yaml')['stream'] - user_config_data['lmbench_config'] = request.data.get('yaml')['lmbench'] - user_config_data['unixbench_config'] = request.data.get('yaml')['unixbench'] - user_config_data['fio_config'] = request.data.get('yaml')['fio'] - user_config_data['iozone_config'] = request.data.get('yaml')['iozone'] - user_config_data['jvm2008_config'] = request.data.get('yaml')['jvm2008'] - user_config_data['cpu2006_config'] = request.data.get('yaml')['cpu2006'] - user_config_data['cpu2006_loongarch64_config'] = request.data.get('yaml')['cpu2006_loongarch64'] - user_config_data['cpu2017_config'] = request.data.get('yaml')['cpu2017'] - user_config_data['message'] = request.data.get('message') + data_user_config['config_name'] = request.data.get('config_name') + data_user_config['project_name'] = request.data.get('project_name') + data_user_config['test_ip'] = request.data.get('test_ip') + data_user_config['test_password'] = request.data.get('test_password') + data_user_config['stream_number'] = request.data.get('stream') + data_user_config['lmbench_number'] = request.data.get('lmbench') + data_user_config['unixbench_number'] = request.data.get('unixbench') + data_user_config['fio_number'] = request.data.get('fio') + data_user_config['iozone_number'] = request.data.get('iozone') + data_user_config['jvm2008_number'] = request.data.get('jvm2008') + data_user_config['cpu2006_number'] = request.data.get('cpu2006') + data_user_config['cpu2017_number'] = request.data.get('cpu2017') + data_user_config['stream_config'] = request.data.get('yaml')['stream'] + data_user_config['lmbench_config'] = request.data.get('yaml')['lmbench'] + data_user_config['unixbench_config'] = request.data.get('yaml')['unixbench'] + data_user_config['fio_config'] = request.data.get('yaml')['fio'] + data_user_config['iozone_config'] = request.data.get('yaml')['iozone'] + data_user_config['jvm2008_config'] = request.data.get('yaml')['jvm2008'] + data_user_config['cpu2006_config'] = request.data.get('yaml')['cpu2006'] + data_user_config['cpu2006_loongarch64_config'] = request.data.get('yaml')['cpu2006_loongarch64'] + data_user_config['cpu2017_config'] = request.data.get('yaml')['cpu2017'] + data_user_config['message'] = request.data.get('message') if request.data.get('is_send_config'): - user_config_data['is_send_config'] = request.data.get('is_send_config') + data_user_config['is_send_config'] = request.data.get('is_send_config') # 删除旧数据 UserConfig.objects.filter(is_send_config=True).delete() - config_serializer = UserConfigSerializer(data=user_config_data) - if config_serializer.is_valid(): - self.perform_create(config_serializer) - return json_response(config_serializer.data, status.HTTP_200_OK, '创建成功！') - log.info('userConfig数据存储错误 ：%s，', config_serializer.errors) - log.info('userConfig存储数据为 ：%s，', user_config_data) - return json_response({}, status.HTTP_400_BAD_REQUEST, config_serializer.errors) + serializer_config = UserConfigSerializer(data=data_user_config) + if serializer_config.is_valid(): + self.perform_create(serializer_config) + return json_response(serializer_config.data, status.HTTP_200_OK, '创建成功！') + log.info('userConfig数据存储错误 ：%s，', serializer_config.errors) + log.info('userConfig存储数据为 ：%s，', data_user_config) + return json_response({}, status.HTTP_400_BAD_REQUEST, serializer_config.errors) def put(self, request, *args, **kwargs): id = request.data.get('id') diff --git a/appStore/users/views.py b/appStore/users/views.py index f265c3fa9e3dadc7c8d26a45d82809ba736ee360..3468b68f1d33e8a509018d4e491c5a7fcb9c74ce 100644 --- a/appStore/users/views.py +++ b/appStore/users/views.py @@ -27,16 +27,16 @@ class UserProfileViewSet(viewsets.ModelViewSet): serializer_class = UserProfileSerializer def create(self, request, *args, **kwargs): - serializer = self.get_serializer(data=request.data) - if serializer.is_valid(): - user = UserProfile.objects.create_user(username=serializer.data['username'], - password=serializer.data['password'], - chinese_name=serializer.data['chinese_name']) + serializer_user = self.get_serializer(data=request.data) + if serializer_user.is_valid(): + user = UserProfile.objects.create_user(username=serializer_user.data['username'], + password=serializer_user.data['password'], + chinese_name=serializer_user.data['chinese_name']) # 可以根据需要设置其他用户属性 user.save() - return json_response(serializer.data, status.HTTP_200_OK, '创建成功！') - log.info('user数据存储错误 ：%s，', serializer.errors) - return json_response(serializer.errors, status.HTTP_400_BAD_REQUEST, get_error_message(serializer)) + return json_response(serializer_user.data, status.HTTP_200_OK, '创建成功！') + log.info('user数据存储错误 ：%s，', serializer_user.errors) + return json_response(serializer_user.errors, status.HTTP_400_BAD_REQUEST, get_error_message(serializer_user)) def change_password(self, request, *args, **kwargs):