1 files changed, 26 insertions, 3 deletions
diff --git a/yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash b/yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash
index e790a0784..d50a800d7 100644
--- a/yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash
+++ b/yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash
@@ -9,9 +9,32 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-cp /etc/neutron/plugins/ml2/ml2_conf.ini /etc/neutron/plugins/ml2/ml2_conf.ini_bkp
-sed -i '83a prevent_arp_spoofing = False' /etc/neutron/plugins/ml2/ml2_conf.ini
-sed -i 's/firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver/firewall_driver= neutron.agent.firewall.NoopFirewallDriver/g' /etc/neutron/plugins/ml2/ml2_conf.ini
+
+ML2_CONF_FILE="/etc/neutron/plugins/ml2/ml2_conf.ini"
+NOVA_CONF_FILE="/etc/nova/nova.conf"
+
+cp $ML2_CONF_FILE ${ML2_CONF_FILE}_bkp
+
+agent_line_num=$(grep -n '\[agent\]' $ML2_CONF_FILE | awk -F [:] '{print $1}')
+if [ -z "$agent_line_num" ]
+then
+    echo "[agent]" >> ml2_conf.ini
+    agent_line_num=$(wc -l ml2_conf.ini | awk '{print $1}')
+fi
+sed -i "${agent_line_num}a prevent_arp_spoofing = False" $ML2_CONF_FILE
+
+sed -i 's/firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver/firewall_driver= neutron.agent.firewall.NoopFirewallDriver/g' $ML2_CONF_FILE
+
+#check parameters
+echo "check if parameters ok"
+echo $ML2_CONF_FILE
+grep 'enable_security_group = True' $ML2_CONF_FILE
+grep 'extension_drivers = port_security' $ML2_CONF_FILE
+grep 'prevent_arp_spoofing = False' $ML2_CONF_FILE
+echo $NOVA_CONF_FILE
+grep 'security_group_api = neutron' $NOVA_CONF_FILE
+grep 'firewall_driver = nova.virt.firewall.NoopFirewallDriver' $NOVA_CONF_FILE
+echo "check parameters end"
 
 # restart nova and neutron service
 service neutron-l3-agent restart