Skip to content

Change OrderedDict to dict in ignition #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
suman-savanur3 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Change OrderedDict to dict in ignition #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ignition/model/progress_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ def _details(self):
return {}

def to_dict(self):
return OrderedDict({
return {
'eventType': BASE_EVENT_TYPE,
'progressEventType': self.progress_event_type,
'details': self._details()
})
}
3 changes: 0 additions & 3 deletions tests/unit/model/test_progress_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,18 @@ def test_init_without_progress_event_type_raises_error(self):
def test_to_dict(self):
event = ResourceTransitionProgressEvent(progress_event_type='TestEvent')
to_dict_result = event.to_dict()
self.assertIsInstance(to_dict_result, OrderedDict)
self.assertEqual(to_dict_result['eventType'], 'ResourceTransitionProgressEvent')
self.assertEqual(to_dict_result['progressEventType'], 'TestEvent')
self.assertEqual(to_dict_result['details'], {})

def test_to_dict_order(self):
event = ResourceTransitionProgressEvent(progress_event_type='TestEvent')
to_dict_result = event.to_dict()
self.assertIsInstance(to_dict_result, OrderedDict)
self.assertEqual(list(to_dict_result.keys()), ['eventType', 'progressEventType', 'details'])

def test_to_dict_with_details(self):
event = TestSubEvent(extra_details={'a': 'A', 'b': 'B'})
to_dict_result = event.to_dict()
self.assertIsInstance(to_dict_result, OrderedDict)
self.assertEqual(to_dict_result['eventType'], 'ResourceTransitionProgressEvent')
self.assertEqual(to_dict_result['progressEventType'], 'TestSubEvent')
self.assertEqual(to_dict_result['details'], {
Expand Down
14 changes: 7 additions & 7 deletions tests/unit/service/test_progress_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ def test_add_logs_flat_format(self, mock_logger):
event = TestEvent(extra_details={'A': 123})
self.service.add(event)
expected_str = '---[{0}]---'.format(BASE_EVENT_TYPE)
expected_str += '\neventType: {0}'.format(BASE_EVENT_TYPE)
expected_str += '\nprogressEventType: TestEvent'
expected_str += '\ndetails:'
expected_str += '\n A: 123\n'
expected_str += '\n A: 123'
expected_str += '\neventType: {0}'.format(BASE_EVENT_TYPE)
expected_str += '\nprogressEventType: TestEvent\n'
mock_logger.info.assert_called_once_with(expected_str)

@patch('ignition.service.progress_events.logger')
Expand All @@ -35,10 +35,10 @@ def test_add_logs_logstash_format(self, mock_log_type, mock_logger):
mock_log_type.lower.return_value = 'logstash'
event = TestEvent(extra_details={'A': 123})
self.service.add(event)
expected_str = 'eventType: {0}'.format(BASE_EVENT_TYPE)
expected_str += '\nprogressEventType: TestEvent'
expected_str += '\ndetails:'
expected_str += '\n A: 123\n'
expected_str = 'details:\n'
expected_str += ' A: 123\n'
expected_str += 'eventType: {0}'.format(BASE_EVENT_TYPE)
expected_str += '\nprogressEventType: TestEvent\n'
mock_logger.info.assert_called_once_with(expected_str)

def test_add_invalid_event(self):
Expand Down