openstack/cinder
Code Issues Proposed changes

Merge "Remove BRCD primary_switch_wwn config option"

Browse Source
This commit is contained in:
Jenkins 2017-05-24 12:16:19 +00:00 committed by Gerrit Code Review
commit 2ef76fb251
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/zonemanager/test_brcd_fc_san_lookup_service.py
View File

@ -94,8 +94,6 @@ class TestBrcdFCSanLookupService(brcd_lookup.BrcdFCSanLookupService,
secret=True))
fc_fabric_opts.append(cfg.PortOpt('fc_fabric_port',
default=22, help=''))
fc_fabric_opts.append(cfg.StrOpt('principal_switch_wwn',
default='100000051e55a100', help=''))
config = conf.Configuration(fc_fabric_opts, 'BRCD_FAB_2')
self.fabric_configs = {'BRCD_FAB_2': config}

1
cinder/tests/unit/zonemanager/test_brcd_fc_zone_driver.py
View File

@ -90,7 +90,6 @@ class BrcdFcZoneDriverBaseTest(object):
configuration.zoning_policy_BRCD_FAB_1 = 'initiator-target'
configuration.zone_activate_BRCD_FAB_1 = True
configuration.zone_name_prefix_BRCD_FAB_1 = 'openstack_fab1'
configuration.principal_switch_wwn_BRCD_FAB_1 = '100000051e55a100'
return configuration

7
cinder/zonemanager/drivers/brocade/brcd_fabric_opts.py
View File

@ -50,12 +50,7 @@ brcd_zone_opts = [
help='Overridden zone name prefix.'),
cfg.StrOpt('fc_virtual_fabric_id',
default=None,
help='Virtual Fabric ID.'),
cfg.StrOpt('principal_switch_wwn',
default=None,
deprecated_for_removal=True,
help='Principal switch WWN of the fabric. This option is not '
'used anymore.')
help='Virtual Fabric ID.')
]
CONF = cfg.CONF