openstack
/
ceilometer
Code Issues Proposed changes

Merge "[Trivial] Update Neutron resource status list" into stable/mitaka

This commit is contained in:
Jenkins 2016-05-17 22:48:48 +00:00 committed by Gerrit Code Review
parent 75c48c06ab 9cf0397973
commit 75f8a0b70f
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ceilometer/network/services/base.py
View File

@ -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
View File

@ -85,7 +85,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
View File

@ -137,7 +137,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])
@ -260,7 +260,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])
@ -353,7 +353,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
View File

@ -89,7 +89,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])