summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-31 12:44:31 +0000
committerGerrit Code Review <review@openstack.org>2016-08-31 12:44:31 +0000
commit285b6b832b82cadbb6a1eb330a3d598af6cc25a1 (patch)
tree2caa8d0e41252a66b6e3062a03dcc1a8cd830a5a
parent24cc0143fea1f4966f9bc1d5cd504e453c130d63 (diff)
parent5529692c6cb6de4ca96d8e4b4db0805f1cfbe7fc (diff)
Merge "Clean imports in code"
-rw-r--r--murano-apps/LBaaS-interface/package/Resources/scripts/lbaas_api-0.1/lbaas/utils/rest_utils.py4
-rwxr-xr-xtests/base.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/murano-apps/LBaaS-interface/package/Resources/scripts/lbaas_api-0.1/lbaas/utils/rest_utils.py b/murano-apps/LBaaS-interface/package/Resources/scripts/lbaas_api-0.1/lbaas/utils/rest_utils.py
index be7df83..2b11db3 100644
--- a/murano-apps/LBaaS-interface/package/Resources/scripts/lbaas_api-0.1/lbaas/utils/rest_utils.py
+++ b/murano-apps/LBaaS-interface/package/Resources/scripts/lbaas_api-0.1/lbaas/utils/rest_utils.py
@@ -19,7 +19,7 @@ import json
19 19
20import pecan 20import pecan
21import six 21import six
22from webob import Response 22import webob
23from wsme import exc 23from wsme import exc
24 24
25from lbaas import exceptions as ex 25from lbaas import exceptions as ex
@@ -53,7 +53,7 @@ def wrap_pecan_controller_exception(func):
53 try: 53 try:
54 return func(*args, **kwargs) 54 return func(*args, **kwargs)
55 except ex.LBaaSException as excp: 55 except ex.LBaaSException as excp:
56 return Response( 56 return webob.Response(
57 status=excp.http_code, 57 status=excp.http_code,
58 content_type='application/json', 58 content_type='application/json',
59 body=json.dumps(dict( 59 body=json.dumps(dict(
diff --git a/tests/base.py b/tests/base.py
index 2041840..1ffdbde 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -20,7 +20,7 @@ import socket
20import shutil 20import shutil
21import time 21import time
22import uuid 22import uuid
23from xml.etree import ElementTree as et 23from xml import etree
24 24
25import jenkins 25import jenkins
26import paramiko 26import paramiko
@@ -548,8 +548,8 @@ class MuranoTestsBase(testtools.TestCase, clients.ClientsBase):
548 ) 548 )
549 549
550 def set_tomcat_ip(self, pom_file, ip): 550 def set_tomcat_ip(self, pom_file, ip):
551 et.register_namespace('', 'http://maven.apache.org/POM/4.0.0') 551 etree.ElementTree.register_namespace('', 'http://maven.apache.org/POM/4.0.0')
552 tree = et.parse(pom_file) 552 tree = etree.ElementTree.parse(pom_file)
553 new_url = 'http://{ip}:8080/manager/text'.format(ip=ip) 553 new_url = 'http://{ip}:8080/manager/text'.format(ip=ip)
554 ns = {'ns': 'http://maven.apache.org/POM/4.0.0'} 554 ns = {'ns': 'http://maven.apache.org/POM/4.0.0'}
555 for plugin in tree.findall('ns:build/ns:plugins/', ns): 555 for plugin in tree.findall('ns:build/ns:plugins/', ns):