x
/
nova-dpm
Code Issues Proposed changes

Several unit test cases are breaking with zhmcclient==0.14.0 

Closes-Bug: #1703578

Change-Id: Ied1981d0df1e85422693547c32fd212b749a2387
Signed-off-by: Prabhat Ranjan <pranjank@in.ibm.com>
This commit is contained in:
Prabhat Ranjan 2017-07-11 18:23:14 +05:30
parent 21916e7095
commit dcf6bb6954
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova_dpm/tests/unit/virt/dpm/test_data.py
View File

@ -81,6 +81,16 @@ def create_session_1():
'storage-customer': 2048,
'se-version': '2.13.1'
},
'virtual_switches': [
{'properties': {
'name': 'vs1',
'object-id': '1'
}},
{'properties': {
'name': 'vs2',
'object-id': '2'
}}
],
'partitions': [
{
'properties': {

4
nova_dpm/tests/unit/virt/dpm/test_driver.py
View File

@ -335,11 +335,11 @@ class DPMDriverInstanceTestCase(TestCase):
vif = {"address": "aa:bb:cc:dd:ee:ff",
"id": "foo-id",
"type": "dpm_vswitch",
"details": {"object_id": "oid"}}
"details": {"object_id": "1"}}
vif2 = {"address": "11:22:33:44:55:66",
"id": "foo-id2",
"type": "dpm_vswitch",
"details": {"object_id": "oid2"}}
"details": {"object_id": "2"}}
network_info = [vif, vif2]
self.dpmdriver.spawn(None, mock_instance, None, None, None,
network_info, flavor=mock.Mock())

10
nova_dpm/tests/unit/virt/dpm/test_vm.py
View File

@ -53,6 +53,10 @@ def fake_session():
'name': 'fcp_1_1',
'description': 'FCP #1 Port #1',
})
cpc1.virtual_switches.add({
'name': 'virtual_switch',
'object-id': '3ea09d2a-b18d-11e6-89a4-42f2e9ef1641'
})
return session
@ -109,7 +113,10 @@ class VmPartitionInstanceTestCase(TestCase):
self.create_partition_properties = {
'name': self.part_name,
'description': self.part_description}
'description': self.part_description,
'initial-memory': 512,
'maximum-memory': 512
}
# Create partition in a cpc not from openstack
# and used same uuid of instance to create
# vm.PartitionInstance class instance except create_partition.
@ -184,7 +191,6 @@ class VmPartitionInstanceTestCase(TestCase):
"address": "fa:16:3e:e4:9a:98",
"type": "dpm_vswitch",
"id": "703da361-9d4d-4441-b99b-e081c3e9cfbb"}
nic_interface = self.partition_inst.attach_nic(vif)
self.assertEqual(
'OpenStack_Port_703da361-9d4d-4441-b99b-e081c3e9cfbb',