Finish drop / alter / show role and list roles

Signed-off-by: Jin Hai <haijin.chn@gmail.com>

Author: JinHai-CN

admin/client/admin_client.py

@@ -712,21 +712,28 @@ def _create_role(self, command):
         response = requests.post(
             url,
             auth=HTTPBasicAuth(self.admin_account, self.admin_password),
-            json={'role_name': role_name}
+            json={'role_name': role_name, 'description': desc_str}
         )
         res_json = response.json()
         if response.status_code == 200:
             self._print_table_simple(res_json['data'])
         else:
             print(f"Fail to create role {role_name}, code: {res_json['code']}, message: {res_json['message']}")
 
-        pass
-
     def _drop_role(self, command):
         role_name_tree: Tree = command['role_name']
         role_name: str = role_name_tree.children[0].strip("'\"")
         print(f"drop role name: {role_name}")
-        pass
+        url = f'http://{self.host}:{self.port}/api/v1/admin/roles/{role_name}'
+        response = requests.delete(
+            url,
+            auth=HTTPBasicAuth(self.admin_account, self.admin_password),
+        )
+        res_json = response.json()
+        if response.status_code == 200:
+            self._print_table_simple(res_json['data'])
+        else:
+            print(f"Fail to drop role {role_name}, code: {res_json['code']}, message: {res_json['message']}")
 
     def _alter_role(self, command):
         role_name_tree: Tree = command['role_name']
@@ -735,17 +742,46 @@ def _alter_role(self, command):
         desc_str: str = desc_tree.children[0].strip("'\"")
 
         print(f"alter role name: {role_name}, description: {desc_str}")
-        pass
+        url = f'http://{self.host}:{self.port}/api/v1/admin/roles/{role_name}'
+        response = requests.put(
+            url,
+            auth=HTTPBasicAuth(self.admin_account, self.admin_password),
+            json={'description': desc_str}
+        )
+        res_json = response.json()
+        if response.status_code == 200:
+            self._print_table_simple(res_json['data'])
+        else:
+            print(
+                f"Fail to update role {role_name} with description: {desc_str}, code: {res_json['code']}, message: {res_json['message']}")
 
     def _list_roles(self, command):
         print("Listing all roles")
-        pass
+        url = f'http://{self.host}:{self.port}/api/v1/admin/roles'
+        response = requests.get(
+            url,
+            auth=HTTPBasicAuth(self.admin_account, self.admin_password)
+        )
+        res_json = response.json()
+        if response.status_code == 200:
+            self._print_table_simple(res_json['data'])
+        else:
+            print(f"Fail to list roles, code: {res_json['code']}, message: {res_json['message']}")
 
     def _show_role(self, command):
         role_name_tree: Tree = command['role_name']
         role_name: str = role_name_tree.children[0].strip("'\"")
         print(f"show role: {role_name}")
-        pass
+        url = f'http://{self.host}:{self.port}/api/v1/admin/roles/{role_name}/permissions'
+        response = requests.get(
+            url,
+            auth=HTTPBasicAuth(self.admin_account, self.admin_password)
+        )
+        res_json = response.json()
+        if response.status_code == 200:
+            self._print_table_simple(res_json['data'])
+        else:
+            print(f"Fail to list roles, code: {res_json['code']}, message: {res_json['message']}")
 
     def _grant_permission(self, command):
         role_name_tree: Tree = command['role_name']

admin/server/roles.py

@@ -23,26 +23,34 @@
 
 class RoleMgr:
     @staticmethod
-    def create_role(role_name: str):
-        error_msg = f"not implement: create role: {role_name}"
+    def create_role(role_name: str, description: str):
+        error_msg = f"not implement: create role: {role_name}, description: {description}"
         logging.error(error_msg)
         raise AdminException(error_msg)
 
     @staticmethod
     def update_role_description(role_name: str, description: str) -> Dict[str, Any]:
-        raise AdminException(f"Not implement {inspect.currentframe().f_code.co_name}")
+        error_msg = f"not implement: update role: {role_name} with description: {description}"
+        logging.error(error_msg)
+        raise AdminException(error_msg)
 
     @staticmethod
     def delete_role(role_name: str) -> Dict[str, Any]:
-        raise AdminException(f"Not implement {inspect.currentframe().f_code.co_name}")
+        error_msg = f"not implement: drop role: {role_name}"
+        logging.error(error_msg)
+        raise AdminException(error_msg)
 
     @staticmethod
     def list_roles() -> Dict[str, Any]:
-        raise AdminException(f"Not implement {inspect.currentframe().f_code.co_name}")
+        error_msg = f"not implement: list roles"
+        logging.error(error_msg)
+        raise AdminException(error_msg)
 
     @staticmethod
     def get_role_permissions(role_name: str) -> Dict[str, Any]:
-        raise AdminException(f"Not implement {inspect.currentframe().f_code.co_name}")
+        error_msg = f"not implement: show role {role_name}"
+        logging.error(error_msg)
+        raise AdminException(error_msg)
 
     @staticmethod
     def grant_role_permissions(role_name: str, permissions: str) -> Dict[str, Any]:

admin/server/routes.py

@@ -218,7 +218,8 @@ def create_role():
         if not data or 'role_name' not in data:
             return error_response("Role name is required", 400)
         role_name: str = data['role_name']
-        res = RoleMgr.create_role(role_name)
+        description: str = data['description']
+        res = RoleMgr.create_role(role_name, description)
         return success_response(res)
     except Exception as e:
         return error_response(str(e), 500)
@@ -229,10 +230,10 @@ def create_role():
 def update_role(role_name: str):
     try:
         data = request.get_json()
-        if not data or 'role_description' not in data:
+        if not data or 'description' not in data:
             return error_response("Role description is required", 400)
-        role_description: str = data['role_description']
-        res = RoleMgr.update_role_description(role_name, role_description)
+        description: str = data['description']
+        res = RoleMgr.update_role_description(role_name, description)
         return success_response(res)
     except Exception as e:
         return error_response(str(e), 500)