From: Sripriya Date: Thu, 21 May 2015 00:24:16 +0000 (-0700) Subject: Fix minor errors in the Vyatta L3 Plugin: X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=86d5944fcc2f44aac7cd786ea429f942fc5cb66e;p=openstack-build%2Fneutron-build.git Fix minor errors in the Vyatta L3 Plugin: update management_network to management_network_id in vrouter.ini Fix copyright header to refer to Brocade in vrouter_neutron_plugin.py Fix neutron.service_plugins brocade_vyatta_l3 entry in setup.cfg Change-Id: Ib9eb4a825454d99607deca61ceeb7acb43a9b248 Closes-Bug: #1457235 --- diff --git a/etc/neutron/plugins/brocade/vyatta/vrouter.ini b/etc/neutron/plugins/brocade/vyatta/vrouter.ini index fdcffd65a..e135bcdaa 100644 --- a/etc/neutron/plugins/brocade/vyatta/vrouter.ini +++ b/etc/neutron/plugins/brocade/vyatta/vrouter.ini @@ -17,5 +17,6 @@ # VM Flavor for vRouter # flavor = 2 -# vRouter Management network name -# management_network = management +# vRouter Management network id +# management_network_id = +# Example: management_network_id = 7190bb5f-e32a-48fb-9c67-12c1365d0083 diff --git a/neutron/services/l3_router/brocade/vyatta/vrouter_neutron_plugin.py b/neutron/services/l3_router/brocade/vyatta/vrouter_neutron_plugin.py index 9863e9493..e98f95262 100644 --- a/neutron/services/l3_router/brocade/vyatta/vrouter_neutron_plugin.py +++ b/neutron/services/l3_router/brocade/vyatta/vrouter_neutron_plugin.py @@ -1,4 +1,4 @@ -# Copyright 2015 OpenStack Foundation. +# Copyright 2015 Brocade Communications System, Inc. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/setup.cfg b/setup.cfg index 0a44a2a74..3934f54a4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -132,7 +132,7 @@ neutron.service_plugins = dummy = neutron.tests.unit.dummy_plugin:DummyServicePlugin router = neutron.services.l3_router.l3_router_plugin:L3RouterPlugin bigswitch_l3 = neutron.plugins.bigswitch.l3_router_plugin:L3RestProxy - brocade_vyatta_l3 = neutron.services.l3_router.brocade.vyatta.vrouter_neutron_plugin.VyattaVRouterPlugin + 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 fsl_firewall = neutron_fwaas.services.firewall.freescale.fwaas_plugin:FirewallPlugin