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 fdcffd65a74d1e89aeedc67a9bbb69f1d1876fd7..e135bcdaa10401dd1a08cefcd4db0aa117f36b9b 100644 (file)
--- 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 9863e94930a2dbb471250396109a5b264eec57de..e98f95262e7caf7abb6df574e90fd56035851d1b 100644 (file)
--- 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 0a44a2a74e5969470c7fc68d96d0795e8f51d17d..3934f54a42a3a8ecbe1f2a945f2ef5badb62bf6a 100644 (file)
--- 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