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

In some part in the code we import objects.
In the Openstack style guidelines they recommend to import only
modules.

http://docs.openstack.org/developer/hacking/#imports

Change-Id: Ie752a6115effac5e2539f27340bd6f922e9dae58
---
 bilean/api/openstack/__init__.py   | 19 ++++++++++---------
 bilean/common/utils.py             |  8 ++++----
 bilean/scheduler/cron_scheduler.py |  4 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/bilean/api/openstack/__init__.py b/bilean/api/openstack/__init__.py
index 19de6b4..4134abc 100644
--- a/bilean/api/openstack/__init__.py
+++ b/bilean/api/openstack/__init__.py
@@ -11,25 +11,26 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from bilean.api.middleware.context import ContextMiddleware
-from bilean.api.middleware.fault import FaultWrapper
-from bilean.api.middleware.ssl import SSLMiddleware
-from bilean.api.middleware.version_negotiation import VersionNegotiationFilter
+from bilean.api.middleware import context
+from bilean.api.middleware import fault
+from bilean.api.middleware import ssl
+from bilean.api.middleware import version_negotiation
 from bilean.api.openstack import versions
 
 
 def version_negotiation_filter(app, conf, **local_conf):
-    return VersionNegotiationFilter(versions.Controller, app,
-                                    conf, **local_conf)
+    return version_negotiation.VersionNegotiationFilter(versions.Controller,
+                                                        app,
+                                                        conf, **local_conf)
 
 
 def faultwrap_filter(app, conf, **local_conf):
-    return FaultWrapper(app)
+    return fault.FaultWrapper(app)
 
 
 def sslmiddleware_filter(app, conf, **local_conf):
-    return SSLMiddleware(app)
+    return ssl.SSLMiddleware(app)
 
 
 def contextmiddleware_filter(app, conf, **local_conf):
-    return ContextMiddleware(app)
+    return context.ContextMiddleware(app)
diff --git a/bilean/common/utils.py b/bilean/common/utils.py
index 1b2bbd5..f595f86 100644
--- a/bilean/common/utils.py
+++ b/bilean/common/utils.py
@@ -20,7 +20,7 @@ import random
 import six
 import string
 
-from cryptography.fernet import Fernet
+from cryptography import fernet
 import requests
 from requests import exceptions
 from six.moves import urllib
@@ -124,8 +124,8 @@ def encrypt(msg):
     :param msg: message to be encrypted
     :returns: encrypted msg and key to decrypt
     '''
-    password = Fernet.generate_key()
-    f = Fernet(password)
+    password = fernet.Fernet.generate_key()
+    f = fernet.Fernet(password)
     key = f.encrypt(encodeutils.safe_encode(msg))
     return encodeutils.safe_decode(password), encodeutils.safe_decode(key)
 
@@ -137,7 +137,7 @@ def decrypt(msg, key):
     :param key: key used to decrypt
     :returns: decrypted message string
     '''
-    f = Fernet(encodeutils.safe_encode(msg))
+    f = fernet.Fernet(encodeutils.safe_encode(msg))
     msg = f.decrypt(encodeutils.safe_encode(key))
 
     return encodeutils.safe_decode(msg)
diff --git a/bilean/scheduler/cron_scheduler.py b/bilean/scheduler/cron_scheduler.py
index 10041b1..c2ec592 100644
--- a/bilean/scheduler/cron_scheduler.py
+++ b/bilean/scheduler/cron_scheduler.py
@@ -24,7 +24,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import timeutils
 
-from apscheduler.schedulers.background import BackgroundScheduler
+from apscheduler.schedulers import background
 from datetime import timedelta
 import random
 import six
@@ -71,7 +71,7 @@ class CronScheduler(object):
 
     def __init__(self, **kwargs):
         super(CronScheduler, self).__init__()
-        self._scheduler = BackgroundScheduler()
+        self._scheduler = background.BackgroundScheduler()
         self.scheduler_id = kwargs.get('scheduler_id')
         self.rpc_client = rpc_client.EngineClient()
         if cfg.CONF.scheduler.store_ap_job: