summaryrefslogtreecommitdiffstats
path: root/testapi/testapi-client/testapiclient
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2018-03-09 16:35:22 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2018-03-09 18:06:09 +0800
commit1a95c1e6b33d9b3efcfd92e1de64feee7e9b5c68 (patch)
tree61488ece232657c6693425eabc07ad6ca4b3af8e /testapi/testapi-client/testapiclient
parentcc29ae1cd41d1f403511730d5ba44dded967fb12 (diff)
restructure testapiclient project
Change-Id: I13d24ce7b436f203a66fe14f4930e58b3ab1193c Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'testapi/testapi-client/testapiclient')
-rw-r--r--testapi/testapi-client/testapiclient/cli/__init__.py0
-rw-r--r--testapi/testapi-client/testapiclient/cli/auth.py (renamed from testapi/testapi-client/testapiclient/auth.py)4
-rw-r--r--testapi/testapi-client/testapiclient/cli/pods.py (renamed from testapi/testapi-client/testapiclient/pods.py)8
-rw-r--r--testapi/testapi-client/testapiclient/cli/projects.py (renamed from testapi/testapi-client/testapiclient/projects.py)8
-rw-r--r--testapi/testapi-client/testapiclient/main.py12
-rw-r--r--testapi/testapi-client/testapiclient/utils/__init__.py0
-rw-r--r--testapi/testapi-client/testapiclient/utils/command.py (renamed from testapi/testapi-client/testapiclient/command.py)3
-rw-r--r--testapi/testapi-client/testapiclient/utils/http_client.py (renamed from testapi/testapi-client/testapiclient/http_client.py)3
-rw-r--r--testapi/testapi-client/testapiclient/utils/identity.py (renamed from testapi/testapi-client/testapiclient/identity.py)3
-rw-r--r--testapi/testapi-client/testapiclient/utils/url_parse.py (renamed from testapi/testapi-client/testapiclient/url_parse.py)0
-rw-r--r--testapi/testapi-client/testapiclient/utils/user.py (renamed from testapi/testapi-client/testapiclient/user.py)0
11 files changed, 22 insertions, 19 deletions
diff --git a/testapi/testapi-client/testapiclient/cli/__init__.py b/testapi/testapi-client/testapiclient/cli/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapi/testapi-client/testapiclient/cli/__init__.py
diff --git a/testapi/testapi-client/testapiclient/auth.py b/testapi/testapi-client/testapiclient/cli/auth.py
index 3728498..434c55a 100644
--- a/testapi/testapi-client/testapiclient/auth.py
+++ b/testapi/testapi-client/testapiclient/cli/auth.py
@@ -1,5 +1,5 @@
-from testapiclient import command
-from testapiclient import identity
+from testapiclient.utils import command
+from testapiclient.utils import identity
class Auth(command.Command):
diff --git a/testapi/testapi-client/testapiclient/pods.py b/testapi/testapi-client/testapiclient/cli/pods.py
index 85c19e4..cdedc3e 100644
--- a/testapi/testapi-client/testapiclient/pods.py
+++ b/testapi/testapi-client/testapiclient/cli/pods.py
@@ -1,9 +1,9 @@
import json
-from testapiclient import command
-from testapiclient import http_client as client
-from testapiclient import identity
-from testapiclient import url_parse
+from testapiclient.utils import command
+from testapiclient.utils import http_client as client
+from testapiclient.utils import identity
+from testapiclient.utils import url_parse
def pods_url():
diff --git a/testapi/testapi-client/testapiclient/projects.py b/testapi/testapi-client/testapiclient/cli/projects.py
index 7f98b56..f847961 100644
--- a/testapi/testapi-client/testapiclient/projects.py
+++ b/testapi/testapi-client/testapiclient/cli/projects.py
@@ -1,9 +1,9 @@
import json
-from testapiclient import command
-from testapiclient import http_client as client
-from testapiclient import identity
-from testapiclient import url_parse
+from testapiclient.utils import command
+from testapiclient.utils import http_client as client
+from testapiclient.utils import identity
+from testapiclient.utils import url_parse
def projects_url():
diff --git a/testapi/testapi-client/testapiclient/main.py b/testapi/testapi-client/testapiclient/main.py
index 6c6cf56..dfa6284 100644
--- a/testapi/testapi-client/testapiclient/main.py
+++ b/testapi/testapi-client/testapiclient/main.py
@@ -1,21 +1,21 @@
import sys
-from cliff.app import App
-from cliff.commandmanager import CommandManager
+from cliff import app
+from cliff import commandmanager
import requests
-from testapiclient import user
+from testapiclient.utils import user
-class TestAPIClient(App):
+class TestAPIClient(app.App):
def __init__(self):
super(TestAPIClient, self).__init__(
description='TestAPI Client',
version='0.1',
- command_manager=CommandManager('testapi'),
+ command_manager=commandmanager.CommandManager('testapi'),
deferred_help=True,
- )
+ )
user.User.session = requests.Session()
def initialize_app(self, argv):
diff --git a/testapi/testapi-client/testapiclient/utils/__init__.py b/testapi/testapi-client/testapiclient/utils/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapi/testapi-client/testapiclient/utils/__init__.py
diff --git a/testapi/testapi-client/testapiclient/command.py b/testapi/testapi-client/testapiclient/utils/command.py
index 62a8b86..95f1fb0 100644
--- a/testapi/testapi-client/testapiclient/command.py
+++ b/testapi/testapi-client/testapiclient/utils/command.py
@@ -1,5 +1,6 @@
from cliff import command
-from testapiclient import url_parse
+
+from testapiclient.utils import url_parse
class Command(command.Command):
diff --git a/testapi/testapi-client/testapiclient/http_client.py b/testapi/testapi-client/testapiclient/utils/http_client.py
index 8a33a8c..6be33ee 100644
--- a/testapi/testapi-client/testapiclient/http_client.py
+++ b/testapi/testapi-client/testapiclient/utils/http_client.py
@@ -1,7 +1,8 @@
import json
import requests
-from testapiclient import user
+
+from testapiclient.utils import user
class HTTPClient(object):
diff --git a/testapi/testapi-client/testapiclient/identity.py b/testapi/testapi-client/testapiclient/utils/identity.py
index f38d8e1..2aeb87a 100644
--- a/testapi/testapi-client/testapiclient/identity.py
+++ b/testapi/testapi-client/testapiclient/utils/identity.py
@@ -3,7 +3,8 @@ import os
import urllib
import requests
-from testapiclient import user
+
+from testapiclient.utils import user
def _authenticate(username, password):
diff --git a/testapi/testapi-client/testapiclient/url_parse.py b/testapi/testapi-client/testapiclient/utils/url_parse.py
index 08f7a63..08f7a63 100644
--- a/testapi/testapi-client/testapiclient/url_parse.py
+++ b/testapi/testapi-client/testapiclient/utils/url_parse.py
diff --git a/testapi/testapi-client/testapiclient/user.py b/testapi/testapi-client/testapiclient/utils/user.py
index 7e72163..7e72163 100644
--- a/testapi/testapi-client/testapiclient/user.py
+++ b/testapi/testapi-client/testapiclient/utils/user.py