From 0496d032e88dfef395aa476fca8ded909505cf64 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Mon, 17 Jun 2024 16:58:18 +0800
Subject: [PATCH] update

---
 .../__pycache__/keystone_main.cpython-36.pyc  | Bin 0 -> 4201 bytes
 keystone/keystone_main.py                     |  52 +++--
 main.py                                       | 184 +-----------------
 3 files changed, 28 insertions(+), 208 deletions(-)
 create mode 100644 keystone/__pycache__/keystone_main.cpython-36.pyc

diff --git a/keystone/__pycache__/keystone_main.cpython-36.pyc b/keystone/__pycache__/keystone_main.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d827a04b8999b804fc3dc14b4ec9f17366c1b9e4
GIT binary patch
literal 4201
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

literal 0
HcmV?d00001

diff --git a/keystone/keystone_main.py b/keystone/keystone_main.py
index 0375e50..6ba4ce3 100644
--- a/keystone/keystone_main.py
+++ b/keystone/keystone_main.py
@@ -3,7 +3,7 @@ from keystone import user
 from keystone import domain
 from keystone import project
 import time
-def main():
+def keystone_main():
     print("====================")
     print("选择一个操作:")
     print("====================")
@@ -39,24 +39,24 @@ def main():
             result = user.create_user(ip, token, user_name,password, email,domain_name,default_project_name, description)
             print(result)
             print("====================")
-            main()
+            keystone_main()
 
         elif choice == '2':
             result = user.get_users(ip, token)
             print(result)
-            main()
+            keystone_main()
 
         elif choice == '3':
             user_name = input("请输入用户名: ")
             result = user.get_user(ip, token, user_name)
             print(result)
-            main()
+            keystone_main()
 
         elif choice == '4':
             user_name = input("请输入用户名: ")
             result = user.delete_user(ip, token, user_name)
             print(result)
-            main()
+            keystone_main()
 
         elif choice == '5':
             user_name = input("请输入用户名: ")
@@ -64,11 +64,11 @@ def main():
             original_password = input("请输入原始密码: ")
             result = user.update_user_password(ip, token, user_name, new_password, original_password)
             print(result)
-            main()
+            keystone_main()
 
         else:
             print("无效选项")
-            main()
+            keystone_main()
 
     elif choice == '2':
         print("====================")
@@ -88,24 +88,24 @@ def main():
             result = group.create_group(ip, token,group_name,domain_name, description)
             print(result)
             print("====================")
-            main()
+            keystone_main()
 
         elif choice == '2':
             result = group.get_group(ip, token)
             print(result)
-            main()
+            keystone_main()
 
         elif choice == '3':
             group_name = input("请输入组名: ")
             result = group.show_group(ip, token,group_name)
             print(result)
-            main()
+            keystone_main()
 
         elif choice == '4':
             group_name:str = input("请输入组名: ")
             result = group.delete_group(ip, token, group_name)
             print(result)
-            main()
+            keystone_main()
 
         elif choice == '5':
             group_name = input("请输入原组名: ")
@@ -114,10 +114,10 @@ def main():
             new_description = input("请输入新描述: ")
             result = group.update_group(ip, token,group_name,new_group_name,new_domain_name, new_description)
             print(result)
-            main()
+            keystone_main()
         else:
             print("无效选项")
-            main()
+            keystone_main()
     #
     elif choice == '3':
         print("====================")
@@ -140,24 +140,24 @@ def main():
             result = user.create_user(ip, token, user_name, password, email, domain_name, default_project_name,description)
             print(result)
             print("====================")
-            main()
+            keystone_main()
 
         elif choice == '2':
             result = user.get_users(ip, token)
             print(result)
-            main()
+            keystone_main()
 
         elif choice == '3':
             user_name = input("请输入用户名: ")
             result = user.get_user(ip, token, user_name)
             print(result)
-            main()
+            keystone_main()
 
         elif choice == '4':
             user_name = input("请输入用户名: ")
             result = user.delete_user(ip, token, user_name)
             print(result)
-            main()
+            keystone_main()
 
         elif choice == '5':
             user_name = input("请输入用户名: ")
@@ -165,11 +165,11 @@ def main():
             original_password = input("请输入原始密码: ")
             result = user.update_user_password(ip, token, user_name, new_password, original_password)
             print(result)
-            main()
+            keystone_main()
 
         else:
             print("无效选项")
-            main()
+            keystone_main()
     #
     elif choice == '4':
         print("====================")
@@ -189,21 +189,21 @@ def main():
             result = project.create_project(ip, token, project_name,domain_name, description)
             print(result)
             print("====================")
-            main()
+            keystone_main()
         elif choice == '2':
             result = project.get_project(ip, token)
             print(result)
-            main()
+            keystone_main()
         elif choice == '3':
             project_name = input("请输入项目名: ")
             result = project.show_project(ip, token,project_name)
             print(result)
-            main()
+            keystone_main()
         elif choice == '4':
             project_name = input("请输入项目名: ")
             result = project.delete_project(ip, token, project_name)
             print(result)
-            main()
+            keystone_main()
         elif choice == '5':
             project_name = input("请输入原项目名: ")
             new_project_name = input("请输入新项目名: ")
@@ -211,12 +211,10 @@ def main():
             new_description = input("请输入新描述: ")
             result = project.update_project(ip, token,project_name, new_project_name,new_domain_id, new_description)
             print(result)
-            main()
+            keystone_main()
     #2
     elif choice == '5':
         print(token)
     else:
         print("无效选项")
-        main()
-if __name__ == "__main__":
-    main()
+        keystone_main()
diff --git a/main.py b/main.py
index b2c142e..de3aab6 100644
--- a/main.py
+++ b/main.py
@@ -1,181 +1,3 @@
-from keystone import get_token, group
-from keystone import user
-from keystone import domain
-import time
-def main():
-    print("====================")
-    print("选择一个操作:")
-    print("====================")
-    print("Keystone操作")
-    print("1. 用户管理")
-    print("2. 组管理")
-    print("3. 域管理")
-    print("4. 项目管理")
-    print("====================")
-    choice = input("输入选项 (1-3): ")
-
-    ip = "172.30.26.171"
-    token = get_token.get_token(ip,'demo','admin','admin','000000')
-
-    if choice == '1':
-        print("====================")
-        print("选择一个操作:")
-        print("1. 创建用户")
-        print("2. 获取所有用户")
-        print("3. 获取特定用户信息")
-        print("4. 删除用户")
-        print("5. 更新用户密码")
-        print("====================")
-        choice = input("输入选项 (1-5): ")
-        print("====================")
-        if choice == '1':
-            user_name = input("请输入用户名: ")
-            password = input("请输入密码: ")
-            email=input("请输入邮箱: ")
-            domain_name=input("请输入域名: ")
-            default_project_name=input("请输入默认项目: ")
-            description = input("请输入描述: ")
-            result = user.create_user(ip, token, user_name,password, email,domain_name,default_project_name, description)
-            print(result)
-            print("====================")
-            main()
-
-        elif choice == '2':
-            result = user.get_users(ip, token)
-            print(result)
-            main()
-
-        elif choice == '3':
-            user_name = input("请输入用户名: ")
-            result = user.get_user(ip, token, user_name)
-            print(result)
-            main()
-
-        elif choice == '4':
-            user_name = input("请输入用户名: ")
-            result = user.delete_user(ip, token, user_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)
-            print(result)
-            main()
-
-        else:
-            print("无效选项")
-            main()
-
-    elif choice == '2':
-        print("====================")
-        print("选择一个操作:")
-        print("1. 创建组")
-        print("2. 获取所有组")
-        print("3. 获取特定组信息")
-        print("4. 删除组")
-        print("5. 更新组信息")
-        print("====================")
-        choice = input("输入选项 (1-5): ")
-        print("====================")
-        if choice == '1':
-            group_name = input("请输入组名: ")
-            domain_name = input("请输入域: ")
-            description = input("请输入描述: ")
-            result = group.create_group(ip, token,group_name,domain_name, description)
-            print(result)
-            print("====================")
-            main()
-
-        elif choice == '2':
-            result = group.get_group(ip, token)
-            print(result)
-            main()
-
-        elif choice == '3':
-            group_name = input("请输入组名: ")
-            result = group.show_group(ip, token,group_name)
-            print(result)
-            main()
-
-        elif choice == '4':
-            group_name:str = input("请输入组名: ")
-            result = group.delete_group(ip, token, group_name)
-            print(result)
-            main()
-
-        elif choice == '5':
-            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()
-    #
-    elif choice == '3':
-        print("====================")
-        print("选择一个操作:")
-        print("1. 创建域")
-        print("2. 获取所有域信息")
-        print("3. 获取特定域信息")
-        print("4. 删除域")
-        print("5. 更新用户密码")
-        print("====================")
-        choice = input("输入选项 (1-5): ")
-        print("====================")
-        if choice == '1':
-            user_name = input("请输入用户名: ")
-            password = input("请输入密码: ")
-            email = input("请输入邮箱: ")
-            domain_name = input("请输入域名: ")
-            default_project_name = input("请输入默认项目: ")
-            description = input("请输入描述: ")
-            result = user.create_user(ip, token, user_name, password, email, domain_name, default_project_name,description)
-            print(result)
-            print("====================")
-            main()
-
-        elif choice == '2':
-            result = user.get_users(ip, token)
-            print(result)
-            main()
-
-        elif choice == '3':
-            user_name = input("请输入用户名: ")
-            result = user.g0et_user(ip, token, user_name)
-            print(result)
-            main()
-
-        elif choice == '4':
-            user_name = input("请输入用户名: ")
-            result = user.delete_user(ip, token, user_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)
-            print(result)
-            main()
-
-        else:
-            print("无效选项")
-            main()
-    #
-    # elif choice == '4':
-    #2
-
-    # elif choice == '5':
-    else:
-        print("无效选项")
-        main()
-if __name__ == "__main__":
-    main()
+from keystone import keystone_main
+if __name__ == '__main__':
+    keystone_main.keystone_main()