summaryrefslogtreecommitdiffstats
path: root/utils/test/testapi/opnfv_testapi/resources
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2017-05-11 10:26:59 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-11 10:26:59 +0000
commitaa7d754bebbf6b20e6a14609372bf36a9059a269 (patch)
tree3f0057eec97e75056af65837db6e4421a87424b9 /utils/test/testapi/opnfv_testapi/resources
parent858fada30fc828dc0caaae3b13eea4b8c445fadb (diff)
parent2458c2bfaae2cdd37dbc4d8fb88e45645c2baf57 (diff)
Merge "correct the import impl of TestAPI"
Diffstat (limited to 'utils/test/testapi/opnfv_testapi/resources')
-rw-r--r--utils/test/testapi/opnfv_testapi/resources/handlers.py2
-rw-r--r--utils/test/testapi/opnfv_testapi/resources/models.py3
-rw-r--r--utils/test/testapi/opnfv_testapi/resources/pod_handlers.py2
-rw-r--r--utils/test/testapi/opnfv_testapi/resources/pod_models.py2
-rw-r--r--utils/test/testapi/opnfv_testapi/resources/project_handlers.py4
-rw-r--r--utils/test/testapi/opnfv_testapi/resources/project_models.py2
-rw-r--r--utils/test/testapi/opnfv_testapi/resources/result_models.py2
-rw-r--r--utils/test/testapi/opnfv_testapi/resources/scenario_models.py2
-rw-r--r--utils/test/testapi/opnfv_testapi/resources/testcase_models.py2
9 files changed, 10 insertions, 11 deletions
diff --git a/utils/test/testapi/opnfv_testapi/resources/handlers.py b/utils/test/testapi/opnfv_testapi/resources/handlers.py
index 955fbbef7..dbf94eb75 100644
--- a/utils/test/testapi/opnfv_testapi/resources/handlers.py
+++ b/utils/test/testapi/opnfv_testapi/resources/handlers.py
@@ -26,10 +26,10 @@ import json
from tornado import gen
from tornado import web
-import models
from opnfv_testapi.common import check
from opnfv_testapi.common import message
from opnfv_testapi.common import raises
+from opnfv_testapi.resources import models
from opnfv_testapi.tornado_swagger import swagger
DEFAULT_REPRESENTATION = "application/json"
diff --git a/utils/test/testapi/opnfv_testapi/resources/models.py b/utils/test/testapi/opnfv_testapi/resources/models.py
index 0ea482fd2..e8fc532b7 100644
--- a/utils/test/testapi/opnfv_testapi/resources/models.py
+++ b/utils/test/testapi/opnfv_testapi/resources/models.py
@@ -14,9 +14,8 @@
# feng.xiaowei@zte.com.cn mv TestResut to result_models.py 5-23-2016
# feng.xiaowei@zte.com.cn add ModelBase 12-20-2016
##############################################################################
-import copy
import ast
-
+import copy
from opnfv_testapi.tornado_swagger import swagger
diff --git a/utils/test/testapi/opnfv_testapi/resources/pod_handlers.py b/utils/test/testapi/opnfv_testapi/resources/pod_handlers.py
index e21841d33..502988752 100644
--- a/utils/test/testapi/opnfv_testapi/resources/pod_handlers.py
+++ b/utils/test/testapi/opnfv_testapi/resources/pod_handlers.py
@@ -7,8 +7,8 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
import handlers
+from opnfv_testapi.resources import pod_models
from opnfv_testapi.tornado_swagger import swagger
-import pod_models
class GenericPodHandler(handlers.GenericApiHandler):
diff --git a/utils/test/testapi/opnfv_testapi/resources/pod_models.py b/utils/test/testapi/opnfv_testapi/resources/pod_models.py
index 26a9e6788..2c3ea978b 100644
--- a/utils/test/testapi/opnfv_testapi/resources/pod_models.py
+++ b/utils/test/testapi/opnfv_testapi/resources/pod_models.py
@@ -6,7 +6,7 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import models
+from opnfv_testapi.resources import models
from opnfv_testapi.tornado_swagger import swagger
diff --git a/utils/test/testapi/opnfv_testapi/resources/project_handlers.py b/utils/test/testapi/opnfv_testapi/resources/project_handlers.py
index d79cd3b61..be2950705 100644
--- a/utils/test/testapi/opnfv_testapi/resources/project_handlers.py
+++ b/utils/test/testapi/opnfv_testapi/resources/project_handlers.py
@@ -7,9 +7,9 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import handlers
+from opnfv_testapi.resources import handlers
+from opnfv_testapi.resources import project_models
from opnfv_testapi.tornado_swagger import swagger
-import project_models
class GenericProjectHandler(handlers.GenericApiHandler):
diff --git a/utils/test/testapi/opnfv_testapi/resources/project_models.py b/utils/test/testapi/opnfv_testapi/resources/project_models.py
index f7323c1c4..3243882bd 100644
--- a/utils/test/testapi/opnfv_testapi/resources/project_models.py
+++ b/utils/test/testapi/opnfv_testapi/resources/project_models.py
@@ -6,7 +6,7 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import models
+from opnfv_testapi.resources import models
from opnfv_testapi.tornado_swagger import swagger
diff --git a/utils/test/testapi/opnfv_testapi/resources/result_models.py b/utils/test/testapi/opnfv_testapi/resources/result_models.py
index 50445fc22..62a6dacff 100644
--- a/utils/test/testapi/opnfv_testapi/resources/result_models.py
+++ b/utils/test/testapi/opnfv_testapi/resources/result_models.py
@@ -6,7 +6,7 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import models
+from opnfv_testapi.resources import models
from opnfv_testapi.tornado_swagger import swagger
diff --git a/utils/test/testapi/opnfv_testapi/resources/scenario_models.py b/utils/test/testapi/opnfv_testapi/resources/scenario_models.py
index b84accf4d..467cff241 100644
--- a/utils/test/testapi/opnfv_testapi/resources/scenario_models.py
+++ b/utils/test/testapi/opnfv_testapi/resources/scenario_models.py
@@ -1,4 +1,4 @@
-import models
+from opnfv_testapi.resources import models
from opnfv_testapi.tornado_swagger import swagger
diff --git a/utils/test/testapi/opnfv_testapi/resources/testcase_models.py b/utils/test/testapi/opnfv_testapi/resources/testcase_models.py
index 9b8f4b5ff..2379dfc4c 100644
--- a/utils/test/testapi/opnfv_testapi/resources/testcase_models.py
+++ b/utils/test/testapi/opnfv_testapi/resources/testcase_models.py
@@ -6,7 +6,7 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import models
+from opnfv_testapi.resources import models
from opnfv_testapi.tornado_swagger import swagger