Fix Consolidate sriov agent and driver code

This patch add mising __init to mech_sriov/mech_driver/
and update the setup.cfg to the new agent entrypoint

Trivial Fix

Change-Id: I53a527081feb78472f496675bbb3c5121d38a14a

diff --git a/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/__init__.py b/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/setup.cfg b/setup.cfg
index 4b10e3ea285abc2fef662b37e1f0fe14a5c4ecda..e3f0f05bb9e1adf47fcd3afae4c6215fc475084a 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -110,7 +110,7 @@ console_scripts =
     neutron-rootwrap-daemon = oslo_rootwrap.cmd:daemon
     neutron-usage-audit = neutron.cmd.usage_audit:main
     neutron-metering-agent = neutron.cmd.eventlet.services.metering_agent:main
-    neutron-sriov-nic-agent = neutron.plugins.ml2.drivers.mech_sriov.agent.sriovnicagent.sriov_nic_agent:main
+    neutron-sriov-nic-agent = neutron.plugins.ml2.drivers.mech_sriov.agent.sriov_nic_agent:main
     neutron-sanity-check = neutron.cmd.sanity_check:main
     neutron-cisco-apic-service-agent = neutron.plugins.ml2.drivers.cisco.apic.apic_topology:service_main
     neutron-cisco-apic-host-agent = neutron.plugins.ml2.drivers.cisco.apic.apic_topology:agent_main