From 1595aa213601baf292d667a6e54d2f703c0cd98d Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sun, 7 May 2017 20:39:34 +0000 Subject: [PATCH] Remove BRCD primary_switch_wwn config option This config option was deprecated two years ago and should be removed. The way this was "deprecated" basically just removed the option even though StrOpt was still there. It was not referenced anywhere. For this reason, I don't feel a release note is warranted since it was effectively already gone. Change-Id: I56adc822845c04a81747969c6202290d9eb64a7b --- .../unit/zonemanager/test_brcd_fc_san_lookup_service.py | 2 -- cinder/tests/unit/zonemanager/test_brcd_fc_zone_driver.py | 1 - cinder/zonemanager/drivers/brocade/brcd_fabric_opts.py | 7 +------ 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/cinder/tests/unit/zonemanager/test_brcd_fc_san_lookup_service.py b/cinder/tests/unit/zonemanager/test_brcd_fc_san_lookup_service.py index 4865919c103..6c915054a4d 100644 --- a/cinder/tests/unit/zonemanager/test_brcd_fc_san_lookup_service.py +++ b/cinder/tests/unit/zonemanager/test_brcd_fc_san_lookup_service.py @@ -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} diff --git a/cinder/tests/unit/zonemanager/test_brcd_fc_zone_driver.py b/cinder/tests/unit/zonemanager/test_brcd_fc_zone_driver.py index 952724e5b75..ea15d5bf61d 100644 --- a/cinder/tests/unit/zonemanager/test_brcd_fc_zone_driver.py +++ b/cinder/tests/unit/zonemanager/test_brcd_fc_zone_driver.py @@ -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 diff --git a/cinder/zonemanager/drivers/brocade/brcd_fabric_opts.py b/cinder/zonemanager/drivers/brocade/brcd_fabric_opts.py index b5b26343621..46e98dfbccf 100644 --- a/cinder/zonemanager/drivers/brocade/brcd_fabric_opts.py +++ b/cinder/zonemanager/drivers/brocade/brcd_fabric_opts.py @@ -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