Brocade driver in zone manager does not handle switch data correctly

[Wilson Liu]

We found that Brocade driver does not handle switch data correctly in brcd_fc_zone_client_cli.py:

        try:
            for line in switch_data:
                line_split = re.split('\\t', line)
                if len(line_split) > 2:
                    line_split = [x.replace(
                        '\n', '') for x in line_split]
                    line_split = [x.replace(
                        ' ',
                        '') for x in line_split]
                    if ZoneConstant.CFG_ZONESET in line_split:
                        zone_set_name = line_split[1]
                        continue
                    if line_split[1]:
                        zone_name = line_split[1]
                        zone[zone_name] = list()
                    if line_split[2]:
                        zone_member = line_split[2]
                    if zone_member:
                        zone_member_list = zone.get(zone_name)
                        zone_member_list.append(zone_member)

The "zone_member" must be set to "None" before we use it next time, otherwise the old value will be used.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/184458

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/184458
Committed: https://git.openstack.org/cgit/openstack/cinder/commit/?id=b37cda69f0a73f9f565e3c45be7f5843938d3040
Submitter: Jenkins
Branch: master

commit b37cda69f0a73f9f565e3c45be7f5843938d3040
Author: Liu Xinguo <email address hidden>
Date: Wed May 20 19:19:48 2015 +0800

    Brocade driver not parsing zone data correctly

    There is an error in the parsing of zone information
    in the Brocade zone manager driver. This patch ensures
    the zone information is correctly parsed.

    Closes-Bug: 1456996
    Change-Id: I6477164af0a60997be295587e506b37d7e019bcf