From b5f5951351b77cd829f1d0d81343ce9dd4d28564 Mon Sep 17 00:00:00 2001
From: Kaiyan Sheng <kaiyan.sheng@hp.com>
Date: Thu, 16 Jun 2016 09:48:20 -0600
Subject: [PATCH] Import simport from monasca-common

Change-Id: If4aecd60faf20775b8d9f9a6b4273bac2ef3d204
---
 monasca_api/api/server.py                     | 2 +-
 monasca_api/v2/reference/alarm_definitions.py | 2 +-
 monasca_api/v2/reference/alarming.py          | 2 +-
 monasca_api/v2/reference/alarms.py            | 2 +-
 monasca_api/v2/reference/metrics.py           | 2 +-
 monasca_api/v2/reference/notifications.py     | 2 +-
 requirements.txt                              | 1 -
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/monasca_api/api/server.py b/monasca_api/api/server.py
index 7a29c8780..32d8abb82 100644
--- a/monasca_api/api/server.py
+++ b/monasca_api/api/server.py
@@ -17,10 +17,10 @@ import os
 from wsgiref import simple_server
 
 import falcon
+from monasca_common.simport import simport
 from oslo_config import cfg
 from oslo_log import log
 import paste.deploy
-import simport
 
 dispatcher_opts = [cfg.StrOpt('versions', default=None,
                               help='Versions'),
diff --git a/monasca_api/v2/reference/alarm_definitions.py b/monasca_api/v2/reference/alarm_definitions.py
index edc581ec4..7985e9e07 100644
--- a/monasca_api/v2/reference/alarm_definitions.py
+++ b/monasca_api/v2/reference/alarm_definitions.py
@@ -15,10 +15,10 @@
 import re
 
 import falcon
+from monasca_common.simport import simport
 from oslo_config import cfg
 from oslo_log import log
 import pyparsing
-import simport
 
 from monasca_api.api import alarm_definitions_api_v2
 from monasca_api.common.repositories import exceptions
diff --git a/monasca_api/v2/reference/alarming.py b/monasca_api/v2/reference/alarming.py
index 9c518cd3f..b3c4c1342 100644
--- a/monasca_api/v2/reference/alarming.py
+++ b/monasca_api/v2/reference/alarming.py
@@ -13,9 +13,9 @@
 # under the License.
 
 import falcon
+from monasca_common.simport import simport
 from oslo_config import cfg
 from oslo_log import log
-import simport
 
 from monasca_api.common.messaging import (
     exceptions as message_queue_exceptions)
diff --git a/monasca_api/v2/reference/alarms.py b/monasca_api/v2/reference/alarms.py
index f21cfd21e..cea3464fc 100644
--- a/monasca_api/v2/reference/alarms.py
+++ b/monasca_api/v2/reference/alarms.py
@@ -15,9 +15,9 @@
 import re
 
 import falcon
+from monasca_common.simport import simport
 from oslo_config import cfg
 from oslo_log import log
-import simport
 
 from monasca_api.api import alarms_api_v2
 from monasca_api.common.repositories import exceptions
diff --git a/monasca_api/v2/reference/metrics.py b/monasca_api/v2/reference/metrics.py
index c4d788bb2..b9a9e7a70 100644
--- a/monasca_api/v2/reference/metrics.py
+++ b/monasca_api/v2/reference/metrics.py
@@ -13,9 +13,9 @@
 # under the License.
 
 import falcon
+from monasca_common.simport import simport
 from oslo_config import cfg
 from oslo_log import log
-import simport
 
 from monasca_api.api import metrics_api_v2
 from monasca_api.common.messaging import (
diff --git a/monasca_api/v2/reference/notifications.py b/monasca_api/v2/reference/notifications.py
index 3b8ff35b2..22bb96433 100644
--- a/monasca_api/v2/reference/notifications.py
+++ b/monasca_api/v2/reference/notifications.py
@@ -13,9 +13,9 @@
 # under the License.
 
 import falcon
+from monasca_common.simport import simport
 from oslo_config import cfg
 from oslo_log import log
-import simport
 
 from monasca_api.api import notifications_api_v2
 from monasca_api.common.repositories import exceptions
diff --git a/requirements.txt b/requirements.txt
index 7d3adcc97..49dea9049 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,6 @@ influxdb
 eventlet
 kafka-python>=0.9.5,<1.0.0
 simplejson
-simport
 validate_email>=1.3
 monasca-common>=0.0.2
 sqlalchemy