Fixed erroneous source filter in SQLAlchemy.

Also added test cases for source filter. This fixed bug 1093580.

Change-Id: Ie3d99e7f27064f88196d6b0a7139fba36251b3c0

ceilometer/storage/impl_sqlalchemy.py

@@ -100,7 +100,7 @@ def make_query_from_filter(query, event_filter, require_meter=True):
     elif require_meter:
         raise RuntimeError('Missing required meter specifier')
     if event_filter.source:
-        query = query.filter_by(source=event_filter.source)
+        query = query.filter(Meter.sources.any(id=event_filter.source))
     if event_filter.start:
         ts_start = event_filter.start
         query = query.filter(Meter.timestamp >= ts_start)

tests/storage/test_impl_mongodb.py

@@ -370,6 +370,12 @@ def test_get_raw_events_by_meter2(self):
         results = list(self.conn.get_raw_events(f))
         assert results
 
+    def test_get_raw_events_by_source(self):
+        f = storage.EventFilter(source='test-1')
+        results = list(self.conn.get_raw_events(f))
+        assert results
+        assert len(results) == 1
+
 
 class SumTest(MongoDBEngineTestBase):
 

tests/storage/test_impl_sqlalchemy.py

@@ -427,6 +427,12 @@ def test_get_raw_events_by_meter2(self):
         results = list(self.conn.get_raw_events(f))
         assert results
 
+    def test_get_raw_events_by_source(self):
+        f = storage.EventFilter(source='test-1')
+        results = list(self.conn.get_raw_events(f))
+        assert results
+        assert len(results) == 1
+
 
 class TestGetEventInterval(SQLAlchemyEngineTestBase):