diff options
| author | ZhiQiang Fan <aji.zqfan@gmail.com> | 2016-04-27 23:46:19 +0800 |
|---|---|---|
| committer | Pradeep Kilambi <pkilambi@redhat.com> | 2016-05-16 16:05:45 +0000 |
| commit | 9cf0397973650d872665433721739bf8210f8dd9 (patch) | |
| tree | 6e6fc6421b3f743e5eef6eaccd662556464e3fde | |
| parent | 1473eadc4ae62760ab6c117797497bb686b1457a (diff) | |
| download | ceilometer-9cf0397973650d872665433721739bf8210f8dd9.tar.gz | |
[Trivial] Update Neutron resource status list
According to https://github.com/openstack/neutron/blob/master/neutron/plugins/common/constants.py
there are more status values than the list we currently use, we
should update it, otherwise volume will be default -1
Note: update unit test code because we recognize new status now.
Change-Id: Ic6a42fb8a77c6e4fa7ce41cb16ab021cf77f567c
(cherry picked from commit c6022ffcee8a202aebda41681e3b32321fbbed85)
4 files changed, 10 insertions, 5 deletions
diff --git a/ceilometer/network/services/base.py b/ceilometer/network/services/base.py index 01233005..4aa666bd 100644 --- a/ceilometer/network/services/base.py +++ b/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, } diff --git a/ceilometer/tests/unit/network/services/test_fwaas.py b/ceilometer/tests/unit/network/services/test_fwaas.py index 8aa55f14..4d2365f2 100644 --- a/ceilometer/tests/unit/network/services/test_fwaas.py +++ b/ceilometer/tests/unit/network/services/test_fwaas.py @@ -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]) diff --git a/ceilometer/tests/unit/network/services/test_lbaas.py b/ceilometer/tests/unit/network/services/test_lbaas.py index d8a43390..0ee4d875 100644 --- a/ceilometer/tests/unit/network/services/test_lbaas.py +++ b/ceilometer/tests/unit/network/services/test_lbaas.py @@ -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]) diff --git a/ceilometer/tests/unit/network/services/test_vpnaas.py b/ceilometer/tests/unit/network/services/test_vpnaas.py index 880f82fa..86e4098a 100644 --- a/ceilometer/tests/unit/network/services/test_vpnaas.py +++ b/ceilometer/tests/unit/network/services/test_vpnaas.py @@ -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]) |