Merge "Final decomposition of Brocade vendor code"

diff --cc setup.cfg
index 6987aa1d5fc8011aebac2943ff92825411754f74,8f0061738d4910abb038682887373a3b2a267d86..74ff396a9aa8a9a2d0836febf64a8e59bbef9d1b
--- 1/setup.cfg
--- 2/setup.cfg
+++ b/setup.cfg
@@@ -106,10 -98,9 +97,8 @@@ neutron.ml2.mechanism_drivers 
      test = neutron.tests.unit.plugins.ml2.drivers.mechanism_test:TestMechanismDriver
      linuxbridge = neutron.plugins.ml2.drivers.linuxbridge.mech_driver.mech_linuxbridge:LinuxbridgeMechanismDriver
      openvswitch = neutron.plugins.ml2.drivers.openvswitch.mech_driver.mech_openvswitch:OpenvswitchMechanismDriver
 -    hyperv = neutron.plugins.ml2.drivers.hyperv.mech_hyperv:HypervMechanismDriver
      l2population = neutron.plugins.ml2.drivers.l2pop.mech_driver:L2populationMechanismDriver
      ofagent = neutron.plugins.ml2.drivers.ofagent.driver:OfagentMechanismDriver
-     brocade = networking_brocade.vdx.ml2driver.mechanism_brocade:BrocadeMechanism
-     brocade_fi_ni = neutron.plugins.ml2.drivers.brocade.fi_ni.mechanism_brocade_fi_ni:BrocadeFiNiMechanism
      sriovnicswitch = neutron.plugins.ml2.drivers.mech_sriov.mech_driver.mech_driver:SriovNicSwitchMechanismDriver
      fake_agent = neutron.tests.unit.plugins.ml2.drivers.mech_fake_agent:FakeAgentMechanismDriver
  neutron.ml2.extension_drivers =