update/utils/cmd_extcute.py

@@ -48,20 +48,16 @@ class UpdateCommandUtil:
             'id').all()
 
     def get_checked_cmd(self, cmd_list, is_delete='0'):
-        before_sys_result = self.model.objects.filter(
-            Q(is_delete=is_delete) & Q(id__in=cmd_list) & Q(process='before_sys')).order_by('run_num').all()
         sys_result = self.get_sys_cmd()
         checked_setup_result = self.model.objects.filter(
             Q(is_delete=is_delete) & Q(id__in=cmd_list) & Q(process='setup')).order_by('run_num').all()
         checked_teardown_result = self.model.objects.filter(
             Q(is_delete=is_delete) & Q(id__in=cmd_list) & Q(process='teardown')).order_by('run_num').all()
         sys_cmd = [{'desc': sys.desc, 'cmd': sys.command} for sys in sys_result]
-        checked_before_sys_cmd = [{'desc': before.desc, 'cmd': before.command} for before in before_sys_result]
         checked_setup_cmd = [{'desc': setup.desc, 'cmd': setup.command} for setup in checked_setup_result]
         checked_teardown_cmd = [{'desc': teardown.desc, 'cmd': teardown.command} for teardown in
                                 checked_teardown_result]
-        return {'before_sys': checked_before_sys_cmd, 'sys': sys_cmd, 'setup': checked_setup_cmd,
+        return {'sys': sys_cmd, 'setup': checked_setup_cmd, 'teardown': checked_teardown_cmd}
-                'teardown': checked_teardown_cmd}
 
     def exec_cmd(self, cinema_ip, _exec_cmd_list):
         self.connect(cinema_ip)
@@ -105,8 +101,8 @@ class UpdateCommandUtil:
         exec_cmd_data = self.get_checked_cmd(cmd_list, is_delete)
         print('exec_cmd_data', exec_cmd_data)
         if _type == 'setup':
-            cmds = exec_cmd_data['before_sys'] + exec_cmd_data['sys'] + exec_cmd_data['setup']
+            cmds = exec_cmd_data['sys'] + exec_cmd_data['setup']
-            # cmds = cmds.sort()
+            cmds = cmds.sort()
         elif _type == 'combo':
             cmds = exec_cmd_data['setup']
         elif _type == 'teardown':