openstack
/
cinder
Code Issues Proposed changes

Brcd zonemanager: Fix unstable command generation 

This code generates command strings by calling keys()
on a handful of dicts.  This results in command strings
that don't have a stable order and will vary between
different Cinder runs.

Sort the keys to ensure the same strings are generated
each time.

Change-Id: Id8e805293160af8ce0801b9fe07cc55ae811a206
This commit is contained in:
Eric Harney 2017-01-23 13:15:14 -05:00
parent 673deb06d1
commit 2b0bfcc70c
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cinder/tests/unit/zonemanager/test_brcd_http_fc_zone_client.py
View File

@ -73,31 +73,32 @@ nameserver_info = """
</HTML>
"""
mocked_zone_string = 'zonecfginfo=openstack_cfg zone1;zone2 '\
'zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 '\
'zone1 20:01:00:05:33:0e:96:15;20:00:00:05:33:0e:93:11 '\
'zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 '\
'alia1 10:00:00:05:1e:7c:64:96;10:21:10:05:33:0e:96:12 '\
'qlp 10:11:f4:ce:46:ae:68:6c;20:11:f4:ce:46:ae:68:6c '\
'fa1 20:15:f4:ce:96:ae:68:6c;20:11:f4:ce:46:ae:68:6c '\
'openstack_cfg null &saveonly=false'
mocked_zone_string_no_activate = 'zonecfginfo=openstack_cfg zone1;zone2 '\
'zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 '\
'zone1 20:01:00:05:33:0e:96:15;20:00:00:05:33:0e:93:11 '\
'zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 '\
'alia1 10:00:00:05:1e:7c:64:96;10:21:10:05:33:0e:96:12 '\
'qlp 10:11:f4:ce:46:ae:68:6c;20:11:f4:ce:46:ae:68:6c '\
'fa1 20:15:f4:ce:96:ae:68:6c;20:11:f4:ce:46:ae:68:6c &saveonly=true'
zone_string_to_post = "zonecfginfo=openstack_cfg "\
"openstack50060b0000c26604201900051ee8e329;zone1;zone2 "\
"zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 "\
"zone1 20:01:00:05:33:0e:96:15;20:00:00:05:33:0e:93:11 "\
"openstack50060b0000c26604201900051ee8e329 "\
"50:06:0b:00:00:c2:66:04;20:19:00:05:1e:e8:e3:29 "\
"zone1 20:01:00:05:33:0e:96:15;20:00:00:05:33:0e:93:11 "\
"zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 "\
"openstack_cfg null &saveonly=false"
zone_string_to_post_no_activate = "zonecfginfo=openstack_cfg "\
"openstack50060b0000c26604201900051ee8e329;zone1;zone2 "\
"zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 "\
"zone1 20:01:00:05:33:0e:96:15;20:00:00:05:33:0e:93:11 "\
"openstack50060b0000c26604201900051ee8e329 "\
"50:06:0b:00:00:c2:66:04;20:19:00:05:1e:e8:e3:29 &saveonly=true"
"50:06:0b:00:00:c2:66:04;20:19:00:05:1e:e8:e3:29 " \
"zone1 20:01:00:05:33:0e:96:15;20:00:00:05:33:0e:93:11 "\
"zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 "\
"&saveonly=true"
zone_string_to_post_invalid_request = "zonecfginfo=openstack_cfg "\
"openstack50060b0000c26604201900051ee8e32900000000000000000000000000;"\
"zone1;zone2 openstack50060b0000c26604201900051ee8e329000000000000000000000"\
@ -105,12 +106,13 @@ zone_string_to_post_invalid_request = "zonecfginfo=openstack_cfg "\
"zone1 20:01:00:05:33:0e:96:15;20:00:00:05:33:0e:93:11 "\
"zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 &saveonly=true"
zone_string_del_to_post = "zonecfginfo=openstack_cfg zone1;zone2"\
" zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 "\
"zone1 20:01:00:05:33:0e:96:15;20:00:00:05:33:0e:93:11 "\
" zone1 20:01:00:05:33:0e:96:15;20:00:00:05:33:0e:93:11 "\
"zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 "\
"openstack_cfg null &saveonly=false"
zone_string_del_to_post_no_active = "zonecfginfo=openstack_cfg zone1;zone2"\
" zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 "\
"zone1 20:01:00:05:33:0e:96:15;20:00:00:05:33:0e:93:11 &saveonly=true"
" zone1 20:01:00:05:33:0e:96:15;20:00:00:05:33:0e:93:11 " \
"zone2 20:01:00:05:33:0e:96:14;20:00:00:05:33:0e:93:11 "\
"&saveonly=true"
zone_post_page = """
<BODY>
<PRE>
@ -783,11 +785,17 @@ class TestBrcdHttpFCZoneClient(client.BrcdHTTPFCZoneClient, test.TestCase):
valid_zone_name:
'50:06:0b:00:00:c2:66:04;20:19:00:05:1e:e8:e3:29',
'test4': '20:06:0b:00:00:b2:66:07;20:10:00:05:1e:b8:c3:19'}
self.assertEqual(
(updated_zones, updated_cfgs, active_cfg),
self.add_zones_cfgs(
cfgs.copy(), zones.copy(), add_zones_info,
active_cfg, "openstack_cfg"))
result = self.add_zones_cfgs(cfgs.copy(), zones.copy(), add_zones_info,
active_cfg, "openstack_cfg")
self.assertEqual(updated_zones, result[0])
self.assertEqual(active_cfg, result[2])
result_cfg = result[1]['openstack_cfg']
self.assertIn('test4', result_cfg)
self.assertIn('openstack50060b0000c26604201900051ee8e329', result_cfg)
self.assertIn('zone1', result_cfg)
self.assertIn('zone2', result_cfg)
@patch.object(client.BrcdHTTPFCZoneClient, 'connect')
def test_get_zone_info(self, connect_mock):

10
cinder/zonemanager/drivers/brocade/brcd_http_fc_zone_client.py
View File

@ -620,19 +620,19 @@ class BrcdHTTPFCZoneClient(object):
saveonly = "false" if activate is True else "true"
# Form the zone string based on the dictionary of each items
for cfg in cfgs.keys():
for cfg in sorted(cfgs.keys()):
zoneString += (zone_constant.CFG_DELIM +
cfg + " " + cfgs.get(cfg) + " ")
for zone in zones.keys():
for zone in sorted(zones.keys()):
zoneString += (zone_constant.ZONE_DELIM +
zone + " " + zones.get(zone) + " ")
for al in alias.keys():
for al in sorted(alias.keys()):
zoneString += (zone_constant.ALIAS_DELIM +
al + " " + alias.get(al) + " ")
for qlp in qlps.keys():
for qlp in sorted(qlps.keys()):
zoneString += (zone_constant.QLP_DELIM +
qlp + " " + qlps.get(qlp) + " ")
for ifa in ifas.keys():
for ifa in sorted(ifas.keys()):
zoneString += (zone_constant.IFA_DELIM +
ifa + " " + ifas.get(ifa) + " ")
# append the active_cfg string only if it is not null and activate