diff --git a/keystone/__pycache__/keystone_main.cpython-36.pyc b/keystone/__pycache__/keystone_main.cpython-36.pyc new file mode 100644 index 0000000..d827a04 Binary files /dev/null and b/keystone/__pycache__/keystone_main.cpython-36.pyc differ 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()