From addb699a42ef1b19c514e89747fedf56ca87a388 Mon Sep 17 00:00:00 2001 From: Henry Gessau Date: Sat, 21 Nov 2015 18:50:31 -0500 Subject: [PATCH] Final decomposition of Brocade vendor code This removes what's left of the brocade code and artifacts from the neutron tree. All the vendor code is now in the openstack/networking-brocade repo. Closes-Bug: #1518637 Change-Id: Ia366ec28d0ae9fd7f9fe41c9a82d5d44971d27d8 --- neutron/db/migration/models/head.py | 3 --- setup.cfg | 11 ----------- 2 files changed, 14 deletions(-) diff --git a/neutron/db/migration/models/head.py b/neutron/db/migration/models/head.py index fbc7bf27..3db6b4b7 100644 --- a/neutron/db/migration/models/head.py +++ b/neutron/db/migration/models/head.py @@ -47,9 +47,6 @@ from neutron.db import rbac_db_models # noqa from neutron.db import securitygroups_db # noqa from neutron.db import servicetype_db # noqa from neutron.ipam.drivers.neutrondb_ipam import db_models # noqa -from neutron.plugins.brocade.db import models as brocade_models # noqa -from neutron.plugins.ml2.drivers.brocade.db import ( # noqa - models as ml2_brocade_models) from neutron.plugins.ml2.drivers import type_flat # noqa from neutron.plugins.ml2.drivers import type_geneve # noqa from neutron.plugins.ml2.drivers import type_gre # noqa diff --git a/setup.cfg b/setup.cfg index 6a9d2a12..8f006173 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,15 +35,9 @@ data_files = etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d/linuxbridge-plugin.filters etc/neutron/rootwrap.d/openvswitch-plugin.filters - etc/neutron/plugins/brocade = - etc/neutron/plugins/brocade/brocade.ini - etc/neutron/plugins/brocade/brocade_mlx.ini - etc/neutron/plugins/brocade/vyatta = etc/neutron/plugins/brocade/vyatta/vrouter.ini etc/neutron/plugins/cisco = etc/neutron/plugins/cisco/cisco_vpn_agent.ini etc/neutron/plugins/ml2 = - etc/neutron/plugins/ml2/ml2_conf_brocade.ini - etc/neutron/plugins/ml2/ml2_conf_brocade_fi_ni.ini etc/neutron/plugins/ml2/ml2_conf_ofa.ini etc/neutron/plugins/nuage = etc/neutron/plugins/nuage/nuage_plugin.ini scripts = @@ -76,14 +70,11 @@ console_scripts = neutron-sriov-nic-agent = neutron.plugins.ml2.drivers.mech_sriov.agent.sriov_nic_agent:main neutron-sanity-check = neutron.cmd.sanity_check:main neutron.core_plugins = - brocade = neutron.plugins.brocade.NeutronPlugin:BrocadePluginV2 ml2 = neutron.plugins.ml2.plugin:Ml2Plugin nuage = neutron.plugins.nuage.plugin:NuagePlugin neutron.service_plugins = dummy = neutron.tests.unit.dummy_plugin:DummyServicePlugin router = neutron.services.l3_router.l3_router_plugin:L3RouterPlugin - brocade_vyatta_l3 = neutron.services.l3_router.brocade.vyatta.vrouter_neutron_plugin:VyattaVRouterPlugin - brocade_mlx_l3 = neutron.services.l3_router.brocade.mlx.l3_router_plugin:BrocadeRouterPlugin firewall = neutron_fwaas.services.firewall.fwaas_plugin:FirewallPlugin lbaas = neutron_lbaas.services.loadbalancer.plugin:LoadBalancerPlugin vpnaas = neutron_vpnaas.services.vpn.plugin:VPNDriverPlugin @@ -110,8 +101,6 @@ neutron.ml2.mechanism_drivers = 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 =