From 6580af8aeca03d1e1013e385fc5fa518674649c8 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, 28 Jun 2020 10:39:26 +0800
Subject: [PATCH 1/3] create already_exist

---
 resource.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/resource.py b/resource.py
index cc9f0cb..17dab22 100644
--- a/resource.py
+++ b/resource.py
@@ -21,6 +21,7 @@ def get_rsc_metas(rsc_class, rsc_type, rsc_provider):
     data_name = etree.get("name", "")#找跟目录下的name
     data['name'] = data_name 
     parameter = etree.findall("./parameters/parameter")#parameter路径
+    print(type(parameter))
     for i in parameter:
         parameters={
             "name": i.get("name", ""),
@@ -1218,6 +1219,16 @@ def create_resource(data):
         cmd = "cibadmin --create -o resources --xml-text '<"
         crm = "crm_resource -m -r "
         role = " --set-parameter target-role --parameter-value stopped"
+        status, output = common_utils.run_cmd("cibadmin -Q")
+        xml_resource = parseString(output).documentElement
+        resourceid = []
+        for primitive in xml_resource.getElementsByTagName("primitive"):
+            id = str(primitive.getAttribute("id"))
+            resource_id = {
+                'id': id
+            }
+            if rsc_id is resource_id['id'] or rsc_id == resource_id['id']:
+                return {'action': False, 'error': "%s Resources already exist" %(str(rsc_id))}
         if "provider" in data:
             provider = " provider=\"" + str(data["provider"]) + "\""
             cmd_str = cmd + cate + rsc_id_str + rsc_class + rsc_type + provider + ">'"
@@ -1258,6 +1269,15 @@ def create_resource(data):
         rscs = data["rscs"]
         rsc_id = str(data["id"])
         cmd_str = "pcs resource group add " + rsc_id
+        status, output = common_utils.run_cmd("cibadmin -Q")
+        xml_resource = parseString(output).documentElement
+        for group in xml_resource.getElementsByTagName("group"):
+            id = str(group.getAttribute("id"))
+            resource_id = {
+                'id': id
+            }
+            if rsc_id is resource_id['id'] or rsc_id == resource_id['id']:
+                return {'action': False, 'error': "%s Resources already exist" %(str(rsc_id))}
         for r in rscs:
             cmd_str = cmd_str + " " + str(r)
         status, output = common_utils.run_cmd(cmd_str)
-- 
Gitee


From 1967bf44871d400a27d6c356e7519c881fa41895 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, 28 Jun 2020 10:42:37 +0800
Subject: [PATCH 2/3] create already_exist

---
 resource.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resource.py b/resource.py
index 17dab22..150e91f 100644
--- a/resource.py
+++ b/resource.py
@@ -1228,7 +1228,7 @@ def create_resource(data):
                 'id': id
             }
             if rsc_id is resource_id['id'] or rsc_id == resource_id['id']:
-                return {'action': False, 'error': "%s Resources already exist" %(str(rsc_id))}
+                return {'action': False, 'error': "%s Resources already exist" %(str(rsc_id)) }
         if "provider" in data:
             provider = " provider=\"" + str(data["provider"]) + "\""
             cmd_str = cmd + cate + rsc_id_str + rsc_class + rsc_type + provider + ">'"
@@ -1277,7 +1277,7 @@ def create_resource(data):
                 'id': id
             }
             if rsc_id is resource_id['id'] or rsc_id == resource_id['id']:
-                return {'action': False, 'error': "%s Resources already exist" %(str(rsc_id))}
+                return {'action': False, 'error': "%s Resources already exist" %(str(rsc_id)) }
         for r in rscs:
             cmd_str = cmd_str + " " + str(r)
         status, output = common_utils.run_cmd(cmd_str)
-- 
Gitee


From c6718857c8e1ec60f94d443f9c4d7a61b955a9db 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, 28 Jun 2020 10:43:31 +0800
Subject: [PATCH 3/3] create already_exist

---
 resource.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resource.py b/resource.py
index 150e91f..07e4f97 100644
--- a/resource.py
+++ b/resource.py
@@ -21,7 +21,6 @@ def get_rsc_metas(rsc_class, rsc_type, rsc_provider):
     data_name = etree.get("name", "")#找跟目录下的name
     data['name'] = data_name 
     parameter = etree.findall("./parameters/parameter")#parameter路径
-    print(type(parameter))
     for i in parameter:
         parameters={
             "name": i.get("name", ""),
-- 
Gitee