diff options
author | 2018-03-13 11:33:27 +0800 | |
---|---|---|
committer | 2018-03-13 11:33:27 +0800 | |
commit | 010060d932e236c7eb6802d696c68be8ac0d91ec (patch) | |
tree | e78a48e1ebe57459f690bf94400438ec48bb5288 /testapi/testapi-client/testapiclient/cli | |
parent | 12b7a2b54f4e3c36d49dec2b2620826aa7029a3e (diff) |
format URLs
1. unify URL query
2. unify URL format
Change-Id: I4bdf13067c4f726df42a8e34b4365fed4f58924e
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'testapi/testapi-client/testapiclient/cli')
-rw-r--r-- | testapi/testapi-client/testapiclient/cli/pods.py | 12 | ||||
-rw-r--r-- | testapi/testapi-client/testapiclient/cli/projects.py | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/testapi/testapi-client/testapiclient/cli/pods.py b/testapi/testapi-client/testapiclient/cli/pods.py index 8b2f3af..9cadee7 100644 --- a/testapi/testapi-client/testapiclient/cli/pods.py +++ b/testapi/testapi-client/testapiclient/cli/pods.py @@ -3,15 +3,15 @@ import json from testapiclient.utils import command from testapiclient.utils import http_client as client from testapiclient.utils import identity -from testapiclient.utils import url_parse +from testapiclient.utils import url_parse as up def pods_url(): - return url_parse.resource_join('pods') + return up.resource_join('pods') def pod_url(parsed_args): - return url_parse.path_join(pods_url(), parsed_args.name) + return up.path_join(pods_url(), parsed_args.name) class PodGet(command.Lister): @@ -34,10 +34,8 @@ class PodGet(command.Lister): "creation_date", ) - data = client.get( - self.filter_by_name(pods_url(), parsed_args)).get('pods', []) - - return self.format_output(columns, data) + data = client.get(up.query_by(pods_url(), 'name', parsed_args)) + return self.format_output(columns, data.get('pods', [])) class PodGetOne(command.ShowOne): diff --git a/testapi/testapi-client/testapiclient/cli/projects.py b/testapi/testapi-client/testapiclient/cli/projects.py index 94a8fac..5fa6894 100644 --- a/testapi/testapi-client/testapiclient/cli/projects.py +++ b/testapi/testapi-client/testapiclient/cli/projects.py @@ -3,15 +3,15 @@ import json from testapiclient.utils import command from testapiclient.utils import http_client as client from testapiclient.utils import identity -from testapiclient.utils import url_parse +from testapiclient.utils import url_parse as up def projects_url(): - return url_parse.resource_join('projects') + return up.resource_join('projects') def project_url(parsed_args): - return url_parse.path_join(projects_url(), parsed_args.name) + return up.path_join(projects_url(), parsed_args.name) class ProjectGet(command.Lister): @@ -30,10 +30,8 @@ class ProjectGet(command.Lister): 'creator', 'creation_date' ) - data = client.get( - self.filter_by_name(projects_url(), - parsed_args)).get('projects', []) - return self.format_output(columns, data) + data = client.get(up.query_by(projects_url(), 'name', parsed_args)) + return self.format_output(columns, data.get('project', [])) class ProjectGetOne(command.ShowOne): |