openstack/ceilometer
Code Issues Proposed changes

Merge "[Trivial] Update Neutron resource status list"

Browse Source
This commit is contained in:
Jenkins 2016-04-27 16:25:35 +00:00 committed by Gerrit Code Review
commit d41f34a9a8
4 changed files with 10 additions and 5 deletions
ceilometer
network/services
base.py
tests/unit/network/services
test_fwaas.pytest_lbaas.pytest_vpnaas.py

5
ceilometer/network/services/base.py

@ -21,6 +21,11 @@ STATUS = {
'inactive': 0,
'active': 1,
'pending_create': 2,
'down': 3,
'created': 4,
'pending_update': 5,
'pending_delete': 6,
'error': 7,
}

2
ceilometer/tests/unit/network/services/test_fwaas.py

@ -83,7 +83,7 @@ class TestFirewallPollster(_BaseTestFWPollster):
samples = list(self.pollster.get_samples(
self.manager, {},
resources=self.fake_get_fw_service()))
self.assertEqual(3, len(samples))
self.assertEqual(4, len(samples))
for field in self.pollster.FIELDS:
self.assertEqual(self.fake_get_fw_service()[0][field],
samples[0].resource_metadata[field])

6
ceilometer/tests/unit/network/services/test_lbaas.py

@ -135,7 +135,7 @@ class TestLBPoolPollster(_BaseTestLBPollster):
samples = list(self.pollster.get_samples(
self.manager, {},
resources=self.fake_get_pools()))
self.assertEqual(3, len(samples))
self.assertEqual(4, len(samples))
for field in self.pollster.FIELDS:
self.assertEqual(self.fake_get_pools()[0][field],
samples[0].resource_metadata[field])
@ -258,7 +258,7 @@ class TestLBVipPollster(_BaseTestLBPollster):
samples = list(self.pollster.get_samples(
self.manager, {},
resources=self.fake_get_vips()))
self.assertEqual(3, len(samples))
self.assertEqual(4, len(samples))
for field in self.pollster.FIELDS:
self.assertEqual(self.fake_get_vips()[0][field],
samples[0].resource_metadata[field])
@ -351,7 +351,7 @@ class TestLBMemberPollster(_BaseTestLBPollster):
samples = list(self.pollster.get_samples(
self.manager, {},
self.fake_get_members()))
self.assertEqual(3, len(samples))
self.assertEqual(4, len(samples))
for field in self.pollster.FIELDS:
self.assertEqual(self.fake_get_members()[0][field],
samples[0].resource_metadata[field])

2
ceilometer/tests/unit/network/services/test_vpnaas.py

@ -87,7 +87,7 @@ class TestVPNServicesPollster(_BaseTestVPNPollster):
samples = list(self.pollster.get_samples(
self.manager, {},
resources=self.fake_get_vpn_service()))
self.assertEqual(3, len(samples))
self.assertEqual(4, len(samples))
for field in self.pollster.FIELDS:
self.assertEqual(self.fake_get_vpn_service()[0][field],
samples[0].resource_metadata[field])