From 42a19816143308808d31c74e8789deefd1547774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E5=AD=90=E8=B4=A4?= <2367744612@qq.com> Date: Sun, 21 Jun 2020 19:47:10 +0800 Subject: [PATCH 1/3] tmp --- resource.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resource.py b/resource.py index c4b005c..7efddd4 100644 --- a/resource.py +++ b/resource.py @@ -893,9 +893,11 @@ def create_resource(data): } """ rscs = data["rscs"] + rsc_id = str(data["id"]) cmd_str = "pcs resource group add " + rsc_id for r in rscs: cmd_str = cmd_str + " " + str(r) + status, output = common_utils.run_cmd(cmd_str) elif cate == "clone": """ -- Gitee From f709cf8b837ba95c6bcc1e0cf9b073122da53080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E5=AD=90=E8=B4=A4?= <2367744612@qq.com> Date: Sun, 21 Jun 2020 20:12:57 +0800 Subject: [PATCH 2/3] resource add_primitive and add_group and add_clone --- resource.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resource.py b/resource.py index 7efddd4..48ed691 100644 --- a/resource.py +++ b/resource.py @@ -179,7 +179,7 @@ def get_sub_rscs(rsc_id): sub_rsc["type"] = "primitive" sub_rsc["svc"] = clone["primitive"]["@type"] sub_rsc["running_node"] = [] - sub_rscs.append[sub_rsc] + sub_rscs.append(sub_rsc) if rsc_type == "group": groups = res_json["group"] @@ -662,6 +662,8 @@ def resource_action(rsc_id, action, data): #通过id查询category if get_rsc_category(rsc_id) == "group": cmd_str = "crm_resource -D -r " + str(rsc_id) + " -t group" + elif get_rsc_category(rsc_id) == "clone": + cmd_str = "pcs resource delete" + str(rsc_id).split('clone') else: cmd_str = "crm_resource --resource " + str(rsc_id) + " --delete -t primitive" status, output = common_utils.run_cmd(cmd_str) @@ -913,6 +915,8 @@ def create_resource(data): """ ori_id = str(data["rsc_id"]) cmd_str = "pcs resource clone " + ori_id + status, output = common_utils.run_cmd(cmd_str) + #通用步骤 # status, output = common_utils.run_cmd(cmd_str) -- Gitee From f9345e44c4216ec02757203257a30d7809a25491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E5=AD=90=E8=B4=A4?= <2367744612@qq.com> Date: Sun, 21 Jun 2020 20:18:37 +0800 Subject: [PATCH 3/3] resource add_primitive and add_group and add_clone --- resource.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource.py b/resource.py index 48ed691..4f593a0 100644 --- a/resource.py +++ b/resource.py @@ -663,7 +663,7 @@ def resource_action(rsc_id, action, data): if get_rsc_category(rsc_id) == "group": cmd_str = "crm_resource -D -r " + str(rsc_id) + " -t group" elif get_rsc_category(rsc_id) == "clone": - cmd_str = "pcs resource delete" + str(rsc_id).split('clone') + cmd_str = "pcs resource delete" + str(rsc_id) else: cmd_str = "crm_resource --resource " + str(rsc_id) + " --delete -t primitive" status, output = common_utils.run_cmd(cmd_str) -- Gitee