From: Cedric Brandily Date: Thu, 29 Oct 2015 05:38:23 +0000 (+0900) Subject: Decompose ML2 mechanism driver for OVSvApp X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d5faf0eb76b5724b8ba21d09c679b12314cffee4;p=openstack-build%2Fneutron-build.git Decompose ML2 mechanism driver for OVSvApp This change removes OVSvApp ML2 mechanism driver after its definition in networking-vsphere. DocImpact Closes-Bug: #1511198 Depends-On: Ib7b2852f3d4dc35a837a425366c5bf0135725a74 Change-Id: I5e310f0596f3ea206800ac9d4daca1c292a234f1 --- diff --git a/etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini b/etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini deleted file mode 100644 index 7f91d74bc..000000000 --- a/etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini +++ /dev/null @@ -1,69 +0,0 @@ -[vmware] -# Provide IP address for vCenter. -# vcenter_ip = - -# Provide vCenter Credentials. -# vcenter_username = -# vcenter_password = - -# SSL communication between OVSvApp Agent and vCenter Server -# cert_check = False -# Provide Certificate file location. -# cert_path = - -# Customized https_port for OVSvApp agent and vCenter Server communication -# https_port = 443 - -# Number of retries by OVSvApp Agent to connect to vCenter server -# vcenter_api_retry_count = 2 - -# wsdl_location = -# vCenter server wsdl location -# Example: -# wsdl_location=https://:/sdk/vimService.wsdl - -# Provide Cluster to DVS/vDS mapping. -# cluster_dvs_mapping = -# -# Example: -# cluster_dvs_mapping = //: - -# Provide ESX host name or IP address. -# esx_hostname = - -# To set the ESX host in maintenance mode during Fault Management. -# esx_maintenance_mode = True - -[ovsvapp] -# Network type for tenant networks. -# tenant_network_type = -# OVSvApp L2 Agent supports either VLAN or VXLAN. -# Example: -# tenant_network_type = vlan - -# Local IP address of VXLAN tunnel endpoint. -# local_ip = - -# OVS integration bridge. -# integration_bridge = br-int - -# Provide bridge mappings for VLAN networks. -# bridge_mappings = -# -# Example: -# bridge_mappings = physnet1:br-eth1 -# where eth1 is data interface. - -# Firewall driver for OVSvApp. -# firewall_driver = networking_vsphere.drivers.ovs_firewall.OVSFirewallDriver - -# For disbaling security groups. -# firewall_driver = neutron.agent.firewall.NoopFirewallDriver - -[securitygroup] -# Provide bridge mapping for security groups. -# security_bridge_mapping = -# -# Example: -# security_bridge_mapping = br-sec:eth2 -# where br-sec is default security bridge and eth2 is trunk interface. diff --git a/neutron/cmd/eventlet/plugins/ovsvapp_neutron_agent.py b/neutron/cmd/eventlet/plugins/ovsvapp_neutron_agent.py deleted file mode 100644 index 1017f6146..000000000 --- a/neutron/cmd/eventlet/plugins/ovsvapp_neutron_agent.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2015 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import sys - -from networking_vsphere import service - -from neutron.common import config as common_config - - -def main(): - common_config.init(sys.argv[1:]) - common_config.setup_logging() - service.run() diff --git a/neutron/plugins/ml2/drivers/ovsvapp/__init__.py b/neutron/plugins/ml2/drivers/ovsvapp/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/neutron/plugins/ml2/drivers/ovsvapp/mech_driver.py b/neutron/plugins/ml2/drivers/ovsvapp/mech_driver.py deleted file mode 100644 index d05328532..000000000 --- a/neutron/plugins/ml2/drivers/ovsvapp/mech_driver.py +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (c) 2015 Hewlett-Packard Development Company, L.P. -# -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from networking_vsphere.common import constants as ovsvapp_const -from networking_vsphere.ml2 import ovsvapp_driver -from oslo_log import log - -from neutron.extensions import portbindings -from neutron.plugins.common import constants as p_const -from neutron.plugins.ml2.drivers import mech_agent - -LOG = log.getLogger(__name__) - - -class OVSvAppAgentMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase): - """Attach to networks using OVSvApp Agent. - - The OVSvAppAgentMechanismDriver integrates the ml2 plugin with the - OVSvApp Agent. Port binding with this driver requires the - OVSvApp Agent to be running on the port's host, and that agent - to have connectivity to at least one segment of the port's - network. - """ - def __init__(self): - super(OVSvAppAgentMechanismDriver, self).__init__( - ovsvapp_const.AGENT_TYPE_OVSVAPP, - portbindings.VIF_TYPE_OTHER, - {portbindings.CAP_PORT_FILTER: True}) - self.ovsvapp_driver = ovsvapp_driver.OVSvAppAgentDriver() - self.ovsvapp_driver.initialize() - - def get_allowed_network_types(self, agent): - return (agent['configurations'].get('tunnel_types', []) + - [p_const.TYPE_VLAN]) - - def get_mappings(self, agent): - return agent['configurations'].get('bridge_mappings', {}) diff --git a/neutron/plugins/ml2/drivers/ovsvapp/requirements.txt b/neutron/plugins/ml2/drivers/ovsvapp/requirements.txt deleted file mode 100644 index ab0954d87..000000000 --- a/neutron/plugins/ml2/drivers/ovsvapp/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -networking-vsphere diff --git a/setup.cfg b/setup.cfg index 2355cbd21..40710585a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -67,7 +67,6 @@ data_files = etc/neutron/plugins/ml2/sriov_agent.ini etc/neutron/plugins/mlnx = etc/neutron/plugins/mlnx/mlnx_conf.ini etc/neutron/plugins/nuage = etc/neutron/plugins/nuage/nuage_plugin.ini - etc/neutron/plugins/ovsvapp = etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini scripts = bin/neutron-rootwrap-xen-dom0 @@ -86,7 +85,6 @@ console_scripts = neutron-mlnx-agent = neutron.cmd.eventlet.plugins.mlnx_neutron_agent:main neutron-netns-cleanup = neutron.cmd.netns_cleanup:main neutron-ns-metadata-proxy = neutron.cmd.eventlet.agents.metadata_proxy:main - neutron-ovsvapp-agent = neutron.cmd.eventlet.plugins.ovsvapp_neutron_agent:main neutron-openvswitch-agent = neutron.cmd.eventlet.plugins.ovs_neutron_agent:main neutron-ovs-cleanup = neutron.cmd.ovs_cleanup:main neutron-pd-notify = neutron.cmd.pd_notify:main @@ -130,7 +128,6 @@ neutron.ml2.type_drivers = gre = neutron.plugins.ml2.drivers.type_gre:GreTypeDriver vxlan = neutron.plugins.ml2.drivers.type_vxlan:VxlanTypeDriver neutron.ml2.mechanism_drivers = - ovsvapp = neutron.plugins.ml2.drivers.ovsvapp.mech_driver:OVSvAppAgentMechanismDriver opendaylight = neutron.plugins.ml2.drivers.opendaylight.driver:OpenDaylightMechanismDriver logger = neutron.tests.unit.plugins.ml2.drivers.mechanism_logger:LoggerMechanismDriver test = neutron.tests.unit.plugins.ml2.drivers.mechanism_test:TestMechanismDriver