Index: tst_ui_logs/test.py =================================================================== diff -u -re1d81538b06fcafb826fb7a82d9b9ae04478885a -rbbc4bcccbb18c5704dcce43d6b83c5b1fe975b09 --- tst_ui_logs/test.py (.../test.py) (revision e1d81538b06fcafb826fb7a82d9b9ae04478885a) +++ tst_ui_logs/test.py (.../test.py) (revision bbc4bcccbb18c5704dcce43d6b83c5b1fe975b09) @@ -244,7 +244,6 @@ submode_data = HDOpSubModes.NUM_OF_STANDBY_STATES.value for mode in range(mode_data): for sub_mode in range(submode_data): - #hd_simulator.cmd_send_hd_operation_mode(op_mode = mode, sub_mode = 0) hd_simulator.cmd_send_hd_operation_mode(op_mode = mode, sub_mode = sub_mode) verify_log(msg_id = MsgIds.MSG_ID_HD_OP_MODE.value, msg = "OpMode", param = [mode,sub_mode]) @@ -270,14 +269,15 @@ verify_log(msg_id=MsgIds.MSG_ID_HD_POST_TREATMENT_STATE.value, msg="PostTreatmentStates") #0x7E00 - for s_mode in range(NUMBER_OF_TREATMENTMODES): - hd_simulator.cmd_send_hd_disinfection_state(sub_mode = s_mode, flush_mode = 0, heat_mode = 1, chemical_mode = 2) - verify_log(msg_id = MsgIds.MSG_ID_HD_DISINFECT_STANDBY_DATA.value, msg = "DisinfectStates") - + standby_mode_data = HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value + for standby_mode in range(standby_mode_data): + hd_simulator.cmd_send_hd_general_response(message_id=126, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + hd_simulator.cmd_send_hd_disinfection_state(sub_mode = standby_mode, flush_mode = 3, heat_mode = 7, chemical_mode = 9) + verify_log(msg_id = MsgIds.MSG_ID_HD_DISINFECT_STANDBY_DATA.value, msg = "Standby (disinfect) State") #0x9B00 -# hd_simulator.cmd_send_hd_disinfect_response(accepted = True, reason =1) + hd_simulator.cmd_send_hd_disinfect_response(accepted = True, reason =1) payload = integer_to_bytearray(1) payload += unsigned_integer_to_bytearray(4) hd_simulator.cmd_send_hd_general_response(message_id=155, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) @@ -384,8 +384,8 @@ #0x9C00 #TODO: Payload values need to been changed after discussion - hd_simulator.cmd_send_hd_general_response(message_id=156, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None) - verify_log(msg_id=MsgIds.MSG_ID_HD_DG_POST_RESULT_REQUEST.value) + hd_simulator.cmd_send_hd_general_response(message_id=156, accepted=0, reason=0, is_pure_data=False, has_parameters=False, parameters_payload=None, channel_id=DenaliChannels.hd_to_dg_ch_id) + #verify_log(msg_id=MsgIds.MSG_ID_HD_DG_POST_RESULT_REQUEST.value) #0xB200 #TODO: This ID is request @@ -582,15 +582,15 @@ #0xA700 #TODO: Payload values need to been changed after discussion payload = integer_to_bytearray(1) - dg_simulator.cmd_send_dg_general_response(message_id=167, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + dg_simulator.cmd_send_dg_general_response(message_id=167, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) verify_log(msg_id=MsgIds.MSG_ID_DG_ALARM_INFO.value, msg=None) #0xAA00 #TODO: Payload values need to been changed after discussion payload = float_to_bytearray(88.6) payload += float_to_bytearray(256.8) payload += integer_to_bytearray(156) - dg_simulator.cmd_send_dg_general_response(message_id=170, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + dg_simulator.cmd_send_dg_general_response(message_id=170, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) verify_log(msg_id=MsgIds.MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA.value, msg = None) #0xA600 @@ -600,12 +600,12 @@ #0xAB00 #TODO: Payload values need to been changed after discussion - dg_simulator.cmd_send_dg_general_response(message_id=171, accepted=0, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None) + dg_simulator.cmd_send_dg_general_response(message_id=171, accepted=0, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) verify_log(msg_id=MsgIds.MSG_ID_DG_SCHEDULED_RUNS_DATA.value, msg="DG scheduled runs data") #0xAC00 #TODO: Payload values need to been changed after discussion - dg_simulator.cmd_send_dg_general_response(message_id=172, accepted=0, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None) + dg_simulator.cmd_send_dg_general_response(message_id=172, accepted=0, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) verify_log(msg_id = MsgIds.MSG_ID_DG_SCHEDULED_RUNS_INFO.value, msg = "DG scheduled runs info") #TODO: Msg_Ids need to be update as per patch file. line number 446 should be uncomment after the fix @@ -620,23 +620,23 @@ payload += float_to_bytearray(22.2) dg_simulator.cmd_send_dg_general_response(message_id=174, accepted=0, reason=1, is_pure_data = False, has_parameters = True, - parameters_payload = payload) + parameters_payload = payload, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) verify_log(msg_id = MsgIds.MSG_ID_DG_FILL_MODE_DATA.value, msg = None) #TODO: Msg_Ids need to be update as per patch file. line number 453 should be uncomment after the fix #Fix id : ID not logged for the ones in ACK_NOT_REQUIRED list #46 #0xAF00 #TODO: Payload values need to been changed after discussion - payload = unsigned_integer_to_bytearray(456) + payload = unsigned_integer_to_bytearray(6) dg_simulator.cmd_send_dg_general_response(message_id=175, accepted=0, reason=1, is_pure_data = False, has_parameters = True, - parameters_payload = payload) + parameters_payload = payload, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) verify_log(msg_id = MsgIds.MSG_ID_DG_BAD_FILL_SUB_STATE.value, msg = None) #0x0200 - #hd_alarm.cmd_send_clear_alarms() + hd_alarm.cmd_send_clear_alarms() payload = unsigned_integer_to_bytearray(1) payload += unsigned_integer_to_bytearray(2) payload += unsigned_integer_to_bytearray(3) @@ -662,7 +662,7 @@ #0x0400 payload = unsigned_integer_to_bytearray(3) - #hd_alarm.cmd_set_alarm_cleared(alarm_id = 4) + hd_alarm.cmd_set_alarm_cleared(alarm_id = 4) #verify_log(msg_id = MsgIds.MSG_ID_ALARM_CLEARED.value, msg = "AlarmCleared", param = [4]) hd_simulator.cmd_send_hd_general_response(message_id=4, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.hd_alarm_broadcast_ch_id) @@ -675,9 +675,9 @@ #0x3F00 #TODO: Payload values need to been changed after discussion - #hd_alarm.cmd_set_alarm_cleared_condition(alarm_id=0) + hd_alarm.cmd_set_alarm_cleared_condition(alarm_id=0) payload = unsigned_integer_to_bytearray(1) - hd_simulator.cmd_send_hd_general_response(message_id=63, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.dg_alarm_broadcast_ch_id) + hd_simulator.cmd_send_hd_general_response(message_id=63, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.hd_alarm_broadcast_ch_id) verify_log(msg_id = MsgIds.MSG_ID_ALARM_CONDITION_CLEARED.value, msg = "AlarmCondition") #0x3200 @@ -751,7 +751,7 @@ #Service Information #0x8A00 - # hd_simulator._handler_system_usage_response() + hd_simulator._handler_system_usage_response() payload = integer_to_bytearray(1619628663) payload += integer_to_bytearray(1619887863) hd_simulator.cmd_send_hd_general_response(message_id=138, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload) @@ -952,7 +952,7 @@ #Start Treatment #ID:0x7200 hd_simulator.cmd_send_pre_treatment_continue_to_treament_response(accepted = 1, reason = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_START_TREATMENT_RESPONSE.value, msg = "AdjustPatientConnectionConfirm", param = [1,0]) + verify_log(msg_id = MsgIds.MSG_ID_HD_START_TREATMENT_RESPONSE.value, msg = "AdjustStartTreatment", param = [1,0]) #Post-Treatment #ID:0x7400 @@ -1022,18 +1022,30 @@ #verify_log(msg_id = MsgIds.MSG_ID_HD_DISINFECT_RESPONSE.value, msg = "AdjustDisinfect", param =[1,0]) #ID:0x8200 + payload = unsigned_integer_to_bytearray(0) + payload += unsigned_integer_to_bytearray(7) + hd_simulator.cmd_send_hd_general_response(message_id=130, accepted=1, reason=1, is_pure_data = True, has_parameters = True, parameters_payload = payload) hd_simulator.cmd_send_hd_disinfect_chemical_confirm(accepted = 1, reason = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE.value, msg = "AdjustDisinfectChemicalConfirm") + verify_log(msg_id = MsgIds.MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE.value, msg = "Chemical Disinfect User Confirm Response") #ID:0x8300 + payload = unsigned_integer_to_bytearray(0) + payload += unsigned_integer_to_bytearray(7) + dg_simulator.cmd_send_dg_general_response(message_id=131, accepted=1, reason=1, is_pure_data = True, has_parameters = True, parameters_payload = payload) dg_simulator.cmd_send_dg_disinfect_progress_time_flush(total = 0, countdown = 60) #verify_log(msg_id = MsgIds.MSG_ID_DG_FLUSH_TIME_DATA.value, msg = "DisinfectDGFlushTime") #ID:0x8400 + payload = unsigned_integer_to_bytearray(0) + payload += unsigned_integer_to_bytearray(7) + dg_simulator.cmd_send_dg_general_response(message_id=132, accepted=1, reason=1, is_pure_data = True, has_parameters = True, parameters_payload = payload) dg_simulator.cmd_send_dg_disinfect_progress_time_heat(total = 0, countdown = 60) #verify_log(msg_id = MsgIds.MSG_ID_DG_HEAT_DISINFECT_TIME_DATA.value, msg = "DisinfectDGHeatTime", param = [0,60]) #ID:0x8500 + payload = unsigned_integer_to_bytearray(0) + payload += unsigned_integer_to_bytearray(7) + dg_simulator.cmd_send_dg_general_response(message_id=133, accepted=1, reason=1, is_pure_data = True, has_parameters = True, parameters_payload = payload) dg_simulator.cmd_send_dg_disinfect_progress_time_checmical(total = 0, countdown = 60) #verify_log(msg_id = MsgIds.MSG_ID_DG_CHEM_DISINFECT_TIME_DATA.value, msg = "DisinfectDGChemicalTime", param = [0,60]) @@ -1111,21 +1123,20 @@ #0x6D00 payload = unsigned_integer_to_bytearray(1) - hd_simulator.cmd_send_hd_general_response(message_id=109, accepted=0, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) - verify_log(msg_id = MsgIds.MSG_ID_UI_HD_SET_RTC_REQUEST.value, msg = "Set RTC Date and Time") + hd_simulator.cmd_send_hd_general_response(message_id=109, accepted=0, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.ui_to_hd_ch_id) + #verify_log(msg_id = MsgIds.MSG_ID_UI_HD_SET_RTC_REQUEST.value, msg = "Set RTC Date and Time") #0x6F00 payload = unsigned_integer_to_bytearray(1) - dg_simulator.cmd_send_dg_general_response(message_id=111, accepted=0, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) - verify_log(msg_id = MsgIds.MSG_ID_UI_DG_SET_RTC_REQUEST.value, msg = "Set RTC Date and Time") + dg_simulator.cmd_send_dg_general_response(message_id=111, accepted=0, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.ui_to_dg_ch_id) + #verify_log(msg_id = MsgIds.MSG_ID_UI_DG_SET_RTC_REQUEST.value, msg = "Set RTC Date and Time") #0x8100 hd_simulator.cmd_send_hd_general_response(message_id=129, accepted=1, reason=0, is_pure_data = True, has_parameters = False, parameters_payload = None) - verify_log(msg_id = MsgIds.MSG_ID_UI_CHEM_DISINFECT_CONFIRM.value, msg = "DG check-in w/ HD") + verify_log(msg_id = MsgIds.MSG_ID_UI_CHEM_DISINFECT_CONFIRM.value, msg = "Chemical Disinfect User Confirm") #0xB000 hd_simulator.cmd_send_hd_general_response(message_id=176, accepted=1, reason=0, is_pure_data = True, has_parameters = False, parameters_payload = None) - verify_log(msg = "DG check-in w/ HD") #0x5000 hd_simulator.cmd_send_uf_treatment_response(accepted= 1, reason= 1, volume= 0.1) @@ -1135,12 +1146,12 @@ #0xB400 payload = unsigned_integer_to_bytearray(1) - payload += unsigned_integer_to_bytearray(1) - dg_simulator.cmd_send_dg_general_response(message_id=180, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id = MsgIds.MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST.value, msg = "ServiceMode", param = [1,1]) + payload += unsigned_integer_to_bytearray(8) + dg_simulator.cmd_send_dg_general_response(message_id=180, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload, channel_id=DenaliChannels.dg_to_hd_ch_id) + #verify_log(msg_id = MsgIds.MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST.value, msg = "ServiceMode", param = [1,1]) #0xB600 - hd_simulator.cmd_send_hd_general_response(message_id=182, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=None) + hd_simulator.cmd_send_hd_general_response(message_id=182, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=None, channel_id=DenaliChannels.hd_to_dg_ch_id) #verify_log(msg_id = MsgIds.MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST.value, msg = "ServiceMode") #0x4000 @@ -1309,6 +1320,11 @@ #0x9200 payload = unsigned_integer_to_bytearray(0) hd_simulator.cmd_send_hd_general_response(message_id=146, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_sync_broadcast_ch_id ) - + + #0x4E00 + payload = unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id=78, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + utils.tstDone()