event: move models out of storage

There is no more storage in event, and the models are used just to manipulate
Event objects, so let's move it out of this folder.

Change-Id: I43c34857518e5e71728c63f20e10508e5d1dd8d7

ceilometer/event/converter.py

@@ -21,7 +21,7 @@ import pkg_resources
 import six
 
 from ceilometer import declarative
-from ceilometer.event.storage import models
+from ceilometer.event import models
 from ceilometer.i18n import _
 
 OPTS = [

ceilometer/pipeline.py

@@ -30,7 +30,7 @@ import six
 from stevedore import extension
 import yaml
 
-from ceilometer.event.storage import models
+from ceilometer.event import models
 from ceilometer import publisher
 from ceilometer.publisher import utils as publisher_utils
 from ceilometer import sample as sample_util

ceilometer/tests/unit/event/test_converter.py

@@ -21,7 +21,7 @@ import six
 
 from ceilometer import declarative
 from ceilometer.event import converter
-from ceilometer.event.storage import models
+from ceilometer.event import models
 from ceilometer import service as ceilometer_service
 from ceilometer.tests import base
 

ceilometer/tests/unit/publisher/test_gnocchi.py

@@ -30,7 +30,7 @@ import six
 from stevedore import extension
 import testscenarios
 
-from ceilometer.event.storage import models
+from ceilometer.event import models
 from ceilometer.publisher import gnocchi
 from ceilometer import sample
 from ceilometer import service as ceilometer_service

ceilometer/tests/unit/publisher/test_http.py

@@ -22,7 +22,7 @@ import requests
 from six.moves.urllib import parse as urlparse
 import uuid
 
-from ceilometer.event.storage import models as event
+from ceilometer.event import models as event
 from ceilometer.publisher import http
 from ceilometer import sample
 from ceilometer import service

ceilometer/tests/unit/publisher/test_messaging_publisher.py

@@ -23,7 +23,7 @@ from oslo_messaging._drivers import impl_kafka as kafka_driver
 from oslo_utils import netutils
 import testscenarios.testcase
 
-from ceilometer.event.storage import models as event
+from ceilometer.event import models as event
 from ceilometer.publisher import messaging as msg_publisher
 from ceilometer import sample
 from ceilometer import service

ceilometer/tests/unit/publisher/test_zaqar.py

@@ -17,7 +17,7 @@ from oslotest import base
 from six.moves.urllib import parse as urlparse
 import uuid
 
-from ceilometer.event.storage import models as event
+from ceilometer.event import models as event
 from ceilometer.publisher import zaqar
 from ceilometer import sample
 from ceilometer import service

ceilometer/tests/unit/test_event_pipeline.py

@@ -19,7 +19,7 @@ import fixtures
 import mock
 import oslo_messaging
 
-from ceilometer.event.storage import models
+from ceilometer.event import models
 from ceilometer import pipeline
 from ceilometer import publisher
 from ceilometer.publisher import test as test_publisher