(StrOpt) Comma separated list of fibre channel fabric names. This list of names is used to retrieve other SAN credentials for connecting to each SAN fabric
(StrOpt) Southbound connector for zoning operation
+
+
+
+
diff --git a/doc/config-reference/block-storage/section_fc-zoning.xml b/doc/config-reference/block-storage/section_fc-zoning.xml
index 524cf50575..91d8c26fec 100644
--- a/doc/config-reference/block-storage/section_fc-zoning.xml
+++ b/doc/config-reference/block-storage/section_fc-zoning.xml
@@ -69,4 +69,31 @@
switches, see the Brocade Fabric OS user documentation.
+
+ Cisco Fibre Channel Zone Driver
+ Cisco Fibre Channel Zone Driver performs zoning operations
+ via SSH. Configure Cisco Zone Driver and lookup service by
+ specifying the following parameters:
+
+ Configure SAN fabric parameters in the form of fabric
+ groups as described in the example below:
+
+
+ Define a fabric group for each fabric using the fabric names
+ used in configuration option
+ as group name.
+
+ The Cisco Fibre Channel Zone Driver supports basic and enhanced zoning
+ modes.The zoning VSAN must exist with an active zone set name which is
+ same as the parameter.
+
+
+
+ System requirements
+ Cisco MDS 9000 Family Switches.
+ Cisco MDS NX-OS Release 6.2(9) or later.
+ For information about how to manage Cisco Fibre Channel
+ switches, see the Cisco MDS 9000 user documentation.
+
+
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index f9d9550093..3e21211c0f 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -480,14 +480,14 @@ BRCD_FABRIC_EXAMPLE/principal_switch_wwn zoning_fabric
BRCD_FABRIC_EXAMPLE/zone_activate zoning_fabric
BRCD_FABRIC_EXAMPLE/zone_name_prefix zoning_fabric
BRCD_FABRIC_EXAMPLE/zoning_policy zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_address zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_password zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_port zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_user zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_zone_activate zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_zone_name_prefix zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_zoning_policy zoning_fabric
-CISCO_FABRIC_EXAMPLE/cisco_zoning_vsan zoning_fabric
+CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_address zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_password zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_port zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_fc_fabric_user zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_zone_activate zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_zone_name_prefix zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_zoning_policy zoning_fabric_cisco
+CISCO_FABRIC_EXAMPLE/cisco_zoning_vsan zoning_fabric_cisco
database/backend database
database/connection database
database/connection_debug database
@@ -510,10 +510,10 @@ database/sqlite_synchronous database
database/use_db_reconnect database
database/use_tpool database
fc-zone-manager/brcd_sb_connector zoning_manager
-fc-zone-manager/cisco_sb_connector zoning_manager
+fc-zone-manager/cisco_sb_connector zoning_manager_cisco
fc-zone-manager/fc_fabric_names zoning
-fc-zone-manager/fc_san_lookup_service zoning_manager
-fc-zone-manager/zone_driver zoning_manager
+fc-zone-manager/fc_san_lookup_service zoning
+fc-zone-manager/zone_driver zoning
fc-zone-manager/zoning_policy zoning
keymgr/api_class keymgr
keymgr/encryption_api_url keymgr
diff --git a/tools/autogenerate-config-flagmappings/cinder.headers b/tools/autogenerate-config-flagmappings/cinder.headers
index 3a60ac09c7..0fdd523b9e 100644
--- a/tools/autogenerate-config-flagmappings/cinder.headers
+++ b/tools/autogenerate-config-flagmappings/cinder.headers
@@ -51,3 +51,5 @@ zones zones
zoning zoning
zoning_fabric zoning fabrics
zoning_manager zoning manager
+zoning_fabric_cisco cisco zoning fabrics
+zoning_manager_cisco cisco zoning manager