openstack
/
nova-powervm
Code Issues Proposed changes

Merge "Add storage XAG to npiv"

This commit is contained in:
Jenkins 2015-04-15 13:08:22 +00:00 committed by Gerrit Code Review
parent 6fa1d2421d 42f7c09bd6
commit cd3255a45a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova_powervm/tests/virt/powervm/volume/test_npiv.py
View File

@ -20,6 +20,7 @@ from nova.compute import task_states
from nova import test
import os
from pypowervm.tests.wrappers.util import pvmhttp
from pypowervm.wrappers import virtual_io_server as pvm_vios
from nova_powervm.tests.virt.powervm import fixtures as fx
from nova_powervm.virt.powervm.volume import npiv
@ -159,6 +160,8 @@ class TestNPIVAdapter(test.TestCase):
self.assertListEqual(['aa', 'bb'], wwpns)
self.assertEqual('21000024FF649104,AA,BB',
inst.system_metadata[meta_key])
xags = [pvm_vios.VIOS.xags.FC_MAPPING, pvm_vios.VIOS.xags.STORAGE]
self.adpt.read.assert_called_once_with('VirtualIOServer', xag=xags)
def test_wwpns_on_sys_meta(self):
"""Tests that previously stored WWPNs are returned."""

3
nova_powervm/virt/powervm/volume/npiv.py
View File

@ -171,7 +171,8 @@ class NPIVVolumeAdapter(v_driver.PowerVMVolumeAdapter):
#
# This should be done on a per-fabric basis.
vios_resp = adapter.read(pvm_vios.VIOS.schema_type,
xag=[pvm_vios.VIOS.xags.FC_MAPPING])
xag=[pvm_vios.VIOS.xags.FC_MAPPING,
pvm_vios.VIOS.xags.STORAGE])
vios_wraps = pvm_vios.VIOS.wrap(vios_resp)
resp_wwpns = []
for fabric in self._fabric_names():