openstack
/
fuel-web
Code Issues Proposed changes

Merge "version_info added to OSWL serialization"

This commit is contained in:
Jenkins 2016-02-26 09:42:00 +00:00 committed by Gerrit Code Review
parent e0f9da4890 5a646bf4ac
commit 358ebd93f4
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nailgun/nailgun/objects/serializers/oswl.py
View File

@ -25,4 +25,5 @@ class OpenStackWorkloadStatsSerializer(BasicSerializer):
"resource_type",
"resource_data",
"resource_checksum",
"version_info"
)

18
nailgun/nailgun/test/unit/fuel_statistics_tests/test_oswl_object.py
View File

@ -98,3 +98,21 @@ class TestOSWLObject(BaseTestCase):
consts.OSWL_RESOURCE_TYPES.vm
)
self.assertIsNotNone(untouched_obj)
def test_version_info_serialized(self):
version_info = {'release': '9.0'}
dt = datetime.datetime.utcnow()
obj = OpenStackWorkloadStats.create(
{
'cluster_id': 1,
'resource_type': consts.OSWL_RESOURCE_TYPES.vm,
'created_date': dt.date(),
'updated_time': dt.time(),
'resource_checksum': "",
'version_info': version_info
}
)
self.assertEqual(
version_info,
OpenStackWorkloadStats.to_dict(obj)['version_info']
)

1
nailgun/nailgun/test/unit/fuel_statistics_tests/test_statsender.py
View File

@ -302,6 +302,7 @@ class TestStatisticsSender(BaseTestCase):
'resource_checksum': '',
'master_node_uid': None,
'resource_data': None,
'version_info': {}
}]}
send_data_to_url.assert_called_once_with(
url=sender.build_collector_url("COLLECTOR_OSWL_INFO_URL"),