ISCSIDiscoveryFailed exception isn't handled properly

[prashkre]

In _discover_vol() method of nova_powervm/virt/powervm/volume/iscsi.py, when iSCSI discovery fails in pvm_exc.ISCSIDiscoveryFailed, it returns None value to the caller method _discover_volume_on_vios() which fails in TypeError: 'NoneType' object is not iterable.

    try:
        return hdisk.discover_iscsi(
            self.adapter, portal, user, password, iqn, vios_w.uuid,
            lunid=lun, iface_name=self.iface_name, auth=auth,
            discovery_auth=discovery_auth,
            discovery_username=discovery_username,
            discovery_password=discovery_password,
            multipath=self._is_multipath())
    except (pvm_exc.ISCSIDiscoveryFailed, pvm_exc.JobRequestFailed) as e:
        LOG.warning(e)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/561914
Committed: https://git.openstack.org/cgit/openstack/nova-powervm/commit/?id=ec454b725da5505bacd02cfa352b5e77fe59b042
Submitter: Zuul
Branch: master

commit ec454b725da5505bacd02cfa352b5e77fe59b042
Author: prashkre <email address hidden>
Date: Tue Apr 17 16:40:12 2018 +0530

    Handle exceptions properly with iscsi discovery

    It fixes issues around exception handling when iscsi discovery
    fails.

    Change-Id: I875a41d3eb8d64851da8d1586f53c4f71436b9d0
    Closes-bug: #1764682

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/queens
Review: https://review.openstack.org/561976

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/561976
Committed: https://git.openstack.org/cgit/openstack/nova-powervm/commit/?id=a70603af841afaf42aeb7396bf765ff5d32d7381
Submitter: Zuul
Branch: stable/queens

commit a70603af841afaf42aeb7396bf765ff5d32d7381
Author: prashkre <email address hidden>
Date: Tue Apr 17 16:40:12 2018 +0530

    Handle exceptions properly with iscsi discovery

    It fixes issues around exception handling when iscsi discovery
    fails.

    Change-Id: I875a41d3eb8d64851da8d1586f53c4f71436b9d0
    Closes-bug: #1764682
    (cherry picked from commit ec454b725da5505bacd02cfa352b5e77fe59b042)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/nova-powervm 6.0.1 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/nova-powervm 7.0.0.0b1 development milestone.