From 2a55aca1694996789644d2ba5052fdb41a83c797 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Fri, 7 Jun 2024 15:08:22 +0800
Subject: [PATCH] update

---
 .idea/vcs.xml                              |   6 ++++
 keystone/__pycache__/domain.cpython-36.pyc | Bin 1599 -> 1621 bytes
 keystone/__pycache__/group.cpython-36.pyc  | Bin 0 -> 2469 bytes
 keystone/__pycache__/user.cpython-36.pyc   | Bin 2273 -> 2280 bytes
 keystone/domain.py                         |   4 +++
 keystone/group.py                          |  39 ++++++++++++++++-----
 keystone/user.py                           |  14 ++++----
 main.py                                    |  31 ++++++++--------
 8 files changed, 64 insertions(+), 30 deletions(-)
 create mode 100644 .idea/vcs.xml
 create mode 100644 keystone/__pycache__/group.cpython-36.pyc

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/keystone/__pycache__/domain.cpython-36.pyc b/keystone/__pycache__/domain.cpython-36.pyc
index 3dcac0e99ddf02040c956609c4cb6c70c7cd5b24..38e82a322af47e888e0287342e3b3e53be7cb5e3 100644
GIT binary patch
delta 175
zcmdnbbCrk7n3tE!q#`NJjBO*=L`KGl$#WRhv<+%lvzVG0QdlJ!To_^%YT0VoQrILJ
zYM8Q_ihO`<c1ea>_8RtJh7^X$FBx}<2rvKvBM&17BOjv>m}X(xyp>6jkx^*!b!KB3
zH=uM0Lk&X>V+~U?b1icXa|#2{D2Wt?V1~(pta+0=SiA+~fQpLw;3lz5zR&W3QEl=C
M)+|;o4jv8;0M3mgZ2$lO

delta 136
zcmcc0v!92{n3tE!YH4EHJ=Tp}6B!vpCeLA1Q`f0s&0=b1NMV&^aAAm*sb#BSOJS2_
zsA0-xDl!1F*(Dij*=yJ*zh&Gd#K!;xj694SjC_njV0!azCPhX@fysB7jVFt<)=i$p
e;>{xiR8-6bQ9Ai6%LhiK$<J7`SUEU&IM@Jq_Z_zY

diff --git a/keystone/__pycache__/group.cpython-36.pyc b/keystone/__pycache__/group.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..cf48dde2314b11235e40f2b837e515f7f49d7f90
GIT binary patch
literal 2469
zcmb_dU27yo6s_v&@9CLj7u{@dT~StKl$hWmLRdsmUwjCH3rffm#;G#Xoy>G^RgIcZ
z^OSv976LwrVjw=OpopNbg5V!e@E7!}W;K7oC-1GEOgggx6}OwIkJ~j>-RGWj&(&r#
z{^gtZ-v1#c<Tp~g92ma>KlK(goN&5DR;!+_QkXkiPM@tZN;u>0EwbuzkNePjJm4Yp
zK96_|eZU($fj;C--hw{j^lj3fIf7luN}HBG&-<Np(Dg6?7rY0-@oVr?J!mw^s3C?L
zw#!DI@i^HG<z-H}lfq7%88Sz>J4Z%7_Y6(xDB!+vjAvXP>@%2$+R2#lO`zS(GvO}f
z;T{`B+Be=VrNl&;yG!7mqLtDUQs#1)z_Eu12fzQgclhn6hx=dc1U;>b<;BIFndKLk
zmX;PjxVpF@^I@TOl6Mzg9qQh~^?XwdO3y~ytaJyRz9^&W+tyQFHn>n-nHD<D2W_Ve
zdZNRHRHe&1y3-CM!d*5ugkC@SPbkIBp->uD6}i%-o2eYm;KP2QO0SUVK)2)4NsH3c
z_W0Nyzi!WNjQ7Eb3}AQZ;}L8qw`7RZ2&Zs_D)NC6UlVx&0)Jh5V|lHcbFo%z>s~%s
z%L_43y3^fU=oIPHY*TD2oe#vCJ@)xxyG*)LbhKEv0T=dD7oj1vMMJm~8afWeJ7yPP
zF7aWP;R?9$9q}(V@s@Ouc1W!Qsb!F6Os#9lz#z5mo|8GdWaNEx1t{Uolh?_OizDCo
z+@B}L*>vO*jDvYd?9HWjfVhz0aOK}7vP~^UrEfn(NhBly&D%^iaL6E0vI!%|+$?nR
z95&~%c?25^@S`v)X=-t;nmLRlnB*!^DaSRc1r0%T=y^aYfm=Qfk+YF`6P{>d1>t}o
zm|<2BmmU;^VSpUS(jw<+nmNV=to%I(amtt_eXt@i0haQA{B-LK%Fj+we(^Nt$56Fh
z`_2{~`55eYHaul`{N+<XO`{a6UjAVP(`DGLhEYgo0jU<1PeA-^j5s`bI2iE&m~@?o
zJhH_mM%;K~-+{t|j7lC7dPl#)8<#;}DAm~zRsFgB#nESX@8ACT@XkRkaCrCoKkt3n
zc5K$l21rv6)jBG+o&l(;VoPWtpMrfK<R~Kg5BMk522}>0f%OX6U9t2y12O1XUV&&A
zs~29VlZl3(g$X~=urt;$vl@1Qx1iyXYh2VZVCnr=b&kbYW1CkK<7pjE(<_>Y@CA5F
zg?g>N4S4l5jJsGY@j@$@*wG!B)Odx}2F+-qJ*zRaDi@R)oLH0bL5bm5i4oWnGXW^E
zvZq+H%r&8jw3qoN9@|sHG_rt4z`h+G^M++#Vq?t-`&$2(eG+p8FyaSVd$2|U<eC`7
z(a-qkNoXtw?|**p{wLqnNLd9=k+R}kSd{}LhD1xR>ZVt8bhl?qgT$&=txalaLzb1T
zff#GQ^0FD6*Zi!k0w<0tk<qKo+Om|_2#!`KvD8k}AQ=|mzhl382^OeJ&>XY8g_Wk}
zSeEb4!Si-p)j4#4GCa0H>*3bZs&B{oWaVKQCGn57^U-akHH7e5Kj*_O@iK*wLOU6o
M<+(6|yAgVS1BA0T;s5{u

literal 0
HcmV?d00001

diff --git a/keystone/__pycache__/user.cpython-36.pyc b/keystone/__pycache__/user.cpython-36.pyc
index a26607febbdbb73e71e97e431a451ce32e3c034f..ffd48bb054b7a9ff090319a183a9f4d18703f304 100644
GIT binary patch
delta 258
zcmaDT_(G7=n3tE!q#`LTek11|CdPot$C%XgHELK=SS1-;7-D5=S!-BR*d!Thn6jCQ
zT!3tLNrqsC6d*3t2?x`f9Fw(~^e4M93rvn-PGR9-Dw3T1jzx0vUFJZ=TP%M5ey+Dz
zQ;Ul7i%R(!7#N;US@Eo6`;#5LPuI?PI%mb?9#(x8O%|Y*T9ybw1)zdrJ|Mxs$iv71
zgp;4K^vX&B`9;z|0*3)jjFOxA*#sCFr6wz|?`4#ne2-n1@z!J>jv_|2$@Lsk0+JvD
V<UoWnh)|onlEavli-U`U2LPDOM{588

delta 247
zcmaDM_)w73n3tE!U}0j~+Krrhm>7K~A7fI}QK?}`VU=WXVThHeWvyXNVUuL2VajGI
z(gCvBB^iPl3U$I6QaFMcG&%hy`?5$(=3*3>?7}R@c8kT&-_Lb&6mtp-4`Y$k<c}<p
zlW#Kz@)U_PFfiO=O)V<QFPf~+E;l)vMTJpnasx|*pgd5fm=8!WF!C^RFmf<We#z3y
zC_Y)8T@9#8aq=P7U`DCUVr&A8V8OjWZBN;C8KWi(a};T-0<~#!6mbBlA}$ai3?f89
YgcOL70};v~LUr;64r5kM4sH$}08lbCk^lez

diff --git a/keystone/domain.py b/keystone/domain.py
index f5ea945..fcf5fd0 100644
--- a/keystone/domain.py
+++ b/keystone/domain.py
@@ -13,6 +13,8 @@ def get_domain_id(ip, token, domain_name):
         if i['name'] == domain_name:
             domain_id = i['id']
             return domain_id
+        else:
+            return None
 def create_domain(ip, token, domain_name, description):
     url = "http://" + ip + ":5000/v3/domains"
     headers = {'X-Auth-Token': token}
@@ -27,6 +29,8 @@ def create_domain(ip, token, domain_name, description):
     return response.json()
 def show_domain(ip, token,domain_name):
     domain_id = get_domain_id(ip, token, domain_name)
+    if domain_id == None:
+        return None
     url = "http://" + ip + ":5000/v3/domains/" + domain_id
     headers = {'X-Auth-Token': token}
     response = requests.get(url, headers=headers)
diff --git a/keystone/group.py b/keystone/group.py
index a641270..de14d58 100644
--- a/keystone/group.py
+++ b/keystone/group.py
@@ -1,50 +1,73 @@
 import requests
 import json
-def create_group(ip, token, group_name, description):
+from keystone import domain
+def create_group(ip, token, group_name,domain_name, description):
+    domain_id=domain.get_domain_id(ip, token, domain_name)
+    if domain_id is None:
+        return {"error": "域不存在"}
     url = "http://" + ip + ":5000/v3/groups"
     headers = {'X-Auth-Token': token}
     data = {
         "group": {
-            "name": group_name,
-             "domain_id": "default",
+             "name": group_name,
+            "domain_id": domain_id,
             "description": description
         }
     }
     response = requests.post(url, headers=headers, data=json.dumps(data))
+    print(domain_id)
     return response.json()
+
 def get_group_id(ip, token, group_name):
     url = "http://" + ip + ":5000/v3/groups"
     headers = {'X-Auth-Token': token}
-    response = requests.get(url, headers=headers)
-    for i in response.json()['groups']:
+    response = requests.get(url, headers=headers).json()
+    for i in response['groups']:
         if i['name'] == group_name:
             return i['id']
+    return None
+
 def show_group(ip, token, group_name):
     group_id = get_group_id(ip, token, group_name)
+    if group_id is None:
+        return {"error": "组不存在"}
     url = "http://" + ip + ":5000/v3/groups/" + group_id
     headers = {'X-Auth-Token': token}
     response = requests.get(url, headers=headers)
     return response.json()
+
 def delete_group(ip, token, group_name):
     group_id = get_group_id(ip, token, group_name)
+    if group_id is None:
+        return {"error": "组不存在"}
     url = "http://" + ip + ":5000/v3/groups/" + group_id
     headers = {'X-Auth-Token': token}
     response = requests.delete(url, headers=headers)
-    return response.json()
+    if response.status_code == 204:
+        return {"message": "删除成功"}
+    else:
+        return {"error": "删除失败","status_code": response.status_code}
 def get_group(ip, token):
     url = "http://" + ip + ":5000/v3/groups"
     headers = {'X-Auth-Token': token}
     response = requests.get(url, headers=headers)
     return response.json()
-def update_group(ip, token, group_name, new_group_name, new_description):
+def update_group(ip, token, group_name, new_group_name,new_domain_name, new_description):
     group_id = get_group_id(ip, token, group_name)
+    if group_id is None:
+        return {"error": "组不存在"}
+    new_domain_id = domain.get_domain_id(ip, token, new_domain_name)
     url = "http://" + ip + ":5000/v3/groups/" + group_id
     headers = {'X-Auth-Token': token}
     data = {
         "group": {
             "name": new_group_name,
+            "domain_id": new_domain_id,
             "description": new_description
         }
     }
     response = requests.patch(url, headers=headers, data=json.dumps(data))
-    return response.json()
\ No newline at end of file
+    if response.status_code == 200:
+        return {"message": "更新成功"}
+    else:
+        return {"error": "更新失败","status_code": response.status_code}
\ No newline at end of file
diff --git a/keystone/user.py b/keystone/user.py
index dd58171..5d93c07 100644
--- a/keystone/user.py
+++ b/keystone/user.py
@@ -10,13 +10,13 @@ def create_user(ip, token, user_name, password, description):
         }
     }
     resp = requests.post(f"http://{ip}:5000/v3/users", data=json.dumps(body), headers=headers)
-    return resp.json()  # Assuming the API returns JSON
+    return resp.json()
 
 
 def get_users(ip, token):
     headers = {'X-Auth-Token': token}
     resp = requests.get(f"http://{ip}:5000/v3/users", headers=headers)
-    return resp.json()  # Assuming the API returns JSON
+    return resp.json()
 
 
 def get_user_id(ip, token, user_name):
@@ -25,24 +25,24 @@ def get_user_id(ip, token, user_name):
     for item in result['users']:
         if item['name'] == user_name:
             return item['id']
-    return "NONE"
+        else:
+            return None
 
 
 def get_user(ip, token, user_name):
     user_id = get_user_id(ip, token, user_name)
     if user_id == "NONE":
-        return {"error": "User not found"}
-
+        return {"error": "用户不存在"}
     headers = {'X-Auth-Token': token}
     api_url = f"http://{ip}:5000/v3/users/{user_id}"
     resp = requests.get(api_url, headers=headers)
-    return resp.json()  # Assuming the API returns JSON
+    return resp.json()
 
 
 def delete_user(ip, token, user_name):
     user_id = get_user_id(ip, token, user_name)
     if user_id == "NONE":
-        return {"error": "User not found"}
+        return {"error": "用户不存在"}
 
     headers = {'X-Auth-Token': token}
     api_url = f"http://{ip}:5000/v3/users/{user_id}"
diff --git a/main.py b/main.py
index 64327d5..bacad85 100644
--- a/main.py
+++ b/main.py
@@ -1,4 +1,4 @@
-from keystone import get_token
+from keystone import get_token, group
 from keystone import user
 from keystone import domain
 import time
@@ -77,39 +77,39 @@ def main():
         choice = input("输入选项 (1-5): ")
         print("====================")
         if choice == '1':
-            user_name = input("请输入组名: ")
-            password = input("请输入域: ")
+            group_name = input("请输入组名: ")
+            domain_name = input("请输入域: ")
             description = input("请输入描述: ")
-            result = user.create_user(ip, token, user_name, password, description)
+            result = group.create_group(ip, token,group_name,domain_name, description)
             print(result)
             print("====================")
             main()
 
         elif choice == '2':
-            result = user.get_users(ip, token)
+            result = group.get_group(ip, token)
             print(result)
             main()
 
         elif choice == '3':
-            user_name = input("请输入用户名: ")
-            result = user.get_user(ip, token, user_name)
+            group_name = input("请输入组名: ")
+            result = group.show_group(ip, token,group_name)
             print(result)
             main()
 
         elif choice == '4':
-            user_name = input("请输入用户名: ")
-            result = user.delete_user(ip, token, user_name)
+            group_name:str = input("请输入组名: ")
+            result = group.delete_group(ip, token, group_name)
             print(result)
             main()
 
         elif choice == '5':
-            user_name = input("请输入用户名: ")
-            new_password = input("请输入新密码: ")
-            original_password = input("请输入原始密码: ")
-            result = user.update_user_password(ip, token, user_name, new_password, original_password)
+            group_name = input("请输入原组名: ")
+            new_group_name= input("请输入新组名: ")
+            new_domain_name = input("请输入新域名: ")
+            new_description = input("请输入新描述: ")
+            result = group.update_group(ip, token,group_name,new_group_name,new_domain_name, new_description)
             print(result)
             main()
-
         else:
             print("无效选项")
             main()
@@ -117,7 +117,8 @@ def main():
     # elif choice == '3':
     #
     # elif choice == '4':
-    #
+    #2
+
     # elif choice == '5':
     else:
         print("无效选项")