openstack/deb-ceilometer
Code Issues Proposed changes

Drop foreign key contraints of alarm in sqlalchemy

Browse Source 
This patch drops the foreign key constraints of alarms to user_id and
project_id in sqlalchemy.

Closes-Bug: 1260176
Change-Id: I7336ee1e3f885421db5aae3a30af0e918b79450b
This commit is contained in:
Lianhao Lu
2014-01-06 10:53:00 +08:00
parent fee3cdeb91
commit ecbe240e6b
4 changed files with 84 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ceilometer/tests/storage/test_storage_scenarios.py
View File

@@ -695,16 +695,15 @@ class RawSampleTest(DBTestBase,
self.conn.create_alarm(alarm)
timeutils.utcnow.override_time = datetime.datetime(2012, 7, 2, 10, 45)
self.conn.clear_expired_metering_data(5)
# user and project with Alarms associated with it aren't deleted.
f = storage.SampleFilter(meter='instance')
results = list(self.conn.get_samples(f))
self.assertEqual(len(results), 2)
results = list(self.conn.get_users())
self.assertEqual(len(results), 3)
self.assertIn('user-id', results)
self.assertEqual(len(results), 2)
self.assertNotIn('user-id', results)
results = list(self.conn.get_projects())
self.assertEqual(len(results), 3)
self.assertIn('project-id', results)
self.assertEqual(len(results), 2)
self.assertNotIn('project-id', results)
results = list(self.conn.get_resources())
self.assertEqual(len(results), 2)