From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 5 Dec 2015 03:15:37 +0000 (+0000)
Subject: Merge "Final decomposition of Brocade vendor code"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0dd4a27c88e86d1dc6263c4aff74071a6a8c9cde;p=openstack-build%2Fneutron-build.git

Merge "Final decomposition of Brocade vendor code"
---

0dd4a27c88e86d1dc6263c4aff74071a6a8c9cde
diff --cc setup.cfg
index 6987aa1d5,8f0061738..74ff396a9
--- a/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 =