From 0f7dba831dbab107b486f00d5b57f91d28994da0 Mon Sep 17 00:00:00 2001 From: Angela Smith Date: Wed, 25 Jun 2014 11:22:27 -0700 Subject: [PATCH] Fix BrcdFCSANlookupService to iterate multiple switches. Changed close_connection to client.close_connection. Fixed return map to key on fabric name instead of principal switch wwn. Closes-Bug: 1303460 Change-Id: I3725c16cd416a028b85ac8ac6c0d895fd6900763 --- .../zonemanager/test_brcd_fc_san_lookup_service.py | 2 +- .../drivers/brocade/brcd_fc_san_lookup_service.py | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/cinder/tests/zonemanager/test_brcd_fc_san_lookup_service.py b/cinder/tests/zonemanager/test_brcd_fc_san_lookup_service.py index f18b440e2..524c3f3eb 100644 --- a/cinder/tests/zonemanager/test_brcd_fc_san_lookup_service.py +++ b/cinder/tests/zonemanager/test_brcd_fc_san_lookup_service.py @@ -39,7 +39,7 @@ switch_data = [' N 011a00;2,3;20:1a:00:05:1e:e8:e3:29;\ 20:1a:00:05:1e:e8:e3:29;na'] nsshow_data = ['10:00:8c:7c:ff:52:3b:01', '20:24:00:02:ac:00:0a:50'] _device_map_to_verify = { - '100000051e55a100': { + 'BRCD_FAB_2': { 'initiator_port_wwn_list': ['10008c7cff523b01'], 'target_port_wwn_list': ['20240002ac000a50']}} diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py b/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py index c97c86bdc..810d826a2 100644 --- a/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py +++ b/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py @@ -124,9 +124,6 @@ class BrcdFCSanLookupService(FCSanLookupService): 'fc_fabric_password') fabric_port = self.fabric_configs[fabric_name].safe_get( 'fc_fabric_port') - fabric_principal_wwn = \ - self.fabric_configs[fabric_name].safe_get( - 'principal_switch_wwn') # Get name server data from fabric and find the targets # logged in @@ -148,7 +145,7 @@ class BrcdFCSanLookupService(FCSanLookupService): LOG.error(msg) raise exception.FCSanLookupServiceException(message=msg) finally: - self.close_connection() + self.client.close() LOG.debug("Lookup service:nsinfo-%s", nsinfo) LOG.debug("Lookup service:initiator list from " "caller-%s", formatted_initiator_list) @@ -182,7 +179,7 @@ class BrcdFCSanLookupService(FCSanLookupService): 'initiator_port_wwn_list': visible_initiators, 'target_port_wwn_list': visible_targets } - device_map[fabric_principal_wwn] = fabric_map + device_map[fabric_name] = fabric_map LOG.debug("Device map for SAN context: %s", device_map) return device_map @@ -211,11 +208,6 @@ class BrcdFCSanLookupService(FCSanLookupService): LOG.debug("Connector returning nsinfo-%s", nsinfo_list) return nsinfo_list - def close_connection(self): - """This will close the client connection.""" - self.client.close() - self.client = None - def _get_switch_data(self, cmd): stdin, stdout, stderr = None, None, None utils.check_ssh_injection([cmd]) -- 2.45.2