openstack
/
nova
Code Issues Proposed changes

Merge "Hyper-V: checks for existent Notes in list_instance_notes" into stable/kilo

This commit is contained in:
Jenkins 2015-05-05 14:41:11 +00:00 committed by Gerrit Code Review
parent 1fd13276ea d8a470d680
commit aaa8ce07fc
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/unit/virt/hyperv/test_vmutils.py
View File

@ -645,7 +645,9 @@ class VMUtilsTestCase(test.NoDBTestCase):
attrs = {'ElementName': 'fake_name', attrs = {'ElementName': 'fake_name',
'Notes': '4f54fb69-d3a2-45b7-bb9b-b6e6b3d893b3'} 'Notes': '4f54fb69-d3a2-45b7-bb9b-b6e6b3d893b3'}
vs.configure_mock(**attrs) vs.configure_mock(**attrs)
self._vmutils._conn.Msvm_VirtualSystemSettingData.return_value = [vs] vs2 = mock.MagicMock(ElementName='fake_name2', Notes=None)
self._vmutils._conn.Msvm_VirtualSystemSettingData.return_value = [vs,
vs2]
response = self._vmutils.list_instance_notes() response = self._vmutils.list_instance_notes()
self.assertEqual([(attrs['ElementName'], [attrs['Notes']])], response) self.assertEqual([(attrs['ElementName'], [attrs['Notes']])], response)

4
nova/tests/unit/virt/hyperv/test_vmutilsv2.py
View File

@ -140,7 +140,9 @@ class VMUtilsV2TestCase(test_vmutils.VMUtilsTestCase):
attrs = {'ElementName': 'fake_name', attrs = {'ElementName': 'fake_name',
'Notes': ['4f54fb69-d3a2-45b7-bb9b-b6e6b3d893b3']} 'Notes': ['4f54fb69-d3a2-45b7-bb9b-b6e6b3d893b3']}
vs.configure_mock(**attrs) vs.configure_mock(**attrs)
self._vmutils._conn.Msvm_VirtualSystemSettingData.return_value = [vs] vs2 = mock.MagicMock(ElementName='fake_name2', Notes=None)
self._vmutils._conn.Msvm_VirtualSystemSettingData.return_value = [vs,
vs2]
response = self._vmutils.list_instance_notes() response = self._vmutils.list_instance_notes()
self.assertEqual([(attrs['ElementName'], attrs['Notes'])], response) self.assertEqual([(attrs['ElementName'], attrs['Notes'])], response)

5
nova/virt/hyperv/vmutils.py
View File

@ -116,8 +116,9 @@ class VMUtils(object):
for vs in self._conn.Msvm_VirtualSystemSettingData( for vs in self._conn.Msvm_VirtualSystemSettingData(
['ElementName', 'Notes'], ['ElementName', 'Notes'],
SettingType=self._VIRTUAL_SYSTEM_CURRENT_SETTINGS): SettingType=self._VIRTUAL_SYSTEM_CURRENT_SETTINGS):
instance_notes.append((vs.ElementName, if vs.Notes is not None:
[v for v in vs.Notes.split('\n') if v])) instance_notes.append(
(vs.ElementName, [v for v in vs.Notes.split('\n') if v]))
return instance_notes return instance_notes

4
nova/virt/hyperv/vmutilsv2.py
View File

@ -80,7 +80,9 @@ class VMUtilsV2(vmutils.VMUtils):
for vs in self._conn.Msvm_VirtualSystemSettingData( for vs in self._conn.Msvm_VirtualSystemSettingData(
['ElementName', 'Notes'], ['ElementName', 'Notes'],
VirtualSystemType=self._VIRTUAL_SYSTEM_TYPE_REALIZED): VirtualSystemType=self._VIRTUAL_SYSTEM_TYPE_REALIZED):
instance_notes.append((vs.ElementName, [v for v in vs.Notes if v])) if vs.Notes is not None:
instance_notes.append(
(vs.ElementName, [v for v in vs.Notes if v]))
return instance_notes return instance_notes