diff options
| author |   liang gao <jean.gaoliang@huawei.com> | 2016-10-14 04:38:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-14 04:38:23 +0000 |
| commit | 3aa146161082b9e9d6e55267b4161178a06ff716 (patch) | |
| tree | f76cc8a73a42785162566160c853f0364c1bc20e | |
| parent | 26697d1e9432c46c28d345bd655491e78ad8ac7d (diff) | |
| parent | b87e01af991e86abed92e42de35110dcc9713f0a (diff) | |
Merge "bug-fix: ipv6 ml2 file should use variable"
| -rw-r--r-- | yardstick/benchmark/scenarios/networking/ping6_pre_setup.bash | 14 |
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 |