openstack/neutron
Code Issues Proposed changes

Merge "Decomposition phase2 for MidoNet plugin"

Browse Source
This commit is contained in:
Jenkins 2015-10-03 00:55:14 +00:00 committed by Gerrit Code Review
commit 51b8b19ef2
5 changed files with 0 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etc/neutron/plugins/midonet/midonet.ini
View File

@ -1,13 +0,0 @@
[midonet]
# MidoNet API server URI
# midonet_uri = http://localhost:8080/midonet-api
# MidoNet admin username
# username = admin
# MidoNet admin password
# password = passw0rd
# ID of the project that MidoNet admin user belongs to
# project_id = 77777777-7777-7777-7777-777777777777

0
neutron/plugins/midonet/__init__.py
View File

52
neutron/plugins/midonet/plugin.py
View File

@ -1,52 +0,0 @@
# Copyright (C) 2012 Midokura Japan K.K.
# Copyright (C) 2013 Midokura PTE LTD
# 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 oslo_config import cfg
from midonet.neutron import plugin
midonet_opts = [
cfg.StrOpt('midonet_uri', default='http://localhost:8080/midonet-api',
help=_('MidoNet API server URI.')),
cfg.StrOpt('username', default='admin',
help=_('MidoNet admin username.')),
cfg.StrOpt('password', default='passw0rd',
secret=True,
help=_('MidoNet admin password.')),
cfg.StrOpt('project_id',
default='77777777-7777-7777-7777-777777777777',
help=_('ID of the project that MidoNet admin user '
'belongs to.'))
]
cfg.CONF.register_opts(midonet_opts, "MIDONET")
# Derives from `object` (via at least NeutronDbPluginV2), but pylint
# can't see that without having the midonet libraries available.
# pylint: disable=super-on-old-class
class MidonetPluginV2(plugin.MidonetMixin):
vendor_extensions = plugin.MidonetMixin.supported_extension_aliases
supported_extension_aliases = ['external-net', 'router', 'security-group',
'agent', 'dhcp_agent_scheduler', 'binding',
'quotas'] + vendor_extensions
__native_bulk_support = True
def __init__(self):
super(MidonetPluginV2, self).__init__()

1
neutron/plugins/midonet/requirements.txt
View File

@ -1 +0,0 @@
networking-midonet

2
setup.cfg
View File

@ -53,7 +53,6 @@ data_files =
etc/neutron/plugins/cisco =
etc/neutron/plugins/cisco/cisco_vpn_agent.ini
etc/neutron/plugins/embrane = etc/neutron/plugins/embrane/heleos_conf.ini
etc/neutron/plugins/midonet = etc/neutron/plugins/midonet/midonet.ini
etc/neutron/plugins/ml2 =
etc/neutron/plugins/bigswitch/restproxy.ini
etc/neutron/plugins/ml2/linuxbridge_agent.ini
@ -105,7 +104,6 @@ neutron.core_plugins =
bigswitch = neutron.plugins.bigswitch.plugin:NeutronRestProxyV2
brocade = neutron.plugins.brocade.NeutronPlugin:BrocadePluginV2
embrane = neutron.plugins.embrane.plugins.embrane_ml2_plugin:EmbraneMl2Plugin
midonet = neutron.plugins.midonet.plugin:MidonetPluginV2
ml2 = neutron.plugins.ml2.plugin:Ml2Plugin
nuage = neutron.plugins.nuage.plugin:NuagePlugin
oneconvergence = neutron.plugins.oneconvergence.plugin:OneConvergencePluginV2