Merge "Remove redundant meter (name,type,unit) tuples from Resource model"

2014-01-10 13:15:25 +00:00
parent 7ebb8d576b 7c4c0e8fc0
commit 31d4c0ced4
6 changed files with 5 additions and 68 deletions
--- a/ceilometer/tests/storage/test_storage_scenarios.py
+++ b/ceilometer/tests/storage/test_storage_scenarios.py
@@ -173,8 +173,6 @@ class ResourceTest(DBTestBase,
            self.assertIn(resource.source, msgs_sources)
            self.assertEqual(resource.user_id, 'user-id')
            self.assertEqual(resource.metadata['display_name'], 'test-server')
-            self.assertIn(models.ResourceMeter('instance', 'cumulative', ''),
-                          resource.meter)
            break
        else:
            assert False, 'Never found resource-id'