simply user session process

Change-Id: I1e6a95cb97f54ec633933c73c4b8d7055f34336f
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>

diff --git a/testapi/testapi-client/testapiclient/http_client.py b/testapi/testapi-client/testapiclient/http_client.py
index a2bd65d..e086f9b 100644 (file)
--- a/testapi/testapi-client/testapiclient/http_client.py
+++ b/testapi/testapi-client/testapiclient/http_client.py
@@ -1,6 +1,7 @@
 import json
 
 import requests
+from testapiclient import user
 
 
 class HTTPClient(object):
@@ -29,25 +30,26 @@ class HTTPClient(object):
         else:
             return r.text
 
-    def post(self, url, session, data):
-        r = session.post(url,
-                         data=json.dumps(data),
-                         headers=HTTPClient.headers)
-        return r
+    def _session_request(self, method, *args, **kwargs):
+        return getattr(user.User.session, method)(*args, **kwargs)
 
-    def put(self, url, session, data):
-        r = session.put(url,
-                        data=json.dumps(data),
-                        headers=HTTPClient.headers)
-        return r.text
+    def post(self, url, data):
+        return self._session_request('post', url,
+                                     data=json.dumps(data),
+                                     headers=HTTPClient.headers)
+
+    def put(self, url, data):
+        return self._session_request('put', url,
+                                     data=json.dumps(data),
+                                     headers=HTTPClient.headers).text
 
-    def delete(self, url, session, *args):
+    def delete(self, url, *args):
         if(args.__len__ > 0):
-            r = session.delete(url,
-                               data=json.dumps(args[0]),
-                               headers=HTTPClient.headers)
+            r = self._session_request('delete', url,
+                                      data=json.dumps(args[0]),
+                                      headers=HTTPClient.headers)
         else:
-            r = session.delete(url)
+            r = self._session_request('delete', url)
         return r.text
 
 
@@ -60,13 +62,13 @@ def get(url):
     return http_request('get', url)
 
 
-def post(url, session, data):
-    return http_request('post', url, session, data)
+def post(url, data):
+    return http_request('post', url, data)
 
 
-def put(url, session, data):
-    return http_request('put', url, session, data)
+def put(url, data):
+    return http_request('put', url, data)
 
 
-def delete(url, session, data):
-    return http_request('delete', url, session, data)
+def delete(url, data):
+    return http_request('delete', url, data)

diff --git a/testapi/testapi-client/testapiclient/pods.py b/testapi/testapi-client/testapiclient/pods.py
index 0864c22..47e2b59 100644 (file)
--- a/testapi/testapi-client/testapiclient/pods.py
+++ b/testapi/testapi-client/testapiclient/pods.py
@@ -4,7 +4,6 @@ from testapiclient import command
 from testapiclient import config
 from testapiclient import http_client
 from testapiclient import identity
-from testapiclient import user
 
 PODS_URL = config.Config.config.get("api", "url") + "/pods"
 
@@ -60,7 +59,6 @@ class PodCreate(command.Command):
     @identity.authenticate
     def take_action(self, parsed_args):
         response = http_client.post(PODS_URL,
-                                    user.User.session,
                                     parsed_args.pod)
         if response.status_code == 200:
             print "Pod has been successfully created!"
@@ -81,5 +79,4 @@ class PodDelete(command.Command):
 
     @identity.authenticate
     def take_action(self, parsed_args):
-        print http_client.delete(PODS_URL + "/" + parsed_args.name,
-                                 user.User.session)
+        print http_client.delete(PODS_URL + "/" + parsed_args.name)

diff --git a/testapi/testapi-client/testapiclient/projects.py b/testapi/testapi-client/testapiclient/projects.py
index ee2e884..be40341 100644 (file)
--- a/testapi/testapi-client/testapiclient/projects.py
+++ b/testapi/testapi-client/testapiclient/projects.py
@@ -4,7 +4,6 @@ from testapiclient import command
 from testapiclient import config
 from testapiclient import http_client
 from testapiclient import identity
-from testapiclient import user
 
 PROJECTS_URL = config.Config.config.get("api", "url") + "/projects"
 
@@ -56,7 +55,6 @@ class ProjectCreate(command.Command):
     @identity.authenticate
     def take_action(self, parsed_args):
         response = http_client.post(ProjectCreate.projects_url,
-                                    user.User.session,
                                     parsed_args.project)
         if response.status_code == 200:
             print "Project has been successfully created!"
@@ -77,8 +75,7 @@ class ProjectDelete(command.Command):
     @identity.authenticate
     def take_action(self, parsed_args):
         projects = http_client.delete(
-            PROJECTS_URL + "/" + parsed_args.name,
-            user.User.session)
+            PROJECTS_URL + "/" + parsed_args.name)
         print projects
 
 
@@ -101,6 +98,5 @@ class ProjectPut(command.Command):
     def take_action(self, parsed_args):
         projects = http_client.put(
             PROJECTS_URL + "/" + parsed_args.name,
-            user.User.session,
             parsed_args.project)
         print projects