Merge "Prepare for multiple cisco ML2 mech drivers"

diff --cc setup.cfg
index df29454d1d59d9d388800e732a3e2ec0a37a86e7,31804c37b9d136ddb675fb0104b209cd7a37a857..8c83cfa14a3f3dede875b78e4614a3b17217ac2d
--- 1/setup.cfg
--- 2/setup.cfg
+++ b/setup.cfg
@@@ -157,9 -156,8 +157,9 @@@ neutron.ml2.mechanism_drivers 
      hyperv = neutron.plugins.ml2.drivers.mech_hyperv:HypervMechanismDriver
      ncs = neutron.plugins.ml2.drivers.mechanism_ncs:NCSMechanismDriver
      arista = neutron.plugins.ml2.drivers.mech_arista.mechanism_arista:AristaDriver
-     cisco_nexus = neutron.plugins.ml2.drivers.cisco.mech_cisco_nexus:CiscoNexusMechanismDriver
+     cisco_nexus = neutron.plugins.ml2.drivers.cisco.nexus.mech_cisco_nexus:CiscoNexusMechanismDriver
      l2population = neutron.plugins.ml2.drivers.l2pop.mech_driver:L2populationMechanismDriver
 +    bigswitch = neutron.plugins.ml2.drivers.mech_bigswitch.driver:BigSwitchMechanismDriver
  
  [build_sphinx]
  all_files = 1