aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrexlee8776 <limingjiang@huawei.com>2016-10-14 02:18:25 +0000
committerrexlee8776 <limingjiang@huawei.com>2016-10-14 02:29:55 +0000
commitb87e01af991e86abed92e42de35110dcc9713f0a (patch)
tree68b8b9751aa03cbecf86993bb746b07fa0ba053a
parent04547421604c8f30152d1947500988c2081fd54a (diff)
bug-fix: ipv6 ml2 file should use variable
JIRA: YARDSTICK-363 Change-Id: Ie2df38ad89a90033c90281e5b6214b0fdc34e918 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
-rw-r--r--yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash14
1 files changed, 7 insertions, 7 deletions
diff --git a/yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash b/yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash
index d50a800d7..7fa60592d 100644
--- a/yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash
+++ b/yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash
@@ -18,8 +18,8 @@ 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}')
+ echo "[agent]" >> $ML2_CONF_FILE
+ agent_line_num=$(wc -l $ML2_CONF_FILE | awk '{print $1}')
fi
sed -i "${agent_line_num}a prevent_arp_spoofing = False" $ML2_CONF_FILE
@@ -28,12 +28,12 @@ sed -i 's/firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptab
#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
+grep -n 'enable_security_group = True' $ML2_CONF_FILE
+grep -n 'extension_drivers = port_security' $ML2_CONF_FILE
+grep -n '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
+grep -n 'security_group_api = neutron' $NOVA_CONF_FILE
+grep -n 'firewall_driver = nova.virt.firewall.NoopFirewallDriver' $NOVA_CONF_FILE
echo "check parameters end"
# restart nova and neutron service