From 5529692c6cb6de4ca96d8e4b4db0805f1cfbe7fc Mon Sep 17 00:00:00 2001
From: Nguyen Hung Phuong <phuongnh@vn.fujitsu.com>
Date: Wed, 31 Aug 2016 16:47:17 +0700
Subject: [PATCH] Clean imports in code

In some part in the code we import objects. Openstack style
guideline recommends to import only modules.

Change-Id: I72a25f76c7fe3c9d592a310580181e72734d374c
---
 .../scripts/lbaas_api-0.1/lbaas/utils/rest_utils.py         | 4 ++--
 tests/base.py                                               | 6 +++---
 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
 
 import pecan
 import six
-from webob import Response
+import webob
 from wsme import exc
 
 from lbaas import exceptions as ex
@@ -53,7 +53,7 @@ def wrap_pecan_controller_exception(func):
         try:
             return func(*args, **kwargs)
         except ex.LBaaSException as excp:
-            return Response(
+            return webob.Response(
                 status=excp.http_code,
                 content_type='application/json',
                 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
 import shutil
 import time
 import uuid
-from xml.etree import ElementTree as et
+from xml import etree
 
 import jenkins
 import paramiko
@@ -548,8 +548,8 @@ class MuranoTestsBase(testtools.TestCase, clients.ClientsBase):
         )
 
     def set_tomcat_ip(self, pom_file, ip):
-        et.register_namespace('', 'http://maven.apache.org/POM/4.0.0')
-        tree = et.parse(pom_file)
+        etree.ElementTree.register_namespace('', 'http://maven.apache.org/POM/4.0.0')
+        tree = etree.ElementTree.parse(pom_file)
         new_url = 'http://{ip}:8080/manager/text'.format(ip=ip)
         ns = {'ns': 'http://maven.apache.org/POM/4.0.0'}
         for plugin in tree.findall('ns:build/ns:plugins/', ns):