|
 |
98a8af6 |
From 54fddb2d9a834ab6655b4c0d3b8e93b23377fdb7 Mon Sep 17 00:00:00 2001
|
|
|
eecff89 |
From: Dulanjalie Ganegedara <ddhanapa@cisco.com>
|
|
|
eecff89 |
Date: Wed, 25 Feb 2015 08:43:17 -0800
|
|
|
eecff89 |
Subject: [PATCH] Changing the default value of fastpath_flood to enable
|
|
|
eecff89 |
|
|
|
eecff89 |
Current default value of fastpath_flood in nexus1000v is set to disable.
|
|
|
eecff89 |
Cisco1000v handles broadcast floods and unknown pkts in fastpath(KLM) by default.
|
|
|
eecff89 |
Thus this variable need to be set to enale as the default.
|
|
|
eecff89 |
|
|
|
eecff89 |
Change-Id: If18ba553b70a896f0d9e38113831445bf3a08cbe
|
|
|
eecff89 |
Closes-Bug: 1425589
|
|
|
eecff89 |
(cherry picked from commit c90b465001b82005f656cc8af08e87111c884089)
|
|
|
eecff89 |
---
|
|
|
eecff89 |
neutron/manifests/agents/n1kv_vem.pp | 4 ++--
|
|
|
eecff89 |
neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb | 10 +++++-----
|
|
|
eecff89 |
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
eecff89 |
|
|
|
eecff89 |
diff --git a/neutron/manifests/agents/n1kv_vem.pp b/neutron/manifests/agents/n1kv_vem.pp
|
|
|
eecff89 |
index dc740c0..6366b41 100644
|
|
|
eecff89 |
--- a/neutron/manifests/agents/n1kv_vem.pp
|
|
|
eecff89 |
+++ b/neutron/manifests/agents/n1kv_vem.pp
|
|
|
eecff89 |
@@ -97,7 +97,7 @@
|
|
|
eecff89 |
#
|
|
|
eecff89 |
# [*fastpath_flood*]
|
|
|
eecff89 |
# (optional) Handle broadcast floods and unknown pkts in fastpath(KLM)
|
|
|
eecff89 |
-# Defaults to disable
|
|
|
eecff89 |
+# Defaults to enable
|
|
|
eecff89 |
#
|
|
|
eecff89 |
class neutron::agents::n1kv_vem (
|
|
|
eecff89 |
$n1kv_vsm_ip = '127.0.0.1',
|
|
|
eecff89 |
@@ -113,7 +113,7 @@ class neutron::agents::n1kv_vem (
|
|
|
eecff89 |
$enable = true,
|
|
|
eecff89 |
$manage_service = true,
|
|
|
eecff89 |
$portdb = 'ovs',
|
|
|
eecff89 |
- $fastpath_flood = 'disable'
|
|
|
eecff89 |
+ $fastpath_flood = 'enable'
|
|
|
eecff89 |
) {
|
|
|
eecff89 |
|
|
|
eecff89 |
include neutron::params
|
|
|
eecff89 |
diff --git a/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb b/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
|
|
|
eecff89 |
index 4eeee17..68863ef 100644
|
|
|
eecff89 |
--- a/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
|
|
|
eecff89 |
+++ b/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
|
|
|
eecff89 |
@@ -68,7 +68,7 @@ describe 'neutron::agents::n1kv_vem' do
|
|
|
eecff89 |
:n1kv_vsm_domain_id => 900,
|
|
|
eecff89 |
:host_mgmt_intf => 'eth9',
|
|
|
eecff89 |
:portdb => 'ovs',
|
|
|
eecff89 |
- :fastpath_flood => 'disable'
|
|
|
eecff89 |
+ :fastpath_flood => 'enable'
|
|
|
eecff89 |
}
|
|
|
eecff89 |
end
|
|
|
eecff89 |
it do
|
|
|
eecff89 |
@@ -87,7 +87,7 @@ describe 'neutron::agents::n1kv_vem' do
|
|
|
eecff89 |
should contain_file('/etc/n1kv/n1kv.conf') \
|
|
|
eecff89 |
.with_content(/^node-type compute/)
|
|
|
eecff89 |
should contain_file('/etc/n1kv/n1kv.conf') \
|
|
|
eecff89 |
- .with_content(/^fastpath-flood disable/)
|
|
|
eecff89 |
+ .with_content(/^fastpath-flood enable/)
|
|
|
eecff89 |
end
|
|
|
eecff89 |
end
|
|
|
eecff89 |
|
|
|
eecff89 |
@@ -122,14 +122,14 @@ describe 'neutron::agents::n1kv_vem' do
|
|
|
eecff89 |
context 'verify fastpath_flood' do
|
|
|
eecff89 |
let :params do
|
|
|
eecff89 |
{
|
|
|
eecff89 |
- :fastpath_flood => 'enable',
|
|
|
eecff89 |
+ :fastpath_flood => 'disable',
|
|
|
eecff89 |
}
|
|
|
eecff89 |
end
|
|
|
eecff89 |
it do
|
|
|
eecff89 |
should contain_file('/etc/n1kv/n1kv.conf') \
|
|
|
eecff89 |
- .with_content(/^fastpath-flood enable/)
|
|
|
eecff89 |
+ .with_content(/^fastpath-flood disable/)
|
|
|
eecff89 |
should contain_file('/etc/n1kv/n1kv.conf') \
|
|
|
eecff89 |
- .without_content(/^fastpath-flood disable/)
|
|
|
eecff89 |
+ .without_content(/^fastpath-flood enable/)
|
|
|
eecff89 |
end
|
|
|
eecff89 |
end
|
|
|
eecff89 |
|