优化执行更新版本逻辑

update/utils/cmd_extcute.py

@@ -135,7 +135,7 @@ class UpdateConfigUtil:
 
     def exec_config(self, short_release):
         main_ver = Release.objects.filter(short_release=short_release).all()[0].main_ver
-        cmd_list = self.get_all_exec_cmd(main_ver)
+        cmd_list = self.get_all_exec_cmd({'33': main_ver})
         db_config = Cinema.objects.filter(ip=self.ip).values()[0]
         db_conn = pymysql.Connect(host=self.ip, port=3306, user=db_config['db_user'], passwd=db_config['db_pwd'],
                                   database='cine')
@@ -159,20 +159,27 @@ class UpdateConfigUtil:
         db_conn.close()
         return '<br/>'.join(result_list)
 
-    def get_all_exec_cmd(self, param):
+    def get_all_exec_cmd(self, params):
         all_config_obj = UpdateCommand.objects.filter(
             Q(process='config') & Q(run=self.run_before_teardown) & Q(is_delete=False)).values()
         cmd_list = []
         print(all_config_obj)
+        params = self.custom_param(params)
         for config_item in all_config_obj:
             if config_item['id'] in self.checked_list:
+                param = params.get(str(config_item['id']), '')
                 cmd_list.append({"desc": config_item['desc'],
                                  "cmd": [cmd.replace('<params>', param) for cmd in
                                          json.loads(config_item['command'])['checked']],
                                  "combo_cmd": config_item['combo_cmd']})
             else:
                 cmd_list.append({"desc": config_item['desc'],
-                                 "cmd": [cmd.replace('<params>', param) for cmd in
+                                 "cmd": json.loads(config_item['command'])['unchecked'],
-                                         json.loads(config_item['command'])['unchecked']],
                                  "combo_cmd": config_item['combo_cmd']})
         return cmd_list
+
+    def custom_param(self, params):
+        if 21 in self.checked_list:
+            if '33' in params.keys():
+                params['33'] = 'Cloud_' + params['33']
+        return params