openstack
/
congress
Code Issues Proposed changes

delete "id" field in DoctorDriver 

There is no "id" field in the Doctor SB_API.

Change-Id: I8ad7d8d4bdd35d3c16963c0961d7912fa4fb001e
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
This commit is contained in:
dongwenjuan 2017-03-01 13:49:07 +08:00
parent d00ebf94ae
commit 0c9ecb9109
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
congress/datasources/doctor_driver.py
View File

@ -42,7 +42,6 @@ class DoctorDriver(datasource_driver.PushedDataSourceDriver):
request body:
[
{
"id": "0123-4567-89ab",
"time": "2016-02-22T11:48:55Z",
"type": "compute.host.down",
"details": {
@ -81,8 +80,7 @@ class DoctorDriver(datasource_driver.PushedDataSourceDriver):
'selector-type': 'DICT_SELECTOR',
'objects-extract-fn': flatten_events,
'field-translators':
({'fieldname': 'id', 'translator': value_trans},
{'fieldname': 'time', 'translator': value_trans},
({'fieldname': 'time', 'translator': value_trans},
{'fieldname': 'type', 'translator': value_trans},
{'fieldname': 'hostname', 'translator': value_trans},
{'fieldname': 'status', 'translator': value_trans},

14
congress/tests/datasources/test_doctor_driver.py
View File

@ -36,7 +36,6 @@ class TestDoctorDriver(base.TestCase):
objects = []
for i in range(0, row_number):
obj = {
"id": self.numbered_string('id', i),
"time": self.numbered_string('time', i),
"type": self.numbered_string('type', i),
"details": {
@ -60,10 +59,9 @@ class TestDoctorDriver(base.TestCase):
sorted_state = sorted(list(self.doctor.state['events']),
key=lambda x: x[0])
for i, row in enumerate(sorted_state):
self.assertEqual(self.numbered_string('id', i), row[0])
self.assertEqual(self.numbered_string('time', i), row[1])
self.assertEqual(self.numbered_string('type', i), row[2])
self.assertEqual(self.numbered_string('hostname', i), row[3])
self.assertEqual(self.numbered_string('status', i), row[4])
self.assertEqual(self.numbered_string('monitor', i), row[5])
self.assertEqual(self.numbered_string('event_id', i), row[6])
self.assertEqual(self.numbered_string('time', i), row[0])
self.assertEqual(self.numbered_string('type', i), row[1])
self.assertEqual(self.numbered_string('hostname', i), row[2])
self.assertEqual(self.numbered_string('status', i), row[3])
self.assertEqual(self.numbered_string('monitor', i), row[4])
self.assertEqual(self.numbered_string('event_id', i), row[5])

2
congress_tempest_tests/tests/scenario/congress_datasources/test_doctor.py
View File

@ -44,7 +44,6 @@ class TestDoctorDriver(manager_congress.ScenarioPolicyBase):
def test_doctor_event_tables(self):
rows = [
{
"id": "0123-4567-89ab",
"time": "2016-02-22T11:48:55Z",
"type": "compute.host.down",
"details": {
@ -57,7 +56,6 @@ class TestDoctorDriver(manager_congress.ScenarioPolicyBase):
]
expected_row = [
"0123-4567-89ab",
"2016-02-22T11:48:55Z",
"compute.host.down",
"compute1",