Merge "Import simport from monasca-common"

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'),

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

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)

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

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 (

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

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